From 2098e23fca3858e218f055373665fb1cf2188fdc Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 26 Jul 2013 11:50:02 +0100 Subject: [PATCH] Change package names zero->boot * actuator -> boot-ops * cli -> boot-cli * launcher -> boot-load * autoconfig -> boot-config * bootstrap -> boot-strap * starters -> boot-up [#54095231] [bs-253] Refactor Zero->Boot --- README.md | 24 ++--- docs/CONTRIBUTING.md | 2 +- pom.xml | 28 +++--- .../main/resources/META-INF/spring.factories | 11 --- .../main/resources/META-INF/spring.factories | 15 --- {spring-cli => spring-boot-cli}/README.md | 0 {spring-cli => spring-boot-cli}/pom.xml | 8 +- .../samples/app.groovy | 0 .../samples/integration.groovy | 0 .../samples/job.groovy | 0 .../samples/ops.groovy | 2 +- .../samples/reactor.groovy | 0 .../samples/runner.groovy | 0 .../samples/runner.xml | 0 .../samples/template.groovy | 2 +- .../samples/ui.groovy | 0 .../samples/web.groovy | 0 .../src/main/assembly/descriptor.xml | 2 +- .../springframework/boot}/cli/Command.java | 2 +- .../boot}/cli/CommandFactory.java | 2 +- .../org/springframework/boot}/cli/Log.java | 2 +- .../boot}/cli/NoSuchCommandException.java | 2 +- .../springframework/boot}/cli/SpringCli.java | 4 +- .../boot}/cli/SpringCliException.java | 2 +- .../boot}/cli/command/AbstractCommand.java | 4 +- .../boot}/cli/command/CleanCommand.java | 12 +-- .../boot}/cli/command/CreateCommand.java | 4 +- .../cli/command/DefaultCommandFactory.java | 6 +- .../boot}/cli/command/OptionHandler.java | 2 +- .../cli/command/OptionParsingCommand.java | 4 +- .../boot}/cli/command/RunCommand.java | 8 +- .../boot}/cli/command/ScriptCommand.java | 8 +- .../command/ScriptCompilationCustomizer.java | 4 +- .../boot}/cli/command/VersionCommand.java | 4 +- .../boot}/cli/compiler/AstUtils.java | 2 +- .../compiler/CompilerAutoConfiguration.java | 2 +- .../cli/compiler/DependencyCustomizer.java | 2 +- .../compiler/ExtendedGroovyClassLoader.java | 2 +- .../boot}/cli/compiler/GroovyCompiler.java | 4 +- .../compiler/GroovyCompilerConfiguration.java | 2 +- .../ReactorCompilerAutoConfiguration.java | 8 +- .../SpringBatchCompilerAutoConfiguration.java | 8 +- .../SpringBootCompilerAutoConfiguration.java | 22 ++--- ...gIntegrationCompilerAutoConfiguration.java | 8 +- .../SpringMvcCompilerAutoConfiguration.java | 10 +- ...ringSecurityCompilerAutoConfiguration.java | 8 +- .../cli/runner/SpringApplicationRunner.java | 6 +- .../SpringApplicationRunnerConfiguration.java | 4 +- .../boot}/cli/template/GroovyTemplate.java | 2 +- ...rg.springframework.boot.cli.CommandFactory | 1 + ...oot.cli.compiler.CompilerAutoConfiguration | 6 ++ .../resources/META-INF/springcli.properties | 2 +- .../src/main/scripts/spring | 2 +- .../boot}/cli/GrapesCleaner.java | 14 +-- .../boot}/cli/SampleIntegrationTests.java | 8 +- .../boot}/cli/SpringCliTests.java | 9 +- .../boot}/cli/command/ScriptCommandTests.java | 6 +- .../test/resources/commands/closure.groovy | 6 ++ .../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/script.groovy | 0 .../src/test/resources/commands/test.groovy | 2 +- .../src/test/resources/logback.xml | 0 .../resources/static/css/bootstrap.min.css | 0 .../src/test/resources/templates/home.html | 0 .../src/test/resources/templates/test.txt | 0 .../README.md | 0 .../pom.xml | 10 +- .../boot/config}/AutoConfigurationSorter.java | 2 +- .../boot/config}/AutoConfigurationUtils.java | 2 +- .../boot/config}/AutoConfigureAfter.java | 2 +- .../boot/config}/ComponentScanDetector.java | 2 +- .../boot/config}/EnableAutoConfiguration.java | 12 +-- ...EnableAutoConfigurationImportSelector.java | 2 +- .../MessageSourceAutoConfiguration.java | 4 +- .../PropertyPlaceholderAutoConfiguration.java | 4 +- .../config}/batch/BatchAutoConfiguration.java | 14 +-- .../batch/BatchDatabaseInitializer.java | 2 +- .../boot/config}/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 +- .../config}/orm/jpa/JpaBaseConfiguration.java | 18 ++-- .../reactor/ReactorAutoConfiguration.java | 10 +- .../thymeleaf/ThymeleafAutoConfiguration.java | 12 +-- ...ddedServletContainerAutoConfiguration.java | 22 ++--- .../web/MultipartAutoConfiguration.java | 10 +- .../ServerPropertiesAutoConfiguration.java | 16 ++-- .../config}/web/WebMvcAutoConfiguration.java | 12 +-- .../main/resources/META-INF/spring.factories | 15 +++ .../boot/config}/AdhocTestSuite.java | 6 +- .../config}/AutoConfigurationSorterTest.java | 6 +- .../ComponentScanDetectorConfiguration.java | 4 +- .../MessageSourceAutoConfigurationTests.java | 6 +- .../boot/config}/SpringJUnitTests.java | 8 +- .../batch/BatchAutoConfigurationTests.java | 10 +- .../JobExecutionExitCodeGeneratorTests.java | 6 +- ...JpaRepositoriesAutoConfigurationTests.java | 16 ++-- .../data/JpaWebAutoConfigurationTests.java | 14 +-- .../boot/config}/data/test/City.java | 2 +- .../config}/data/test/CityRepository.java | 2 +- .../BasicDataSourceConfigurationTests.java | 4 +- .../DataSourceAutoConfigurationTests.java | 6 +- ...nsactionManagerAutoConfigurationTests.java | 6 +- .../EmbeddedDatabaseConfigurationTests.java | 4 +- .../TomcatDataSourceConfigurationTests.java | 8 +- .../HibernateJpaAutoConfigurationTests.java | 15 +-- .../boot/config}/orm/jpa/test/City.java | 2 +- .../ReactorAutoConfigurationTests.java | 3 +- .../ThymeleafAutoConfigurationTests.java | 6 +- ...ervletContainerAutoConfigurationTests.java | 16 ++-- .../web/MultipartAutoConfigurationTests.java | 12 +-- ...erverPropertiesAutoConfigurationTests.java | 20 ++-- .../web/WebMvcAutoConfigurationTests.java | 11 ++- .../boot/config}/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 | 34 +++---- .../src/it/settings.xml | 0 .../README.md | 0 {spring-launcher => spring-boot-load}/pom.xml | 6 +- .../src/it/executable-jar/pom.xml | 6 +- .../main/assembly/jar-with-dependencies.xml | 0 .../launcher/it/jar/EmbeddedJarStarter.java | 2 +- .../launcher/it/jar/ExampleController.java | 2 +- .../launcher/it/jar}/SpringConfiguration.java | 2 +- .../src/it/executable-war/pom.xml | 6 +- .../launcher/it/war/ExampleController.java | 2 +- .../launcher/it/war}/SpringConfiguration.java | 2 +- .../launcher/it/war/SpringInitializer.java | 2 +- .../it/war/embedded/EmbeddedWarStarter.java | 4 +- ...bApplicationInitializersConfiguration.java | 2 +- .../src/it/settings.xml | 0 .../springframework/boot/load}/Archive.java | 2 +- .../boot/load}/ExplodedArchive.java | 2 +- .../boot/load}/JarFileArchive.java | 6 +- .../boot/load}/JarLauncher.java | 2 +- .../boot/load}/LaunchedURLClassLoader.java | 4 +- .../springframework/boot/load}/Launcher.java | 2 +- .../boot/load}/MainMethodRunner.java | 2 +- .../boot/load}/WarLauncher.java | 2 +- .../boot/load}/data/RandomAccessData.java | 2 +- .../boot/load}/data/RandomAccessDataFile.java | 2 +- .../boot/load}/data/package-info.java | 4 +- .../boot/load}/jar/JarEntryFilter.java | 2 +- .../load}/jar/RandomAccessDataZipEntry.java | 4 +- .../jar/RandomAccessDataZipInputStream.java | 4 +- .../boot/load}/jar/RandomAccessJarFile.java | 6 +- .../boot/load}/jar/package-info.java | 2 +- .../boot/load}/package-info.java | 6 +- .../boot/load}/ByteArrayStartsWith.java | 2 +- .../boot/load}/ExplodedArchiveTests.java | 6 +- .../boot/load}/JarFileArchiveTests.java | 6 +- .../boot/load}/TestJarCreator.java | 2 +- .../load}/data/RandomAccessDataFileTests.java | 8 +- .../RandomAccessDataZipInputStreamTests.java | 8 +- .../load}/jar/RandomAccessJarFileTests.java | 8 +- .../README.md | 2 +- .../pom.xml | 10 +- .../src/it/jar/pom.xml | 2 +- .../main/java/org/test/SampleApplication.java | 0 .../src/it/jar/verify.groovy | 2 +- .../src/it/run/pom.xml | 2 +- .../main/java/org/test/SampleApplication.java | 0 .../src/it/run/verify.groovy | 0 .../src/it/settings.xml | 0 .../src/it/war/pom.xml | 2 +- .../main/java/org/test/SampleApplication.java | 0 .../src/it/war/src/main/webapp/index.html | 0 .../src/it/war/verify.groovy | 2 +- .../maven}/AbstractExecutableArchiveMojo.java | 2 +- .../boot/maven}/ArchiveHelper.java | 2 +- .../boot/maven}/ExecutableArchiveMojo.java | 4 +- .../boot/maven}/ExecutableJarHelper.java | 4 +- .../boot/maven}/ExecutableWarHelper.java | 4 +- .../boot/maven}/MainClassFinder.java | 2 +- .../PropertiesMergingResourceTransformer.java | 2 +- .../springframework/boot/maven}/RunMojo.java | 2 +- .../boot/maven}/MainClassFinderTests.java | 8 +- ...ertiesMergingResourceTransformerTests.java | 4 +- .../springframework/boot/maven}/Verify.java | 10 +- .../maven}/sample/ClassWithMainMethod.java | 2 +- .../maven}/sample/ClassWithoutMainMethod.java | 2 +- .../README.md | 20 ++-- .../docs/Features.md | 0 {spring-actuator => spring-boot-ops}/pom.xml | 10 +- .../boot/ops}/audit/AuditEvent.java | 2 +- .../boot/ops}/audit/AuditEventRepository.java | 2 +- .../audit/InMemoryAuditEventRepository.java | 2 +- .../audit/listener/AuditApplicationEvent.java | 4 +- .../ops}/audit/listener/AuditListener.java | 6 +- .../autoconfigure/AuditAutoConfiguration.java | 20 ++-- .../EndpointAutoConfiguration.java | 42 ++++---- .../EndpointWebMvcAutoConfiguration.java | 28 +++--- ...dpointWebMvcChildContextConfiguration.java | 20 ++-- .../ErrorMvcAutoConfiguration.java | 18 ++-- ...mentServerPropertiesAutoConfiguration.java | 14 +-- .../MetricFilterAutoConfiguration.java | 14 +-- .../MetricRepositoryAutoConfiguration.java | 18 ++-- .../SecurityAutoConfiguration.java | 18 ++-- .../TraceRepositoryAutoConfiguration.java | 10 +- .../TraceWebFilterAutoConfiguration.java | 12 +-- .../boot/ops}/endpoint/AbstractEndpoint.java | 2 +- .../boot/ops}/endpoint/ActionEndpoint.java | 2 +- .../boot/ops}/endpoint/BeansEndpoint.java | 4 +- .../boot/ops}/endpoint/DumpEndpoint.java | 4 +- .../boot/ops}/endpoint/Endpoint.java | 2 +- .../ops}/endpoint/EnvironmentEndpoint.java | 4 +- .../boot/ops}/endpoint/HealthEndpoint.java | 6 +- .../boot/ops}/endpoint/InfoEndpoint.java | 4 +- .../boot/ops}/endpoint/MetricsEndpoint.java | 6 +- .../boot/ops}/endpoint/PublicMetrics.java | 4 +- .../boot/ops}/endpoint/ShutdownEndpoint.java | 6 +- .../boot/ops}/endpoint/TraceEndpoint.java | 8 +- .../ops}/endpoint/VanillaPublicMetrics.java | 6 +- .../endpoint/mvc/EndpointHandlerAdapter.java | 4 +- .../endpoint/mvc/EndpointHandlerMapping.java | 6 +- .../boot/ops}/health/HealthIndicator.java | 2 +- .../ops}/health/VanillaHealthIndicator.java | 2 +- .../boot/ops}/metrics/CounterService.java | 2 +- .../ops}/metrics/DefaultCounterService.java | 2 +- .../ops}/metrics/DefaultGaugeService.java | 2 +- .../boot/ops}/metrics/GaugeService.java | 2 +- .../metrics/InMemoryMetricRepository.java | 2 +- .../boot/ops}/metrics/Measurement.java | 2 +- .../boot/ops}/metrics/Metric.java | 2 +- .../boot/ops}/metrics/MetricRepository.java | 2 +- .../ManagementServerProperties.java | 6 +- .../ops}/properties/SecurityProperties.java | 4 +- .../security/AuthenticationAuditListener.java | 6 +- .../security/AuthorizationAuditListener.java | 6 +- .../ops}/trace/InMemoryTraceRepository.java | 2 +- .../boot/ops}/trace/Trace.java | 2 +- .../boot/ops}/trace/TraceRepository.java | 2 +- .../ops}/trace/WebRequestTraceFilter.java | 2 +- .../boot/ops}/web/BasicErrorController.java | 4 +- .../boot/ops}/web/ErrorController.java | 2 +- .../main/resources/META-INF/spring.factories | 11 +++ .../boot/ops}/audit/AuditEventTests.java | 4 +- .../InMemoryAuditEventRepositoryTests.java | 6 +- .../audit/listener/AuditListenerTests.java | 10 +- .../AuditAutoConfigurationTests.java | 12 +-- .../EndpointAutoConfigurationTests.java | 22 ++--- .../EndpointWebMvcAutoConfigurationTests.java | 22 +++-- ...erverPropertiesAutoConfigurationTests.java | 6 +- .../MetricFilterAutoConfigurationTests.java | 8 +- ...etricRepositoryAutoConfigurationTests.java | 12 +-- .../SecurityAutoConfigurationTests.java | 8 +- ...TraceRepositoryAutoConfigurationTests.java | 8 +- .../TraceWebFilterAutoConfigurationTest.java | 10 +- .../ops}/endpoint/AbstractEndpointTests.java | 6 +- .../ops}/endpoint/BeansEndpointTests.java | 6 +- .../boot/ops}/endpoint/DumpEndpointTests.java | 6 +- .../endpoint/EnvironmentEndpointTests.java | 6 +- .../ops}/endpoint/HealthEndpointTests.java | 8 +- .../boot/ops}/endpoint/InfoEndpointTests.java | 6 +- .../ops}/endpoint/MetricsEndpointTests.java | 10 +- .../ops}/endpoint/ShutdownEndpointTests.java | 8 +- .../ops}/endpoint/TraceEndpointTests.java | 12 +-- .../endpoint/VanillaPublicMetricsTests.java | 8 +- .../mvc/EndpointHandlerAdapterTests.java | 6 +- .../mvc/EndpointHandlerMappingTests.java | 8 +- .../ops}/fixme/ErrorConfigurationTests.java | 2 +- .../health/VanillaHealthIndicatorTests.java | 4 +- .../metrics/DefaultCounterServiceTests.java | 4 +- .../metrics/DefaultGaugeServiceTests.java | 4 +- .../InMemoryMetricRepositoryTests.java | 4 +- .../properties/SecurityPropertiesTests.java | 6 +- .../AuthenticationAuditListenerTests.java | 4 +- .../AuthorizationAuditListenerTests.java | 4 +- .../trace/InMemoryTraceRepositoryTests.java | 6 +- .../trace/WebRequestTraceFilterTests.java | 6 +- .../src/test/resources/git.properties | 0 .../pom.xml | 32 +++---- .../spring-boot-sample-batch}/pom.xml | 10 +- .../sample/batch/SampleBatchApplication.java | 6 +- .../batch/SampleBatchApplicationTests.java | 5 +- .../spring-boot-sample-data-jpa}/pom.xml | 12 +-- .../data/jpa/SampleDataJpaApplication.java | 6 +- .../boot}/sample/data/jpa/domain/City.java | 2 +- .../boot}/sample/data/jpa/domain/Hotel.java | 2 +- .../sample/data/jpa/domain/HotelSummary.java | 2 +- .../boot}/sample/data/jpa/domain/Rating.java | 2 +- .../sample/data/jpa/domain/RatingCount.java | 2 +- .../boot}/sample/data/jpa/domain/Review.java | 2 +- .../sample/data/jpa/domain/ReviewDetails.java | 2 +- .../sample/data/jpa/domain/TripType.java | 2 +- .../jpa/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 +- .../sample/data/jpa/service/HotelService.java | 10 +- .../data/jpa/service/ReviewsSummary.java | 4 +- .../jpa/service/impl/CityServiceImpl.java | 14 +-- .../jpa/service/impl/HotelServiceImpl.java | 24 ++--- .../sample/data/jpa/web/SampleController.java | 4 +- .../src/main/resources/application.properties | 0 .../src/main/resources/import.sql | 0 .../jpa/SampleDataJpaApplicationTests.java | 5 +- .../spring-boot-sample-integration}/pom.xml | 12 +-- .../sample/integration/HelloWorldService.java | 2 +- .../sample/integration/SampleEndpoint.java | 2 +- .../SampleIntegrationApplication.java | 8 +- .../sample/integration/ServiceProperties.java | 4 +- .../src/main/resources/application.properties | 0 .../main/resources/integration-context.xml | 0 .../src/main/resources/logback.xml | 0 .../SampleIntegrationApplicationTests.java | 8 +- .../producer/ProducerApplication.java | 6 +- .../spring-boot-sample-jetty}/pom.xml | 12 +-- .../sample/jetty/SampleJettyApplication.java | 6 +- .../jetty/service/HelloWorldService.java | 2 +- .../sample/jetty/web/SampleController.java | 4 +- .../jetty/SampleJettyApplicationTests.java | 5 +- .../spring-boot-sample-ops-ui}/pom.xml | 12 +-- .../ops}/ui/SampleActuatorUiApplication.java | 8 +- .../resources/static/css/bootstrap.min.css | 0 .../src/main/resources/templates/error.html | 0 .../src/main/resources/templates/home.html | 0 .../SampleActuatorUiApplicationPortTests.java | 5 +- .../ui/SampleActuatorUiApplicationTests.java | 5 +- .../spring-boot-sample-ops}/pom.xml | 14 +-- .../boot/sample/ops}/HelloWorldService.java | 2 +- .../ops}/SampleActuatorApplication.java | 8 +- .../boot/sample/ops}/SampleController.java | 2 +- .../boot/sample/ops}/ServiceProperties.java | 4 +- .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 2 +- ...pertiesSampleActuatorApplicationTests.java | 5 +- ...AddressSampleActuatorApplicationTests.java | 5 +- ...agementSampleActuatorApplicationTests.java | 5 +- ...agementSampleActuatorApplicationTests.java | 5 +- .../ops}/SampleActuatorApplicationTests.java | 5 +- ...hutdownSampleActuatorApplicationTests.java | 5 +- ...nsecureSampleActuatorApplicationTests.java | 5 +- .../spring-boot-sample-ops/start.groovy | 5 + .../spring-boot-sample-profile}/pom.xml | 10 +- .../profile/SampleProfileApplication.java | 10 +- .../profile/service/GoodbyeWorldService.java | 2 +- .../profile/service/HelloWorldService.java | 2 +- .../profile/service/MessageService.java | 2 +- .../src/main/resources/application.yml | 0 .../SampleProfileApplicationTests.java | 3 +- .../spring-boot-sample-simple}/pom.xml | 10 +- .../simple/SampleSimpleApplication.java | 10 +- .../simple}/service/HelloWorldService.java | 2 +- .../src/main/resources/application.properties | 0 .../simple/SampleSimpleApplicationTests.java | 3 +- .../spring-boot-sample-tomcat}/pom.xml | 12 +-- .../tomcat/SampleTomcatApplication.java | 6 +- .../tomcat}/service/HelloWorldService.java | 2 +- .../sample/tomcat/web/SampleController.java | 4 +- .../src/main/resources/public/test.css | 0 ...igurationSampleTomcatApplicationTests.java | 15 +-- .../tomcat/SampleTomcatApplicationTests.java | 5 +- .../.gitignore | 0 .../spring-boot-sample-traditional}/pom.xml | 12 +-- .../SampleTraditionalApplication.java | 6 +- .../sample/traditional/config/WebConfig.java | 2 +- .../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 .../SampleTraditionalApplicationTests.java | 5 +- .../src/test/resources/log4j.properties | 0 .../spring-boot-sample-web-ui}/pom.xml | 18 ++-- .../ui/InMemoryMessageRespository.java | 2 +- .../boot/sample}/ui/Message.java | 2 +- .../boot/sample}/ui/MessageRepository.java | 2 +- .../sample}/ui/SampleWebUiApplication.java | 6 +- .../sample}/ui/mvc/MessageController.java | 6 +- .../src/main/resources/application.properties | 0 .../src/main/resources/favicon.ico | Bin .../src/main/resources/logback.xml | 2 +- .../resources/static/css/bootstrap.min.css | 0 .../main/resources/static/js/jquery-1.7.2.js | 0 .../resources/static/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/SampleWebUiApplicationTests.java | 5 +- .../spring-boot-sample-xml}/pom.xml | 10 +- .../xml/SampleSpringXmlApplication.java | 10 +- .../sample/xml/service/HelloWorldService.java | 2 +- .../META-INF/application-context.xml | 4 +- .../xml/SampleSpringXmlApplicationTests.java | 3 +- .../README.md | 18 ++-- .../docs/Features.md | 0 .../pom.xml | 6 +- .../springframework/boot/strap}/Banner.java | 11 ++- .../boot/strap}/BeanDefinitionLoader.java | 2 +- .../boot/strap}/CommandLineRunner.java | 2 +- .../boot/strap}/ExitCodeGenerator.java | 2 +- .../boot/strap}/SpringApplication.java | 4 +- .../strap}/SpringApplicationInitializer.java | 2 +- .../boot/strap}/StartupInfoLogger.java | 2 +- .../boot/strap}/ansi/AnsiElement.java | 2 +- .../boot/strap}/ansi/AnsiOutput.java | 2 +- .../bind/CustomPropertyConstructor.java | 2 +- .../boot/strap}/bind/InetAddressEditor.java | 2 +- .../bind/PropertiesConfigurationFactory.java | 2 +- .../bind/PropertySourcesPropertyValues.java | 2 +- .../boot/strap}/bind/RelaxedDataBinder.java | 2 +- .../strap}/bind/YamlConfigurationFactory.java | 2 +- .../strap}/config/ArrayDocumentMatcher.java | 6 +- .../config/DefaultProfileDocumentMatcher.java | 6 +- .../boot/strap}/config/JacksonJsonParser.java | 2 +- .../boot/strap}/config/JsonParser.java | 2 +- .../boot/strap}/config/JsonParserFactory.java | 2 +- .../PropertiesPropertySourceLoader.java | 2 +- .../strap}/config/PropertySourceLoader.java | 2 +- .../boot/strap}/config/SimpleJsonParser.java | 2 +- .../config/SpringProfileDocumentMatcher.java | 6 +- .../boot/strap}/config/YamlJsonParser.java | 2 +- .../strap}/config/YamlMapFactoryBean.java | 2 +- .../boot/strap}/config/YamlProcessor.java | 2 +- .../config/YamlPropertiesFactoryBean.java | 2 +- .../config/YamlPropertySourceLoader.java | 6 +- .../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 +- .../context/condition/SearchStrategy.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 +- .../strap}/context/embedded/ErrorPage.java | 2 +- .../embedded/FilterRegistrationBean.java | 2 +- .../strap}/context/embedded/MimeMappings.java | 4 +- .../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 | 14 +-- ...ervletContextInitializerConfiguration.java | 4 +- .../context/embedded/jetty}/package-info.java | 4 +- .../strap}/context/embedded/package-info.java | 6 +- .../embedded/properties/ServerProperties.java | 14 +-- ...etContextInitializerLifecycleListener.java | 4 +- .../TomcatEmbeddedServletContainer.java | 6 +- ...TomcatEmbeddedServletContainerFactory.java | 16 ++-- .../TomcatEmbeddedWebappClassLoader.java | 2 +- .../embedded/tomcat}/package-info.java | 4 +- ...nfigFileApplicationContextInitializer.java | 16 ++-- ...ontextIdApplicationContextInitializer.java | 2 +- ...DelegateApplicationContextInitializer.java | 2 +- .../LoggingApplicationContextInitializer.java | 8 +- .../VcapApplicationContextInitializer.java | 6 +- .../properties/ConfigurationProperties.java | 2 +- ...urationPropertiesBindingPostProcessor.java | 10 +- ...opertiesBindingPostProcessorRegistrar.java | 2 +- .../ConfigurationPropertiesHolder.java | 2 +- .../EnableConfigurationProperties.java | 2 +- ...ConfigurationPropertiesImportSelector.java | 2 +- .../strap}/logging/AbstractLoggingSystem.java | 2 +- .../boot/strap}/logging/LoggingSystem.java | 2 +- .../logging/java/JavaLoggingSystem.java | 6 +- .../strap}/logging/java/SimpleFormatter.java | 2 +- .../logging/log4j/Log4JLoggingSystem.java | 6 +- .../logging/logback/ColorConverter.java | 6 +- .../logging/logback/LogbackLoggingSystem.java | 6 +- .../WhitespaceThrowableProxyConverter.java | 2 +- .../strap}/web/SpringServletInitializer.java | 6 +- .../main/resources/META-INF/spring.factories | 7 ++ .../src/main/resources/favicon.ico | Bin .../strap}/logging/java/logging.properties | 4 +- .../strap}/logging/log4j/log4j.properties | 0 .../boot/strap}/logging/logback/logback.xml | 4 +- .../boot/strap}/BannerTests.java | 3 +- .../strap}/BeanDefinitionLoaderTests.java | 7 +- .../boot/strap}/SimpleMainTests.java | 7 +- .../boot/strap}/SpringApplicationTests.java | 10 +- .../boot/strap}/StartUpLoggerTests.java | 3 +- .../boot/strap}/TestUtils.java | 2 +- .../boot/strap}/ansi/AnsiOutputTest.java | 16 ++-- .../strap}/bind/BindingPreparationTests.java | 5 +- .../PropertiesConfigurationFactoryTests.java | 4 +- .../PropertySourcesPropertyValuesTests.java | 4 +- .../strap}/bind/RelaxedDataBinderTests.java | 3 +- .../bind/YamlConfigurationFactoryTests.java | 4 +- .../config/ArrayDocumentMatcherTests.java | 5 +- .../strap}/config/JacksonParserTests.java | 6 +- .../strap}/config/SimpleJsonParserTests.java | 6 +- .../strap}/config/YamlJsonParserTests.java | 6 +- .../config/YamlMapFactoryBeanTests.java | 6 +- .../strap}/config/YamlProcessorTests.java | 5 +- .../YamlPropertiesFactoryBeanTests.java | 9 +- .../context/condition/AssertMissingBean.java | 4 +- .../condition/AssertMissingBeanCondition.java | 4 +- .../condition/OnBeanConditionTests.java | 7 +- .../condition/OnClassConditionTests.java | 8 +- .../condition/OnExpressionConditionTests.java | 6 +- .../OnMissingBeanConditionTests.java | 5 +- .../OnMissingClassConditionTests.java | 6 +- .../OnNotWebApplicationConditionTests.java | 8 +- .../condition/OnResourceConditionTests.java | 6 +- .../OnWebApplicationConditionTests.java | 8 +- ...tEmbeddedServletContainerFactoryTests.java | 9 +- ...figEmbeddedWebApplicationContextTests.java | 8 +- ...edServletContainerMvcIntegrationTests.java | 8 +- .../EmbeddedWebApplicationContextTests.java | 10 +- .../context/embedded/ExampleFilter.java | 2 +- .../context/embedded/ExampleServlet.java | 2 +- .../embedded/FilterRegistrationBeanTests.java | 6 +- .../context/embedded/MimeMappingsTests.java | 3 +- .../MockEmbeddedServletContainerFactory.java | 7 +- .../strap}/context/embedded/MockFilter.java | 2 +- .../strap}/context/embedded/MockServlet.java | 2 +- .../ServletRegistrationBeanTests.java | 4 +- ...XmlEmbeddedWebApplicationContextTests.java | 4 +- ...leEmbeddedWebApplicationConfiguration.java | 10 +- ...yEmbeddedServletContainerFactoryTests.java | 6 +- .../properties/ServerPropertiesTests.java | 6 +- ...tEmbeddedServletContainerFactoryTests.java | 6 +- ...ileApplicationContextInitializerTests.java | 3 +- ...tIdApplicationContextInitializerTests.java | 6 +- ...gateApplicationContextInitializerTest.java | 4 +- ...ingApplicationContextInitializerTests.java | 7 +- ...capApplicationContextInitializerTests.java | 6 +- .../EnableConfigurationPropertiesTests.java | 14 +-- .../EnableConfigurationPropertiesTests.java | 6 +- .../logging/java/JavaLoggerSystemTests.java | 3 +- .../strap}/logging/java/TestFormatter.java | 2 +- .../logging/logback/ColorConverterTests.java | 5 +- .../logback/LogbackLoggingSystemTests.java | 4 +- ...hitespaceThrowableProxyConverterTests.java | 3 +- .../boot/strap}/sampleconfig/MyComponent.java | 2 +- .../strap}/sampleconfig/package-info.java | 2 +- .../src/test/resources/application.properties | 0 .../src/test/resources/dispatcher.properties | 1 + .../enableprofile-myprofile.properties | 0 .../test/resources/enableprofile.properties | 0 .../src/test/resources/logback-nondefault.xml | 0 .../src/test/resources/logback-test.xml | 4 +- .../resources/logging-nondefault.properties | 0 .../src/test/resources/logging.properties | 2 +- .../test/resources/moreproperties.properties | 0 .../src/test/resources/name.yml | 0 .../strap}/context/embedded/conf.properties | 0 ...pleEmbeddedWebApplicationConfiguration.xml | 4 +- .../boot/strap}/context/foo.xml | 0 .../context/properties/testProperties.xml | 4 +- .../boot/strap}/sample-beans.xml | 2 +- .../src/test/resources/other.yml | 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 .../README.md | 0 {spring-starters => spring-boot-ups}/pom.xml | 30 +++--- .../spring-boot-up-batch}/pom.xml | 9 +- .../spring-boot-up-data-jpa}/pom.xml | 9 +- .../spring-boot-up-integration}/pom.xml | 9 +- .../spring-boot-up-jetty}/pom.xml | 7 +- .../spring-boot-up-logging}/pom.xml | 7 +- .../spring-boot-up-ops}/pom.xml | 11 ++- .../spring-boot-up-parent}/pom.xml | 90 +++++++++--------- .../spring-boot-up-security}/pom.xml | 9 +- .../spring-boot-up-tomcat}/pom.xml | 7 +- .../spring-boot-up-web}/pom.xml | 11 ++- spring-boot-ups/spring-boot-up/pom.xml | 28 ++++++ .../src/main/parent/pom.xml | 90 +++++++++--------- .../main/resources/META-INF/spring.factories | 7 -- .../src/test/resources/dispatcher.properties | 1 - .../org.springframework.cli.CommandFactory | 1 - ...ork.cli.compiler.CompilerAutoConfiguration | 6 -- .../test/resources/commands/closure.groovy | 6 -- spring-starters/spring-starter/pom.xml | 62 ------------ .../spring-zero-sample-actuator/start.groovy | 5 - 609 files changed, 1686 insertions(+), 1626 deletions(-) delete mode 100644 spring-actuator/src/main/resources/META-INF/spring.factories delete mode 100644 spring-autoconfigure/src/main/resources/META-INF/spring.factories rename {spring-cli => spring-boot-cli}/README.md (100%) rename {spring-cli => spring-boot-cli}/pom.xml (93%) rename {spring-cli => spring-boot-cli}/samples/app.groovy (100%) rename {spring-cli => spring-boot-cli}/samples/integration.groovy (100%) rename {spring-cli => spring-boot-cli}/samples/job.groovy (100%) rename spring-cli/samples/actuator.groovy => spring-boot-cli/samples/ops.groovy (67%) rename {spring-cli => spring-boot-cli}/samples/reactor.groovy (100%) rename {spring-cli => spring-boot-cli}/samples/runner.groovy (100%) rename {spring-cli => spring-boot-cli}/samples/runner.xml (100%) rename {spring-cli => spring-boot-cli}/samples/template.groovy (78%) rename {spring-cli => spring-boot-cli}/samples/ui.groovy (100%) rename {spring-cli => spring-boot-cli}/samples/web.groovy (100%) rename {spring-cli => spring-boot-cli}/src/main/assembly/descriptor.xml (93%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/Command.java (97%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/CommandFactory.java (96%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/Log.java (96%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/NoSuchCommandException.java (96%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/SpringCli.java (98%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/SpringCliException.java (98%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/AbstractCommand.java (93%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/CleanCommand.java (94%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/CreateCommand.java (94%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/DefaultCommandFactory.java (88%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/OptionHandler.java (97%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/OptionParsingCommand.java (93%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/RunCommand.java (95%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/ScriptCommand.java (96%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/ScriptCompilationCustomizer.java (98%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/command/VersionCommand.java (91%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/AstUtils.java (96%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/CompilerAutoConfiguration.java (98%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/DependencyCustomizer.java (99%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/ExtendedGroovyClassLoader.java (98%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/GroovyCompiler.java (98%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/GroovyCompilerConfiguration.java (95%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java (88%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java (91%) rename spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java => spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java (82%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java (92%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java (87%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java (88%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/runner/SpringApplicationRunner.java (97%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/runner/SpringApplicationRunnerConfiguration.java (90%) rename {spring-cli/src/main/java/org/springframework => spring-boot-cli/src/main/java/org/springframework/boot}/cli/template/GroovyTemplate.java (97%) create mode 100644 spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.CommandFactory create mode 100644 spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration rename {spring-cli => spring-boot-cli}/src/main/resources/META-INF/springcli.properties (89%) rename {spring-cli => spring-boot-cli}/src/main/scripts/spring (98%) rename {spring-cli/src/test/java/org/springframework => spring-boot-cli/src/test/java/org/springframework/boot}/cli/GrapesCleaner.java (80%) rename {spring-cli/src/test/java/org/springframework => spring-boot-cli/src/test/java/org/springframework/boot}/cli/SampleIntegrationTests.java (96%) rename {spring-cli/src/test/java/org/springframework => spring-boot-cli/src/test/java/org/springframework/boot}/cli/SpringCliTests.java (92%) rename {spring-cli/src/test/java/org/springframework => spring-boot-cli/src/test/java/org/springframework/boot}/cli/command/ScriptCommandTests.java (94%) create mode 100644 spring-boot-cli/src/test/resources/commands/closure.groovy rename {spring-cli => spring-boot-cli}/src/test/resources/commands/command.groovy (77%) rename {spring-cli => spring-boot-cli}/src/test/resources/commands/handler.groovy (86%) rename {spring-cli => spring-boot-cli}/src/test/resources/commands/mixin.groovy (61%) rename {spring-cli => spring-boot-cli}/src/test/resources/commands/runnable.groovy (69%) rename {spring-cli => spring-boot-cli}/src/test/resources/commands/script.groovy (100%) rename {spring-cli => spring-boot-cli}/src/test/resources/commands/test.groovy (75%) rename {spring-cli => spring-boot-cli}/src/test/resources/logback.xml (100%) rename {spring-cli => spring-boot-cli}/src/test/resources/static/css/bootstrap.min.css (100%) rename {spring-cli => spring-boot-cli}/src/test/resources/templates/home.html (100%) rename {spring-cli => spring-boot-cli}/src/test/resources/templates/test.txt (100%) rename {spring-autoconfigure => spring-boot-config}/README.md (100%) rename {spring-autoconfigure => spring-boot-config}/pom.xml (94%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/AutoConfigurationSorter.java (99%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/AutoConfigurationUtils.java (97%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/AutoConfigureAfter.java (96%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/ComponentScanDetector.java (99%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/EnableAutoConfiguration.java (85%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/EnableAutoConfigurationImportSelector.java (98%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/MessageSourceAutoConfiguration.java (92%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/PropertyPlaceholderAutoConfiguration.java (92%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/batch/BatchAutoConfiguration.java (77%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/batch/BatchDatabaseInitializer.java (97%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/batch/JobExecutionEvent.java (96%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/batch/JobExecutionExitCodeGenerator.java (93%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/batch/JobLauncherCommandLineRunner.java (96%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/data/JpaRepositoriesAutoConfiguration.java (83%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/data/JpaRepositoriesAutoConfigureRegistrar.java (97%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/jdbc/AbstractDataSourceConfiguration.java (98%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/jdbc/BasicDataSourceConfiguration.java (97%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/jdbc/DataSourceAutoConfiguration.java (96%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/jdbc/DataSourceTransactionManagerAutoConfiguration.java (83%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/jdbc/EmbeddedDatabaseConfiguration.java (96%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/jdbc/TomcatDataSourceConfiguration.java (96%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/orm/jpa/HibernateJpaAutoConfiguration.java (94%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/orm/jpa/JpaBaseConfiguration.java (88%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/reactor/ReactorAutoConfiguration.java (82%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/thymeleaf/ThymeleafAutoConfiguration.java (92%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/web/EmbeddedServletContainerAutoConfiguration.java (82%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/web/MultipartAutoConfiguration.java (81%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/web/ServerPropertiesAutoConfiguration.java (76%) rename {spring-autoconfigure/src/main/java/org/springframework/autoconfigure => spring-boot-config/src/main/java/org/springframework/boot/config}/web/WebMvcAutoConfiguration.java (93%) create mode 100644 spring-boot-config/src/main/resources/META-INF/spring.factories rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/AdhocTestSuite.java (83%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/AutoConfigurationSorterTest.java (94%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/ComponentScanDetectorConfiguration.java (89%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/MessageSourceAutoConfigurationTests.java (91%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/SpringJUnitTests.java (86%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/batch/BatchAutoConfigurationTests.java (90%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/batch/JobExecutionExitCodeGeneratorTests.java (89%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/data/JpaRepositoriesAutoConfigurationTests.java (78%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/data/JpaWebAutoConfigurationTests.java (80%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/data/test/City.java (96%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/data/test/CityRepository.java (95%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/jdbc/BasicDataSourceConfigurationTests.java (91%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/jdbc/DataSourceAutoConfigurationTests.java (95%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java (89%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/jdbc/EmbeddedDatabaseConfigurationTests.java (91%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/jdbc/TomcatDataSourceConfigurationTests.java (91%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/orm/jpa/HibernateJpaAutoConfigurationTests.java (90%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/orm/jpa/test/City.java (96%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/reactor/ReactorAutoConfigurationTests.java (90%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/thymeleaf/ThymeleafAutoConfigurationTests.java (94%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/web/EmbeddedServletContainerAutoConfigurationTests.java (84%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/web/MultipartAutoConfigurationTests.java (92%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/web/ServerPropertiesAutoConfigurationTests.java (82%) rename {spring-autoconfigure/src/test/java/org/springframework/autoconfigure => spring-boot-config/src/test/java/org/springframework/boot/config}/web/WebMvcAutoConfigurationTests.java (87%) rename {spring-autoconfigure/src/test/resources/org/springframework/autoconfigure => spring-boot-config/src/test/resources/org/springframework/boot/config}/jdbc/schema.sql (100%) rename {spring-autoconfigure => spring-boot-config}/src/test/resources/templates/layout.html (100%) rename {spring-autoconfigure => spring-boot-config}/src/test/resources/templates/template.txt (100%) rename {spring-autoconfigure => spring-boot-config}/src/test/resources/templates/tiles.xml (100%) rename {spring-autoconfigure => spring-boot-config}/src/test/resources/templates/view.html (100%) rename {spring-autoconfigure => spring-boot-config}/src/test/resources/test/messages.properties (100%) rename {spring-zero-integration-tests => spring-boot-integration-tests}/pom.xml (76%) rename {spring-launcher => spring-boot-integration-tests}/src/it/settings.xml (100%) rename {spring-launcher => spring-boot-load}/README.md (100%) rename {spring-launcher => spring-boot-load}/pom.xml (90%) rename {spring-launcher => spring-boot-load}/src/it/executable-jar/pom.xml (91%) rename {spring-launcher => spring-boot-load}/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml (100%) rename {spring-launcher => spring-boot-load}/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java (97%) rename {spring-launcher => spring-boot-load}/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java (95%) rename {spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war => spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar}/SpringConfiguration.java (95%) rename {spring-launcher => spring-boot-load}/src/it/executable-war/pom.xml (90%) rename {spring-launcher => spring-boot-load}/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java (95%) rename {spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar => spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war}/SpringConfiguration.java (95%) rename {spring-launcher => spring-boot-load}/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java (96%) rename {spring-launcher => spring-boot-load}/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java (92%) rename {spring-launcher => spring-boot-load}/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java (97%) rename {spring-package-maven-plugin => spring-boot-load}/src/it/settings.xml (100%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/Archive.java (98%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/ExplodedArchive.java (99%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/JarFileArchive.java (95%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/JarLauncher.java (96%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/LaunchedURLClassLoader.java (96%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/Launcher.java (99%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/MainMethodRunner.java (97%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/WarLauncher.java (98%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/data/RandomAccessData.java (97%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/data/RandomAccessDataFile.java (99%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/data/package-info.java (86%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/jar/JarEntryFilter.java (96%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/jar/RandomAccessDataZipEntry.java (92%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/jar/RandomAccessDataZipInputStream.java (97%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/jar/RandomAccessJarFile.java (98%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/jar/package-info.java (94%) rename {spring-launcher/src/main/java/org/springframework/launcher => spring-boot-load/src/main/java/org/springframework/boot/load}/package-info.java (87%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/ByteArrayStartsWith.java (97%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/ExplodedArchiveTests.java (95%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/JarFileArchiveTests.java (93%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/TestJarCreator.java (98%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/data/RandomAccessDataFileTests.java (97%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/jar/RandomAccessDataZipInputStreamTests.java (91%) rename {spring-launcher/src/test/java/org/springframework/launcher => spring-boot-load/src/test/java/org/springframework/boot/load}/jar/RandomAccessJarFileTests.java (97%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/README.md (95%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/pom.xml (94%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/jar/pom.xml (96%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/jar/src/main/java/org/test/SampleApplication.java (100%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/jar/verify.groovy (72%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/run/pom.xml (93%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/run/src/main/java/org/test/SampleApplication.java (100%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/run/verify.groovy (100%) rename {spring-zero-integration-tests => spring-boot-maven-plugin}/src/it/settings.xml (100%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/war/pom.xml (96%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/war/src/main/java/org/test/SampleApplication.java (100%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/war/src/main/webapp/index.html (100%) rename {spring-package-maven-plugin => spring-boot-maven-plugin}/src/it/war/verify.groovy (68%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/AbstractExecutableArchiveMojo.java (98%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/ArchiveHelper.java (96%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/ExecutableArchiveMojo.java (98%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/ExecutableJarHelper.java (92%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/ExecutableWarHelper.java (93%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/MainClassFinder.java (98%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/PropertiesMergingResourceTransformer.java (98%) rename {spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven}/RunMojo.java (99%) rename {spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven}/MainClassFinderTests.java (92%) rename {spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven}/PropertiesMergingResourceTransformerTests.java (94%) rename {spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven}/Verify.java (94%) rename {spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven}/sample/ClassWithMainMethod.java (93%) rename {spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging => spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven}/sample/ClassWithoutMainMethod.java (93%) rename {spring-actuator => spring-boot-ops}/README.md (95%) rename {spring-actuator => spring-boot-ops}/docs/Features.md (100%) rename {spring-actuator => spring-boot-ops}/pom.xml (91%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/audit/AuditEvent.java (98%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/audit/AuditEventRepository.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/audit/InMemoryAuditEventRepository.java (97%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/audit/listener/AuditApplicationEvent.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/audit/listener/AuditListener.java (89%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/AuditAutoConfiguration.java (74%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/EndpointAutoConfiguration.java (78%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/EndpointWebMvcAutoConfiguration.java (84%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/EndpointWebMvcChildContextConfiguration.java (80%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/ErrorMvcAutoConfiguration.java (69%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/ManagementServerPropertiesAutoConfiguration.java (71%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/MetricFilterAutoConfiguration.java (89%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/MetricRepositoryAutoConfiguration.java (69%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/SecurityAutoConfiguration.java (92%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/TraceRepositoryAutoConfiguration.java (76%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/autoconfigure/TraceWebFilterAutoConfiguration.java (81%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/AbstractEndpoint.java (97%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/ActionEndpoint.java (94%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/BeansEndpoint.java (94%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/DumpEndpoint.java (90%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/Endpoint.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/EnvironmentEndpoint.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/HealthEndpoint.java (87%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/InfoEndpoint.java (92%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/MetricsEndpoint.java (89%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/PublicMetrics.java (90%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/ShutdownEndpoint.java (92%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/TraceEndpoint.java (84%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/VanillaPublicMetrics.java (91%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/mvc/EndpointHandlerAdapter.java (98%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/endpoint/mvc/EndpointHandlerMapping.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/health/HealthIndicator.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/health/VanillaHealthIndicator.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/CounterService.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/DefaultCounterService.java (97%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/DefaultGaugeService.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/GaugeService.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/InMemoryMetricRepository.java (98%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/Measurement.java (97%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/Metric.java (98%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/metrics/MetricRepository.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/properties/ManagementServerProperties.java (90%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/properties/SecurityProperties.java (94%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/security/AuthenticationAuditListener.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/security/AuthorizationAuditListener.java (94%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/trace/InMemoryTraceRepository.java (97%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/trace/Trace.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/trace/TraceRepository.java (95%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/trace/WebRequestTraceFilter.java (98%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/web/BasicErrorController.java (96%) rename {spring-actuator/src/main/java/org/springframework/actuate => spring-boot-ops/src/main/java/org/springframework/boot/ops}/web/ErrorController.java (95%) create mode 100644 spring-boot-ops/src/main/resources/META-INF/spring.factories rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/audit/AuditEventTests.java (93%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/audit/InMemoryAuditEventRepositoryTests.java (89%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/audit/listener/AuditListenerTests.java (80%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/AuditAutoConfigurationTests.java (84%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/EndpointAutoConfigurationTests.java (80%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/EndpointWebMvcAutoConfigurationTests.java (89%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java (90%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/MetricFilterAutoConfigurationTests.java (92%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/MetricRepositoryAutoConfigurationTests.java (84%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/SecurityAutoConfigurationTests.java (91%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/TraceRepositoryAutoConfigurationTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/autoconfigure/TraceWebFilterAutoConfigurationTest.java (79%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/AbstractEndpointTests.java (95%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/BeansEndpointTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/DumpEndpointTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/EnvironmentEndpointTests.java (87%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/HealthEndpointTests.java (85%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/InfoEndpointTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/MetricsEndpointTests.java (84%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/ShutdownEndpointTests.java (87%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/TraceEndpointTests.java (81%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/VanillaPublicMetricsTests.java (86%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/mvc/EndpointHandlerAdapterTests.java (86%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/endpoint/mvc/EndpointHandlerMappingTests.java (94%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/fixme/ErrorConfigurationTests.java (97%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/health/VanillaHealthIndicatorTests.java (90%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/metrics/DefaultCounterServiceTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/metrics/DefaultGaugeServiceTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/metrics/InMemoryMetricRepositoryTests.java (89%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/properties/SecurityPropertiesTests.java (91%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/security/AuthenticationAuditListenerTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/security/AuthorizationAuditListenerTests.java (88%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/trace/InMemoryTraceRepositoryTests.java (89%) rename {spring-actuator/src/test/java/org/springframework/actuate => spring-boot-ops/src/test/java/org/springframework/boot/ops}/trace/WebRequestTraceFilterTests.java (88%) rename {spring-actuator => spring-boot-ops}/src/test/resources/git.properties (100%) rename {spring-zero-samples => spring-boot-samples}/pom.xml (53%) rename {spring-zero-samples/spring-zero-sample-batch => spring-boot-samples/spring-boot-sample-batch}/pom.xml (74%) rename {spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot}/sample/batch/SampleBatchApplication.java (93%) rename {spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot}/sample/batch/SampleBatchApplicationTests.java (90%) rename {spring-zero-samples/spring-zero-sample-data-jpa => spring-boot-samples/spring-boot-sample-data-jpa}/pom.xml (76%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/SampleDataJpaApplication.java (84%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/City.java (96%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/Hotel.java (96%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/HotelSummary.java (96%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/Rating.java (92%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/RatingCount.java (94%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/Review.java (98%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/ReviewDetails.java (96%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/TripType.java (92%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/repository/CityRepository.java (89%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/repository/HotelRepository.java (81%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/repository/HotelSummaryRepository.java (91%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/domain/repository/ReviewRepository.java (83%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/service/CitySearchCriteria.java (94%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/service/CityService.java (83%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/service/HotelService.java (76%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/service/ReviewsSummary.java (85%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/service/impl/CityServiceImpl.java (85%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/service/impl/HotelServiceImpl.java (81%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot}/sample/data/jpa/web/SampleController.java (90%) rename {spring-zero-samples/spring-zero-sample-data-jpa => spring-boot-samples/spring-boot-sample-data-jpa}/src/main/resources/application.properties (100%) rename {spring-zero-samples/spring-zero-sample-data-jpa => spring-boot-samples/spring-boot-sample-data-jpa}/src/main/resources/import.sql (100%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot}/sample/data/jpa/SampleDataJpaApplicationTests.java (93%) rename {spring-zero-samples/spring-zero-sample-integration => spring-boot-samples/spring-boot-sample-integration}/pom.xml (68%) rename {spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot}/sample/integration/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot}/sample/integration/SampleEndpoint.java (96%) rename {spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot}/sample/integration/SampleIntegrationApplication.java (81%) rename {spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot}/sample/integration/ServiceProperties.java (87%) rename {spring-zero-samples/spring-zero-sample-integration => spring-boot-samples/spring-boot-sample-integration}/src/main/resources/application.properties (100%) rename {spring-zero-samples/spring-zero-sample-integration => spring-boot-samples/spring-boot-sample-integration}/src/main/resources/integration-context.xml (100%) rename {spring-zero-samples/spring-zero-sample-integration => spring-boot-samples/spring-boot-sample-integration}/src/main/resources/logback.xml (100%) rename {spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot}/sample/integration/consumer/SampleIntegrationApplicationTests.java (91%) rename {spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot}/sample/integration/producer/ProducerApplication.java (88%) rename {spring-zero-samples/spring-zero-sample-jetty => spring-boot-samples/spring-boot-sample-jetty}/pom.xml (76%) rename {spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot}/sample/jetty/SampleJettyApplication.java (85%) rename {spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot}/sample/jetty/service/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot}/sample/jetty/web/SampleController.java (90%) rename {spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot}/sample/jetty/SampleJettyApplicationTests.java (93%) rename {spring-zero-samples/spring-zero-sample-actuator-ui => spring-boot-samples/spring-boot-sample-ops-ui}/pom.xml (79%) rename {spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops}/ui/SampleActuatorUiApplication.java (86%) rename {spring-zero-samples/spring-zero-sample-actuator-ui => spring-boot-samples/spring-boot-sample-ops-ui}/src/main/resources/static/css/bootstrap.min.css (100%) rename {spring-zero-samples/spring-zero-sample-actuator-ui => spring-boot-samples/spring-boot-sample-ops-ui}/src/main/resources/templates/error.html (100%) rename {spring-zero-samples/spring-zero-sample-actuator-ui => spring-boot-samples/spring-boot-sample-ops-ui}/src/main/resources/templates/home.html (100%) rename {spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops}/ui/SampleActuatorUiApplicationPortTests.java (95%) rename {spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops}/ui/SampleActuatorUiApplicationTests.java (95%) rename {spring-zero-samples/spring-zero-sample-actuator => spring-boot-samples/spring-boot-sample-ops}/pom.xml (89%) rename {spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops}/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops}/SampleActuatorApplication.java (79%) rename {spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops}/SampleController.java (96%) rename {spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops}/ServiceProperties.java (87%) rename {spring-zero-samples/spring-zero-sample-actuator => spring-boot-samples/spring-boot-sample-ops}/src/main/resources/application.properties (100%) rename {spring-zero-samples/spring-zero-sample-actuator => spring-boot-samples/spring-boot-sample-ops}/src/main/resources/logback.xml (87%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/EndpointsPropertiesSampleActuatorApplicationTests.java (95%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/ManagementAddressSampleActuatorApplicationTests.java (96%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/ManagementSampleActuatorApplicationTests.java (94%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/NoManagementSampleActuatorApplicationTests.java (96%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/SampleActuatorApplicationTests.java (97%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/ShutdownSampleActuatorApplicationTests.java (96%) rename {spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator => spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops}/UnsecureSampleActuatorApplicationTests.java (94%) create mode 100644 spring-boot-samples/spring-boot-sample-ops/start.groovy rename {spring-zero-samples/spring-zero-sample-profile => spring-boot-samples/spring-boot-sample-profile}/pom.xml (77%) rename {spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot}/sample/profile/SampleProfileApplication.java (83%) rename {spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot}/sample/profile/service/GoodbyeWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot}/sample/profile/service/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot}/sample/profile/service/MessageService.java (92%) rename {spring-zero-samples/spring-zero-sample-profile => spring-boot-samples/spring-boot-sample-profile}/src/main/resources/application.yml (100%) rename {spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot}/sample/profile/SampleProfileApplicationTests.java (95%) rename {spring-zero-samples/spring-zero-sample-xml => spring-boot-samples/spring-boot-sample-simple}/pom.xml (74%) rename {spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot}/sample/simple/SampleSimpleApplication.java (83%) rename {spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat => spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple}/service/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-simple => spring-boot-samples/spring-boot-sample-simple}/src/main/resources/application.properties (100%) rename {spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot}/sample/simple/SampleSimpleApplicationTests.java (94%) rename {spring-zero-samples/spring-zero-sample-tomcat => spring-boot-samples/spring-boot-sample-tomcat}/pom.xml (76%) rename {spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot}/sample/tomcat/SampleTomcatApplication.java (84%) rename {spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple => spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat}/service/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot}/sample/tomcat/web/SampleController.java (90%) rename {spring-zero-samples/spring-zero-sample-tomcat => spring-boot-samples/spring-boot-sample-tomcat}/src/main/resources/public/test.css (100%) rename {spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot}/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java (85%) rename {spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot}/sample/tomcat/SampleTomcatApplicationTests.java (93%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/.gitignore (100%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/pom.xml (79%) rename {spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot}/sample/traditional/SampleTraditionalApplication.java (84%) rename {spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot}/sample/traditional/config/WebConfig.java (97%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/src/main/resources/log4j.properties (100%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/src/main/webapp/WEB-INF/views/home.jsp (100%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/src/main/webapp/index.html (100%) rename {spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot}/sample/traditional/SampleTraditionalApplicationTests.java (94%) rename {spring-zero-samples/spring-zero-sample-traditional => spring-boot-samples/spring-boot-sample-traditional}/src/test/resources/log4j.properties (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/pom.xml (72%) rename {spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web => spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample}/ui/InMemoryMessageRespository.java (96%) rename {spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web => spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample}/ui/Message.java (96%) rename {spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web => spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample}/ui/MessageRepository.java (94%) rename {spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web => spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample}/ui/SampleWebUiApplication.java (89%) rename {spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web => spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample}/ui/mvc/MessageController.java (93%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/application.properties (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/favicon.ico (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/logback.xml (87%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/static/css/bootstrap.min.css (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/static/js/jquery-1.7.2.js (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/static/js/jquery.validate.js (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/templates/layout.html (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/templates/messages/form.html (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/templates/messages/list.html (100%) rename {spring-zero-samples/spring-zero-sample-web-ui => spring-boot-samples/spring-boot-sample-web-ui}/src/main/resources/templates/messages/view.html (100%) rename {spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web => spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample}/ui/SampleWebUiApplicationTests.java (94%) rename {spring-zero-samples/spring-zero-sample-simple => spring-boot-samples/spring-boot-sample-xml}/pom.xml (74%) rename {spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot}/sample/xml/SampleSpringXmlApplication.java (79%) rename {spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot}/sample/xml/service/HelloWorldService.java (94%) rename {spring-zero-samples/spring-zero-sample-xml => spring-boot-samples/spring-boot-sample-xml}/src/main/resources/META-INF/application-context.xml (82%) rename {spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero => spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot}/sample/xml/SampleSpringXmlApplicationTests.java (92%) rename {spring-bootstrap => spring-boot-strap}/README.md (89%) rename {spring-bootstrap => spring-boot-strap}/docs/Features.md (100%) rename {spring-bootstrap => spring-boot-strap}/pom.xml (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/Banner.java (83%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/BeanDefinitionLoader.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/CommandLineRunner.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/ExitCodeGenerator.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/SpringApplication.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/SpringApplicationInitializer.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/StartupInfoLogger.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/ansi/AnsiElement.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/ansi/AnsiOutput.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/bind/CustomPropertyConstructor.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/bind/InetAddressEditor.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/bind/PropertiesConfigurationFactory.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/bind/PropertySourcesPropertyValues.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/bind/RelaxedDataBinder.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/bind/YamlConfigurationFactory.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/ArrayDocumentMatcher.java (89%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/DefaultProfileDocumentMatcher.java (85%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/JacksonJsonParser.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/JsonParser.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/JsonParserFactory.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/PropertiesPropertySourceLoader.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/PropertySourceLoader.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/SimpleJsonParser.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/SpringProfileDocumentMatcher.java (90%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/YamlJsonParser.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/YamlMapFactoryBean.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/YamlProcessor.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/YamlPropertiesFactoryBean.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/config/YamlPropertySourceLoader.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/AbstractOnBeanCondition.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionLogUtils.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnBean.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnClass.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnExpression.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnMissingBean.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnMissingClass.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnNotWebApplication.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnResource.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/ConditionalOnWebApplication.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnBeanCondition.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnClassCondition.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnExpressionCondition.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnMissingBeanCondition.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnMissingClassCondition.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnNotWebApplicationCondition.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnResourceCondition.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/OnWebApplicationCondition.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/condition/SearchStrategy.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/AbstractEmbeddedServletContainerFactory.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/ConfigurableEmbeddedServletContainerFactory.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/EmbeddedServletContainer.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/EmbeddedServletContainerCustomizer.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/EmbeddedServletContainerException.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/EmbeddedServletContainerFactory.java (87%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/EmbeddedWebApplicationContext.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/ErrorPage.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/FilterRegistrationBean.java (99%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/MimeMappings.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/RegistrationBean.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/ServletContextInitializer.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/ServletRegistrationBean.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/WebApplicationContextServletContextAwareProcessor.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/XmlEmbeddedWebApplicationContext.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/jetty/JettyEmbeddedServletContainer.java (92%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/jetty/ServletContextInitializerConfiguration.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat => spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty}/package-info.java (84%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/package-info.java (74%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/properties/ServerProperties.java (87%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java (93%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/tomcat/TomcatEmbeddedServletContainer.java (92%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty => spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat}/package-info.java (76%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/initializer/ConfigFileApplicationContextInitializer.java (93%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/initializer/ContextIdApplicationContextInitializer.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/initializer/EnvironmentDelegateApplicationContextInitializer.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/initializer/LoggingApplicationContextInitializer.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/initializer/VcapApplicationContextInitializer.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/properties/ConfigurationProperties.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/properties/ConfigurationPropertiesBindingPostProcessor.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/properties/ConfigurationPropertiesHolder.java (94%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/properties/EnableConfigurationProperties.java (96%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/context/properties/EnableConfigurationPropertiesImportSelector.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/AbstractLoggingSystem.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/LoggingSystem.java (98%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/java/JavaLoggingSystem.java (88%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/java/SimpleFormatter.java (97%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/log4j/Log4JLoggingSystem.java (87%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/logback/ColorConverter.java (93%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/logback/LogbackLoggingSystem.java (92%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/logging/logback/WhitespaceThrowableProxyConverter.java (95%) rename {spring-bootstrap/src/main/java/org/springframework/bootstrap => spring-boot-strap/src/main/java/org/springframework/boot/strap}/web/SpringServletInitializer.java (94%) create mode 100644 spring-boot-strap/src/main/resources/META-INF/spring.factories rename {spring-bootstrap => spring-boot-strap}/src/main/resources/favicon.ico (100%) rename {spring-bootstrap/src/main/resources/org/springframework/bootstrap => spring-boot-strap/src/main/resources/org/springframework/boot/strap}/logging/java/logging.properties (84%) rename {spring-bootstrap/src/main/resources/org/springframework/bootstrap => spring-boot-strap/src/main/resources/org/springframework/boot/strap}/logging/log4j/log4j.properties (100%) rename {spring-bootstrap/src/main/resources/org/springframework/bootstrap => spring-boot-strap/src/main/resources/org/springframework/boot/strap}/logging/logback/logback.xml (92%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/BannerTests.java (90%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/BeanDefinitionLoaderTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/SimpleMainTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/SpringApplicationTests.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/StartUpLoggerTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/TestUtils.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/ansi/AnsiOutputTest.java (72%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/bind/BindingPreparationTests.java (98%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/bind/PropertiesConfigurationFactoryTests.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/bind/PropertySourcesPropertyValuesTests.java (96%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/bind/RelaxedDataBinderTests.java (99%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/bind/YamlConfigurationFactoryTests.java (96%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/ArrayDocumentMatcherTests.java (90%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/JacksonParserTests.java (83%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/SimpleJsonParserTests.java (92%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/YamlJsonParserTests.java (83%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/YamlMapFactoryBeanTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/YamlProcessorTests.java (91%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/config/YamlPropertiesFactoryBeanTests.java (95%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/AssertMissingBean.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/AssertMissingBeanCondition.java (91%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnBeanConditionTests.java (91%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnClassConditionTests.java (89%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnExpressionConditionTests.java (89%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnMissingBeanConditionTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnMissingClassConditionTests.java (86%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnNotWebApplicationConditionTests.java (85%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnResourceConditionTests.java (90%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/condition/OnWebApplicationConditionTests.java (86%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/EmbeddedWebApplicationContextTests.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/ExampleFilter.java (96%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/ExampleServlet.java (95%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/FilterRegistrationBeanTests.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/MimeMappingsTests.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/MockEmbeddedServletContainerFactory.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/MockFilter.java (95%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/MockServlet.java (94%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/ServletRegistrationBeanTests.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/XmlEmbeddedWebApplicationContextTests.java (94%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java (73%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java (89%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/properties/ServerPropertiesTests.java (91%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java (89%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/initializer/ConfigFileApplicationContextInitializerTests.java (96%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/initializer/ContextIdApplicationContextInitializerTests.java (92%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java (97%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/initializer/LoggingApplicationContextInitializerTests.java (95%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/initializer/VcapApplicationContextInitializerTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/properties/EnableConfigurationPropertiesTests.java (94%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/context/test/EnableConfigurationPropertiesTests.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/logging/java/JavaLoggerSystemTests.java (96%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/logging/java/TestFormatter.java (94%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/logging/logback/ColorConverterTests.java (95%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/logging/logback/LogbackLoggingSystemTests.java (94%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/logging/logback/WhitespaceThrowableProxyConverterTests.java (91%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/sampleconfig/MyComponent.java (93%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-boot-strap/src/test/java/org/springframework/boot/strap}/sampleconfig/package-info.java (92%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/application.properties (100%) create mode 100644 spring-boot-strap/src/test/resources/dispatcher.properties rename {spring-bootstrap => spring-boot-strap}/src/test/resources/enableprofile-myprofile.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/enableprofile.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/logback-nondefault.xml (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/logback-test.xml (77%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/logging-nondefault.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/logging.properties (80%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/moreproperties.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/name.yml (100%) rename {spring-bootstrap/src/test/resources/org/springframework/bootstrap => spring-boot-strap/src/test/resources/org/springframework/boot/strap}/context/embedded/conf.properties (100%) rename {spring-bootstrap/src/test/resources/org/springframework/bootstrap => spring-boot-strap/src/test/resources/org/springframework/boot/strap}/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml (63%) rename {spring-bootstrap/src/test/resources/org/springframework/bootstrap => spring-boot-strap/src/test/resources/org/springframework/boot/strap}/context/foo.xml (100%) rename {spring-bootstrap/src/test/resources/org/springframework/bootstrap => spring-boot-strap/src/test/resources/org/springframework/boot/strap}/context/properties/testProperties.xml (61%) rename {spring-bootstrap/src/test/resources/org/springframework/bootstrap => spring-boot-strap/src/test/resources/org/springframework/boot/strap}/sample-beans.xml (83%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/other.yml (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/specificfile-specificprofile.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/specificlocation.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/testprofiles.yml (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/testproperties.properties (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/testsetprofiles.yml (100%) rename {spring-bootstrap => spring-boot-strap}/src/test/resources/testyaml.yml (100%) rename {spring-starters => spring-boot-ups}/README.md (100%) rename {spring-starters => spring-boot-ups}/pom.xml (65%) rename {spring-starters/spring-starter-batch => spring-boot-ups/spring-boot-up-batch}/pom.xml (79%) rename {spring-starters/spring-starter-data-jpa => spring-boot-ups/spring-boot-up-data-jpa}/pom.xml (82%) rename {spring-starters/spring-starter-integration => spring-boot-ups/spring-boot-up-integration}/pom.xml (87%) rename {spring-starters/spring-starter-jetty => spring-boot-ups/spring-boot-up-jetty}/pom.xml (77%) rename {spring-starters/spring-starter-logging => spring-boot-ups/spring-boot-up-logging}/pom.xml (79%) rename {spring-starters/spring-starter-actuator => spring-boot-ups/spring-boot-up-ops}/pom.xml (71%) rename {spring-starters/spring-starter-parent => spring-boot-ups/spring-boot-up-parent}/pom.xml (80%) rename {spring-starters/spring-starter-security => spring-boot-ups/spring-boot-up-security}/pom.xml (77%) rename {spring-starters/spring-starter-tomcat => spring-boot-ups/spring-boot-up-tomcat}/pom.xml (78%) rename {spring-starters/spring-starter-web => spring-boot-ups/spring-boot-up-web}/pom.xml (76%) create mode 100644 spring-boot-ups/spring-boot-up/pom.xml rename {spring-starters => spring-boot-ups}/src/main/parent/pom.xml (80%) delete mode 100644 spring-bootstrap/src/main/resources/META-INF/spring.factories delete mode 100644 spring-bootstrap/src/test/resources/dispatcher.properties delete mode 100644 spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory delete mode 100644 spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration delete mode 100644 spring-cli/src/test/resources/commands/closure.groovy delete mode 100644 spring-starters/spring-starter/pom.xml delete mode 100644 spring-zero-samples/spring-zero-sample-actuator/start.groovy diff --git a/README.md b/README.md index e730dca76ec..63a408926e5 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ or above. An `alias` can be used for the Spring Zero command line tool: - $ alias spring="java -jar ~/.m2/repository/org/springframework/zero/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar" + $ alias spring="java -jar ~/.m2/repository/org/springframework/boot/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar" _Also see [docs/CONTRIBUTING](docs/CONTRIBUTING.md) if you want to submit pull requests._ @@ -167,22 +167,22 @@ Groovy samples for use with the command line application are available in [spring-cli/samples](spring-cli/samples/#). To run the CLI samples type `spring run .groovy` from samples directory. -Java samples are available in [spring-zero-sample](spring-zero-samples/#) and should +Java samples are available in [spring-boot-sample](spring-boot-samples/#) and should be build with maven and run use `java -jar target/.jar`. The following java samples are provided: -* spring-zero-sample-simple - A simple command line application -* spring-zero-sample-tomcat - Embedded Tomcat -* spring-zero-sample-jetty - Embedded Jetty -* spring-zero-sample-actuator - Simple REST service with production features -* spring-zero-sample-actuator-ui - A web UI example with production features -* spring-zero-sample-web-ui - A thymeleaf web application +* spring-boot-sample-simple - A simple command line application +* spring-boot-sample-tomcat - Embedded Tomcat +* spring-boot-sample-jetty - Embedded Jetty +* spring-boot-sample-actuator - Simple REST service with production features +* spring-boot-sample-actuator-ui - A web UI example with production features +* spring-boot-sample-web-ui - A thymeleaf web application * spring-sample-batch - Define and run a Batch job in a few lines of code * spring-sample-data-jpa - Spring Data JPA + Hibernate + HSQLDB -* spring-zero-sample-integration - A spring integration application -* spring-zero-sample-profile - example showing Spring's `@profile` support -* spring-zero-sample-traditional - shows Spring Zero with more traditional WAR packaging +* spring-boot-sample-integration - A spring integration application +* spring-boot-sample-profile - example showing Spring's `@profile` support +* spring-boot-sample-traditional - shows Spring Zero with more traditional WAR packaging (but also executable using `java -jar`) -* spring-zero-sample-xml - Example show how Spring Zero can be mixed with trditional XML +* spring-boot-sample-xml - Example show how Spring Zero can be mixed with trditional XML configuration diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index d872b1ffcef..71953378cb9 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -45,7 +45,7 @@ changes just won't be automatically formatted._ With the requisite eclipse plugins installed you can select `import existing maven projects` from the `file` menu to import the code. You will -need to import the root `spring-zero` pom and the `spring-zero-samples` pom separately. +need to import the root `spring-boot` pom and the `spring-boot-samples` pom separately. ### Importing into eclipse without m2eclipse diff --git a/pom.xml b/pom.xml index e21afb6da10..e9fae3b8a20 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - org.springframework.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT pom @@ -25,9 +25,9 @@ 1.0.0.M1 - 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 + http://github.com/SpringSource/spring-boot + scm:git:git://github.com/SpringSource/spring-boot.git + scm:git:ssh://git@github.com/SpringSource/spring-boot.git @@ -37,14 +37,14 @@ - spring-bootstrap - spring-autoconfigure - spring-starters - spring-actuator - spring-launcher - spring-package-maven-plugin - spring-cli - spring-zero-integration-tests + spring-boot-strap + spring-boot-config + spring-boot-ops + spring-boot-load + spring-boot-maven-plugin + spring-boot-ups + spring-boot-cli + spring-boot-integration-tests @@ -663,7 +663,7 @@ http://www.springsource.com/download/community spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version} + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version} spring-repo-release diff --git a/spring-actuator/src/main/resources/META-INF/spring.factories b/spring-actuator/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 0c8c1c617e8..00000000000 --- a/spring-actuator/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,11 +0,0 @@ -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-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-autoconfigure/src/main/resources/META-INF/spring.factories deleted file mode 100644 index ae06447374e..00000000000 --- a/spring-autoconfigure/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,15 +0,0 @@ -# Auto Configure -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.reactor.ReactorAutoConfiguration,\ -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-cli/README.md b/spring-boot-cli/README.md similarity index 100% rename from spring-cli/README.md rename to spring-boot-cli/README.md diff --git a/spring-cli/pom.xml b/spring-boot-cli/pom.xml similarity index 93% rename from spring-cli/pom.xml rename to spring-boot-cli/pom.xml index 10688355cf2..7d915fe4474 100644 --- a/spring-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -3,15 +3,15 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-cli + spring-boot-cli jar ${basedir}/.. - org.springframework.cli.SpringCli + org.springframework.boot.cli.SpringCli diff --git a/spring-cli/samples/app.groovy b/spring-boot-cli/samples/app.groovy similarity index 100% rename from spring-cli/samples/app.groovy rename to spring-boot-cli/samples/app.groovy diff --git a/spring-cli/samples/integration.groovy b/spring-boot-cli/samples/integration.groovy similarity index 100% rename from spring-cli/samples/integration.groovy rename to spring-boot-cli/samples/integration.groovy diff --git a/spring-cli/samples/job.groovy b/spring-boot-cli/samples/job.groovy similarity index 100% rename from spring-cli/samples/job.groovy rename to spring-boot-cli/samples/job.groovy diff --git a/spring-cli/samples/actuator.groovy b/spring-boot-cli/samples/ops.groovy similarity index 67% rename from spring-cli/samples/actuator.groovy rename to spring-boot-cli/samples/ops.groovy index cfeb37e84ce..bb327e6579b 100644 --- a/spring-cli/samples/actuator.groovy +++ b/spring-boot-cli/samples/ops.groovy @@ -1,6 +1,6 @@ package org.test -@Grab("org.springframework.zero:spring-actuator:0.5.0.BUILD-SNAPSHOT") +@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT") @Controller class SampleController { diff --git a/spring-cli/samples/reactor.groovy b/spring-boot-cli/samples/reactor.groovy similarity index 100% rename from spring-cli/samples/reactor.groovy rename to spring-boot-cli/samples/reactor.groovy diff --git a/spring-cli/samples/runner.groovy b/spring-boot-cli/samples/runner.groovy similarity index 100% rename from spring-cli/samples/runner.groovy rename to spring-boot-cli/samples/runner.groovy diff --git a/spring-cli/samples/runner.xml b/spring-boot-cli/samples/runner.xml similarity index 100% rename from spring-cli/samples/runner.xml rename to spring-boot-cli/samples/runner.xml diff --git a/spring-cli/samples/template.groovy b/spring-boot-cli/samples/template.groovy similarity index 78% rename from spring-cli/samples/template.groovy rename to spring-boot-cli/samples/template.groovy index 28bd7e0b58e..8ed16759c69 100644 --- a/spring-cli/samples/template.groovy +++ b/spring-boot-cli/samples/template.groovy @@ -1,6 +1,6 @@ package org.test -import static org.springframework.cli.template.GroovyTemplate.template; +import static org.springframework.boot.cli.template.GroovyTemplate.template; @Component class Example implements CommandLineRunner { diff --git a/spring-cli/samples/ui.groovy b/spring-boot-cli/samples/ui.groovy similarity index 100% rename from spring-cli/samples/ui.groovy rename to spring-boot-cli/samples/ui.groovy diff --git a/spring-cli/samples/web.groovy b/spring-boot-cli/samples/web.groovy similarity index 100% rename from spring-cli/samples/web.groovy rename to spring-boot-cli/samples/web.groovy diff --git a/spring-cli/src/main/assembly/descriptor.xml b/spring-boot-cli/src/main/assembly/descriptor.xml similarity index 93% rename from spring-cli/src/main/assembly/descriptor.xml rename to spring-boot-cli/src/main/assembly/descriptor.xml index 7ed0d63ecde..d39bbee1809 100644 --- a/spring-cli/src/main/assembly/descriptor.xml +++ b/spring-boot-cli/src/main/assembly/descriptor.xml @@ -23,7 +23,7 @@ - org.springframework.zero:spring-cli:jar:* + org.springframework.boot:spring-cli:jar:* lib diff --git a/spring-cli/src/main/java/org/springframework/cli/Command.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/Command.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/cli/Command.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/Command.java index 61bd9da595f..f312a6d94c6 100644 --- a/spring-cli/src/main/java/org/springframework/cli/Command.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/Command.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; /** * A single command that can be run from the CLI. diff --git a/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/CommandFactory.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/cli/CommandFactory.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/CommandFactory.java index 96f57bc262d..c5b3a29ffd3 100644 --- a/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/CommandFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; import java.util.Collection; import java.util.ServiceLoader; diff --git a/spring-cli/src/main/java/org/springframework/cli/Log.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/Log.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/cli/Log.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/Log.java index c1d48d51947..6305aa951cb 100644 --- a/spring-cli/src/main/java/org/springframework/cli/Log.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/Log.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; /** * Simple logger used by the CLI. diff --git a/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/NoSuchCommandException.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/NoSuchCommandException.java index d2732ccf0a3..02c52f7e9d8 100644 --- a/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/NoSuchCommandException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; /** * Exception thrown when an unknown command is specified. diff --git a/spring-cli/src/main/java/org/springframework/cli/SpringCli.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java similarity index 98% rename from spring-cli/src/main/java/org/springframework/cli/SpringCli.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java index 7f5df4a5b37..404a106ef96 100644 --- a/spring-cli/src/main/java/org/springframework/cli/SpringCli.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; import java.util.ArrayList; import java.util.Arrays; @@ -76,7 +76,7 @@ public class SpringCli { /** * Run the CLI and handle and errors. * @param args the input arguments - * @return a return status code (non zero is used to indicate an error) + * @return a return status code (non boot is used to indicate an error) */ public int runAndHandleErrors(String... args) { String[] argsWithoutDebugFlags = removeDebugFlags(args); diff --git a/spring-cli/src/main/java/org/springframework/cli/SpringCliException.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCliException.java similarity index 98% rename from spring-cli/src/main/java/org/springframework/cli/SpringCliException.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCliException.java index b6b9913d7b5..d1143f51ef4 100644 --- a/spring-cli/src/main/java/org/springframework/cli/SpringCliException.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCliException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; import java.util.Arrays; import java.util.Collections; diff --git a/spring-cli/src/main/java/org/springframework/cli/command/AbstractCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java similarity index 93% rename from spring-cli/src/main/java/org/springframework/cli/command/AbstractCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java index d1bb3b7c143..fb91a3fc145 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/AbstractCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/AbstractCommand.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; -import org.springframework.cli.Command; +import org.springframework.boot.cli.Command; /** * Abstract {@link Command} implementation. diff --git a/spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CleanCommand.java similarity index 94% rename from spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CleanCommand.java index cfcf859d10c..af0905eec9c 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/CleanCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CleanCommand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import java.io.File; import java.util.ArrayList; @@ -24,8 +24,8 @@ import joptsimple.OptionSet; import joptsimple.OptionSpec; import org.apache.ivy.util.FileUtil; -import org.springframework.cli.Command; -import org.springframework.cli.Log; +import org.springframework.boot.cli.Command; +import org.springframework.boot.cli.Log; /** * {@link Command} to 'clean' up grapes, removing cached dependencies and forcing a @@ -80,8 +80,8 @@ public class CleanCommand extends OptionParsingCommand { return; } ArrayList specs = new ArrayList(options.nonOptionArguments()); - if (!specs.contains("org.springframework.zero") && layout == Layout.IVY) { - specs.add(0, "org.springframework.zero"); + if (!specs.contains("org.springframework.boot") && layout == Layout.IVY) { + specs.add(0, "org.springframework.boot"); } for (Object spec : specs) { if (spec instanceof String) { @@ -103,7 +103,7 @@ public class CleanCommand extends OptionParsingCommand { return; } - if (options.has(this.allOption) || group.equals("org.springframework.zero")) { + if (options.has(this.allOption) || group.equals("org.springframework.boot")) { delete(file); return; } diff --git a/spring-cli/src/main/java/org/springframework/cli/command/CreateCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CreateCommand.java similarity index 94% rename from spring-cli/src/main/java/org/springframework/cli/command/CreateCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CreateCommand.java index 3fbf39cb140..bb1d67abd7e 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/CreateCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CreateCommand.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import joptsimple.OptionSet; -import org.springframework.cli.Command; +import org.springframework.boot.cli.Command; import static java.util.Arrays.asList; diff --git a/spring-cli/src/main/java/org/springframework/cli/command/DefaultCommandFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/DefaultCommandFactory.java similarity index 88% rename from spring-cli/src/main/java/org/springframework/cli/command/DefaultCommandFactory.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/DefaultCommandFactory.java index 00ed6f16e18..75e27406f14 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/DefaultCommandFactory.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/DefaultCommandFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.springframework.cli.Command; -import org.springframework.cli.CommandFactory; +import org.springframework.boot.cli.Command; +import org.springframework.boot.cli.CommandFactory; /** * Default implementation of {@link CommandFactory}. diff --git a/spring-cli/src/main/java/org/springframework/cli/command/OptionHandler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/cli/command/OptionHandler.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java index 66293bae6a4..f5b545058c9 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/OptionHandler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import groovy.lang.Closure; diff --git a/spring-cli/src/main/java/org/springframework/cli/command/OptionParsingCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java similarity index 93% rename from spring-cli/src/main/java/org/springframework/cli/command/OptionParsingCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java index 86a15119a09..bfd9e0c7280 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/OptionParsingCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/OptionParsingCommand.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; -import org.springframework.cli.Command; +import org.springframework.boot.cli.Command; /** * Base class for a {@link Command} that pare options using an {@link OptionHandler}. diff --git a/spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java similarity index 95% rename from spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java index 45799e8b777..4bf123b7456 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/RunCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/RunCommand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import java.awt.Desktop; import java.io.File; @@ -25,9 +25,9 @@ import java.util.logging.Level; import joptsimple.OptionSet; import joptsimple.OptionSpec; -import org.springframework.cli.Command; -import org.springframework.cli.runner.SpringApplicationRunner; -import org.springframework.cli.runner.SpringApplicationRunnerConfiguration; +import org.springframework.boot.cli.Command; +import org.springframework.boot.cli.runner.SpringApplicationRunner; +import org.springframework.boot.cli.runner.SpringApplicationRunnerConfiguration; import static java.util.Arrays.asList; diff --git a/spring-cli/src/main/java/org/springframework/cli/command/ScriptCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCommand.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/cli/command/ScriptCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCommand.java index fe943132cf7..5830a9cc199 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/ScriptCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCommand.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import groovy.lang.Closure; import groovy.lang.GroovyObjectSupport; @@ -30,9 +30,9 @@ import joptsimple.OptionParser; import org.apache.ivy.util.FileUtil; import org.codehaus.groovy.control.CompilationFailedException; -import org.springframework.cli.Command; -import org.springframework.cli.compiler.GroovyCompiler; -import org.springframework.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.boot.cli.Command; +import org.springframework.boot.cli.compiler.GroovyCompiler; +import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration; /** * {@link Command} to run a Groovy script. diff --git a/spring-cli/src/main/java/org/springframework/cli/command/ScriptCompilationCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCompilationCustomizer.java similarity index 98% rename from spring-cli/src/main/java/org/springframework/cli/command/ScriptCompilationCustomizer.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCompilationCustomizer.java index e916972b56a..62abaf62825 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/ScriptCompilationCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/ScriptCompilationCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import groovy.lang.Mixin; @@ -45,7 +45,7 @@ import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.customizers.CompilationCustomizer; import org.codehaus.groovy.control.customizers.ImportCustomizer; import org.objectweb.asm.Opcodes; -import org.springframework.cli.Command; +import org.springframework.boot.cli.Command; /** * Customizer for the compilation of CLI commands. diff --git a/spring-cli/src/main/java/org/springframework/cli/command/VersionCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/VersionCommand.java similarity index 91% rename from spring-cli/src/main/java/org/springframework/cli/command/VersionCommand.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/command/VersionCommand.java index 0d8561d9fae..7c916b9752d 100644 --- a/spring-cli/src/main/java/org/springframework/cli/command/VersionCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/VersionCommand.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; -import org.springframework.cli.Command; +import org.springframework.boot.cli.Command; /** * {@link Command} to display the 'version' number. diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/AstUtils.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/cli/compiler/AstUtils.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java index 22a8aa78c6c..024e14c4d5e 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/AstUtils.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler; +package org.springframework.boot.cli.compiler; import org.codehaus.groovy.ast.AnnotatedNode; import org.codehaus.groovy.ast.AnnotationNode; diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/CompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java similarity index 98% rename from spring-cli/src/main/java/org/springframework/cli/compiler/CompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java index 4e2c18517f6..f521b91aedd 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/CompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler; +package org.springframework.boot.cli.compiler; import groovy.lang.GroovyClassLoader; diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/DependencyCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java similarity index 99% rename from spring-cli/src/main/java/org/springframework/cli/compiler/DependencyCustomizer.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java index 405f69236ec..668d032e842 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/DependencyCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler; +package org.springframework.boot.cli.compiler; import groovy.grape.Grape; import groovy.lang.Grapes; diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/ExtendedGroovyClassLoader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java similarity index 98% rename from spring-cli/src/main/java/org/springframework/cli/compiler/ExtendedGroovyClassLoader.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java index c69c2140bec..803d7e4e98b 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/ExtendedGroovyClassLoader.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler; +package org.springframework.boot.cli.compiler; import groovy.lang.GroovyClassLoader; diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompiler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java similarity index 98% rename from spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompiler.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java index 034185fcf8a..fb9b3abf371 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompiler.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler; +package org.springframework.boot.cli.compiler; import groovy.grape.Grape; import groovy.lang.GroovyClassLoader; @@ -45,7 +45,7 @@ import org.codehaus.groovy.control.customizers.ImportCustomizer; * {@link GroovyClassLoader#parseClass(File)} with the following additional features: *
    *
  • {@link CompilerAutoConfiguration} strategies will be read from - * META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration + * META-INF/services/org.springframework.boot.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/cli/compiler/GroovyCompilerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java similarity index 95% rename from spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java index fe52fbf0364..0858c1b833a 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompilerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler; +package org.springframework.boot.cli.compiler; /** * Configuration for the {@link GroovyCompiler}. diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java similarity index 88% rename from spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java index 69d029aa4a3..d6d61f2f9e8 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/ReactorCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler.autoconfigure; +package org.springframework.boot.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.cli.compiler.AstUtils; -import org.springframework.cli.compiler.CompilerAutoConfiguration; -import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.AstUtils; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for the Recator. diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java similarity index 91% rename from spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java index b96ee1b8a03..c9a44f175a5 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cli.compiler.autoconfigure; +package org.springframework.boot.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.cli.compiler.AstUtils; -import org.springframework.cli.compiler.CompilerAutoConfiguration; -import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.AstUtils; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Batch. diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java similarity index 82% rename from spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java index 9387238f88b..4800e5ebbe0 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringBootCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler.autoconfigure; +package org.springframework.boot.cli.compiler.autoconfigure; import groovy.lang.GroovyClassLoader; @@ -24,9 +24,9 @@ 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.cli.compiler.CompilerAutoConfiguration; -import org.springframework.cli.compiler.DependencyCustomizer; -import org.springframework.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration; /** * {@link CompilerAutoConfiguration} for Spring. @@ -34,14 +34,14 @@ import org.springframework.cli.compiler.GroovyCompilerConfiguration; * @author Dave Syer * @author Phillip Webb */ -public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringBootCompilerAutoConfiguration extends CompilerAutoConfiguration { @Override public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( - "org.springframework.bootstrap.SpringApplication").add( - "org.springframework.zero", "spring-starter", - dependencies.getProperty("spring.zero.version")); + "org.springframework.boot.strap.SpringApplication").add( + "org.springframework.boot", "spring-boot-up", + dependencies.getProperty("spring.boot.version")); } @Override @@ -64,8 +64,8 @@ public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration { "org.springframework.context.MessageSource", "org.springframework.core.annotation.Order", "org.springframework.core.io.ResourceLoader", - "org.springframework.bootstrap.CommandLineRunner", - "org.springframework.autoconfigure.EnableAutoConfiguration"); + "org.springframework.boot.strap.CommandLineRunner", + "org.springframework.boot.config.EnableAutoConfiguration"); imports.addStarImports("org.springframework.stereotype"); } @@ -82,7 +82,7 @@ public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration { if (!hasEnableAutoConfigureAnnotation(classNode)) { try { Class annotationClass = source.getClassLoader().loadClass( - "org.springframework.autoconfigure.EnableAutoConfiguration"); + "org.springframework.boot.config.EnableAutoConfiguration"); AnnotationNode annotationNode = new AnnotationNode(new ClassNode( annotationClass)); classNode.addAnnotation(annotationNode); diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java similarity index 92% rename from spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index d8451c5cb69..bfa98507b27 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.compiler.autoconfigure; +package org.springframework.boot.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.cli.compiler.AstUtils; -import org.springframework.cli.compiler.CompilerAutoConfiguration; -import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.AstUtils; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Integration. diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java similarity index 87% rename from spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index 54915f9aa05..d750dde4158 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cli.compiler.autoconfigure; +package org.springframework.boot.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.cli.compiler.AstUtils; -import org.springframework.cli.compiler.CompilerAutoConfiguration; -import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.AstUtils; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring MVC. @@ -62,7 +62,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio "org.springframework.web.servlet.config.annotation", "org.springframework.web.servlet", "org.springframework.web.servlet.handler", "org.springframework.http"); - imports.addStaticImport("org.springframework.cli.template.GroovyTemplate", + imports.addStaticImport("org.springframework.boot.cli.template.GroovyTemplate", "template"); } diff --git a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java similarity index 88% rename from spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java index dde31cca422..a632a100ff0 100644 --- a/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cli.compiler.autoconfigure; +package org.springframework.boot.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.cli.compiler.AstUtils; -import org.springframework.cli.compiler.CompilerAutoConfiguration; -import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.boot.cli.compiler.AstUtils; +import org.springframework.boot.cli.compiler.CompilerAutoConfiguration; +import org.springframework.boot.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Security. diff --git a/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java index 9d3752d3e55..2bc174d08fa 100644 --- a/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.cli.runner; +package org.springframework.boot.cli.runner; import java.io.File; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.springframework.cli.compiler.GroovyCompiler; +import org.springframework.boot.cli.compiler.GroovyCompiler; /** * Compiles Groovy code running the resulting classes using a {@code SpringApplication}. @@ -135,7 +135,7 @@ public class SpringApplicationRunner { try { // User reflection to load and call Spring Class application = getContextClassLoader().loadClass( - "org.springframework.bootstrap.SpringApplication"); + "org.springframework.boot.strap.SpringApplication"); Method method = application.getMethod("run", Object[].class, String[].class); this.applicationContext = method.invoke(null, this.sources, diff --git a/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunnerConfiguration.java similarity index 90% rename from spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunnerConfiguration.java index 1dbdafa1e66..c587111f558 100644 --- a/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/runner/SpringApplicationRunnerConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.cli.runner; +package org.springframework.boot.cli.runner; import java.util.logging.Level; -import org.springframework.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration; /** * Configuration for the {@link SpringApplicationRunner}. diff --git a/spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/template/GroovyTemplate.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java rename to spring-boot-cli/src/main/java/org/springframework/boot/cli/template/GroovyTemplate.java index 2eeb6d18567..c21ef53c32c 100644 --- a/spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/template/GroovyTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli.template; +package org.springframework.boot.cli.template; import groovy.text.GStringTemplateEngine; import groovy.text.Template; diff --git a/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.CommandFactory b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.CommandFactory new file mode 100644 index 00000000000..3a57546dd10 --- /dev/null +++ b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.CommandFactory @@ -0,0 +1 @@ +org.springframework.boot.cli.command.DefaultCommandFactory diff --git a/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration new file mode 100644 index 00000000000..6154a020326 --- /dev/null +++ b/spring-boot-cli/src/main/resources/META-INF/services/org.springframework.boot.cli.compiler.CompilerAutoConfiguration @@ -0,0 +1,6 @@ +org.springframework.boot.cli.compiler.autoconfigure.SpringBootCompilerAutoConfiguration +org.springframework.boot.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration +org.springframework.boot.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration +org.springframework.boot.cli.compiler.autoconfigure.ReactorCompilerAutoConfiguration +org.springframework.boot.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration +org.springframework.boot.cli.compiler.autoconfigure.SpringSecurityCompilerAutoConfiguration diff --git a/spring-cli/src/main/resources/META-INF/springcli.properties b/spring-boot-cli/src/main/resources/META-INF/springcli.properties similarity index 89% rename from spring-cli/src/main/resources/META-INF/springcli.properties rename to spring-boot-cli/src/main/resources/META-INF/springcli.properties index 353e4c6b8f7..6508092288e 100644 --- a/spring-cli/src/main/resources/META-INF/springcli.properties +++ b/spring-boot-cli/src/main/resources/META-INF/springcli.properties @@ -1,4 +1,4 @@ -spring.zero.version: ${project.version} +spring.boot.version: ${project.version} spring.version: ${spring.version} spring.batch.version: ${spring.batch.version} spring.security.version: ${spring.security.version} diff --git a/spring-cli/src/main/scripts/spring b/spring-boot-cli/src/main/scripts/spring similarity index 98% rename from spring-cli/src/main/scripts/spring rename to spring-boot-cli/src/main/scripts/spring index 35afc1581cf..3e494fe0d58 100755 --- a/spring-cli/src/main/scripts/spring +++ b/spring-boot-cli/src/main/scripts/spring @@ -77,4 +77,4 @@ if $cygwin; then CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` fi -${JAVA_HOME}/bin/java ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.cli.SpringCli $* \ No newline at end of file +${JAVA_HOME}/bin/java ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.cli.SpringCli $* \ No newline at end of file diff --git a/spring-cli/src/test/java/org/springframework/cli/GrapesCleaner.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrapesCleaner.java similarity index 80% rename from spring-cli/src/test/java/org/springframework/cli/GrapesCleaner.java rename to spring-boot-cli/src/test/java/org/springframework/boot/cli/GrapesCleaner.java index d2489705299..30bb525328f 100644 --- a/spring-cli/src/test/java/org/springframework/cli/GrapesCleaner.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/GrapesCleaner.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; import java.io.File; -import org.springframework.cli.command.CleanCommand; +import org.springframework.boot.cli.command.CleanCommand; /** * @author Dave Syer @@ -30,11 +30,13 @@ public class GrapesCleaner { public static void cleanIfNecessary() throws Exception { File installedJar = new File(getMavenRepository(), String.format( - "org/springframework/zero/spring-bootstrap/%s/spring-bootstrap-%s.jar", + "org/springframework/boot/spring-boot-strap/%s/spring-boot-strap-%s.jar", VERSION, VERSION)); - File grapesJar = new File(getGrapesCache(), String.format( - "org.springframework.zero/spring-bootstrap/jars/spring-bootstrap-%s.jar", - VERSION)); + File grapesJar = new File( + getGrapesCache(), + String.format( + "org.springframework.boot/spring-boot-strap/jars/spring-boot-strap-%s.jar", + VERSION)); if (!VERSION.contains("SNAPSHOT") || installedJar.exists() && grapesJar.exists() && installedJar.lastModified() <= grapesJar.lastModified()) { return; diff --git a/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java similarity index 96% rename from spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java rename to spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java index 10f1ec89188..0d12dce8c42 100644 --- a/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cli; +package org.springframework.boot.cli; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -29,7 +29,7 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.cli.command.RunCommand; +import org.springframework.boot.cli.command.RunCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -160,8 +160,8 @@ public class SampleIntegrationTests { } @Test - public void actuatorSample() throws Exception { - start("samples/actuator.groovy"); + public void opsSample() throws Exception { + start("samples/ops.groovy"); String result = FileUtil.readEntirely(new URL("http://localhost:8080") .openStream()); assertEquals("{\"message\":\"Hello World!\"}", result); diff --git a/spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SpringCliTests.java similarity index 92% rename from spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java rename to spring-boot-cli/src/test/java/org/springframework/boot/cli/SpringCliTests.java index 9cc24218d2c..8cd168bd211 100644 --- a/spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SpringCliTests.java @@ -1,4 +1,4 @@ -package org.springframework.cli; +package org.springframework.boot.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.cli.SpringCli.NoArgumentsException; -import org.springframework.cli.SpringCli.NoHelpCommandArgumentsException; +import org.springframework.boot.cli.Command; +import org.springframework.boot.cli.NoSuchCommandException; +import org.springframework.boot.cli.SpringCli; +import org.springframework.boot.cli.SpringCli.NoArgumentsException; +import org.springframework.boot.cli.SpringCli.NoHelpCommandArgumentsException; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/ScriptCommandTests.java similarity index 94% rename from spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java rename to spring-boot-cli/src/test/java/org/springframework/boot/cli/command/ScriptCommandTests.java index f33c215b59b..ee035d9008a 100644 --- a/spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/ScriptCommandTests.java @@ -14,14 +14,16 @@ * limitations under the License. */ -package org.springframework.cli.command; +package org.springframework.boot.cli.command; import groovy.lang.GroovyObjectSupport; import groovy.lang.Script; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.cli.GrapesCleaner; +import org.springframework.boot.cli.GrapesCleaner; +import org.springframework.boot.cli.command.OptionHandler; +import org.springframework.boot.cli.command.ScriptCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/spring-boot-cli/src/test/resources/commands/closure.groovy b/spring-boot-cli/src/test/resources/commands/closure.groovy new file mode 100644 index 00000000000..0536ce933d5 --- /dev/null +++ b/spring-boot-cli/src/test/resources/commands/closure.groovy @@ -0,0 +1,6 @@ +def run = { msg -> + org.springframework.boot.cli.command.ScriptCommandTests.executed = true + println "Hello ${msg}" +} + +run diff --git a/spring-cli/src/test/resources/commands/command.groovy b/spring-boot-cli/src/test/resources/commands/command.groovy similarity index 77% rename from spring-cli/src/test/resources/commands/command.groovy rename to spring-boot-cli/src/test/resources/commands/command.groovy index 0563cbc34e3..317ee74219c 100644 --- a/spring-cli/src/test/resources/commands/command.groovy +++ b/spring-boot-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.cli.command.ScriptCommandTests.executed = true + org.springframework.boot.cli.command.ScriptCommandTests.executed = true println "Hello ${args[0]}" } diff --git a/spring-cli/src/test/resources/commands/handler.groovy b/spring-boot-cli/src/test/resources/commands/handler.groovy similarity index 86% rename from spring-cli/src/test/resources/commands/handler.groovy rename to spring-boot-cli/src/test/resources/commands/handler.groovy index c26942aa6e1..2b0e7b5b764 100644 --- a/spring-cli/src/test/resources/commands/handler.groovy +++ b/spring-boot-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.cli.command.ScriptCommandTests.executed = true + org.springframework.boot.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-boot-cli/src/test/resources/commands/mixin.groovy similarity index 61% rename from spring-cli/src/test/resources/commands/mixin.groovy rename to spring-boot-cli/src/test/resources/commands/mixin.groovy index 1f0577030af..4e2b1a8c967 100644 --- a/spring-cli/src/test/resources/commands/mixin.groovy +++ b/spring-boot-cli/src/test/resources/commands/mixin.groovy @@ -2,5 +2,5 @@ void options() { option "foo", "Foo set" } -org.springframework.cli.command.ScriptCommandTests.executed = true +org.springframework.boot.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-boot-cli/src/test/resources/commands/runnable.groovy similarity index 69% rename from spring-cli/src/test/resources/commands/runnable.groovy rename to spring-boot-cli/src/test/resources/commands/runnable.groovy index f181bab888c..e54e02287c2 100644 --- a/spring-cli/src/test/resources/commands/runnable.groovy +++ b/spring-boot-cli/src/test/resources/commands/runnable.groovy @@ -4,7 +4,7 @@ class TestCommand implements Runnable { this.msg = msg } void run() { - org.springframework.cli.command.ScriptCommandTests.executed = true + org.springframework.boot.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } } diff --git a/spring-cli/src/test/resources/commands/script.groovy b/spring-boot-cli/src/test/resources/commands/script.groovy similarity index 100% rename from spring-cli/src/test/resources/commands/script.groovy rename to spring-boot-cli/src/test/resources/commands/script.groovy diff --git a/spring-cli/src/test/resources/commands/test.groovy b/spring-boot-cli/src/test/resources/commands/test.groovy similarity index 75% rename from spring-cli/src/test/resources/commands/test.groovy rename to spring-boot-cli/src/test/resources/commands/test.groovy index 102275ccf0c..0b3ffa45456 100644 --- a/spring-cli/src/test/resources/commands/test.groovy +++ b/spring-boot-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.cli.command.ScriptCommandTests.executed = true +org.springframework.boot.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}" diff --git a/spring-cli/src/test/resources/logback.xml b/spring-boot-cli/src/test/resources/logback.xml similarity index 100% rename from spring-cli/src/test/resources/logback.xml rename to spring-boot-cli/src/test/resources/logback.xml diff --git a/spring-cli/src/test/resources/static/css/bootstrap.min.css b/spring-boot-cli/src/test/resources/static/css/bootstrap.min.css similarity index 100% rename from spring-cli/src/test/resources/static/css/bootstrap.min.css rename to spring-boot-cli/src/test/resources/static/css/bootstrap.min.css diff --git a/spring-cli/src/test/resources/templates/home.html b/spring-boot-cli/src/test/resources/templates/home.html similarity index 100% rename from spring-cli/src/test/resources/templates/home.html rename to spring-boot-cli/src/test/resources/templates/home.html diff --git a/spring-cli/src/test/resources/templates/test.txt b/spring-boot-cli/src/test/resources/templates/test.txt similarity index 100% rename from spring-cli/src/test/resources/templates/test.txt rename to spring-boot-cli/src/test/resources/templates/test.txt diff --git a/spring-autoconfigure/README.md b/spring-boot-config/README.md similarity index 100% rename from spring-autoconfigure/README.md rename to spring-boot-config/README.md diff --git a/spring-autoconfigure/pom.xml b/spring-boot-config/pom.xml similarity index 94% rename from spring-autoconfigure/pom.xml rename to spring-boot-config/pom.xml index 5dc7022bed9..f7358267088 100644 --- a/spring-autoconfigure/pom.xml +++ b/spring-boot-config/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-autoconfigure + spring-boot-config jar ${basedir}/.. @@ -16,7 +16,7 @@ ${project.groupId} - spring-bootstrap + spring-boot-strap ${project.version} @@ -118,7 +118,7 @@ ${project.groupId} - spring-bootstrap + spring-boot-strap ${project.version} tests test diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java b/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java similarity index 99% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java index 6bb5e6c25bc..28a8994df45 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationSorter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java b/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java index 703237db73d..2453d905aa1 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigurationUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java b/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java index 41262f74bc9..4e840d047f7 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/AutoConfigureAfter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java b/spring-boot-config/src/main/java/org/springframework/boot/config/ComponentScanDetector.java similarity index 99% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/ComponentScanDetector.java index 6f4ce56f6b8..3fb76984902 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/ComponentScanDetector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java similarity index 85% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java index ed0713e0d79..eebc230303e 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,11 +22,11 @@ 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.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java similarity index 98% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java index 2c8965038db..4b4405bcf23 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/EnableAutoConfigurationImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java index 08614955196..2c6eb3e225b 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/MessageSourceAutoConfiguration.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java index 130ea022015..5affb3b2c2e 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/PropertyPlaceholderAutoConfiguration.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; -import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java similarity index 77% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java index caf7921571d..96c55ce2a3a 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchAutoConfiguration.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.CommandLineRunner; +import org.springframework.boot.strap.ExitCodeGenerator; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java index 2f1a89247c0..99e99e45332 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/BatchDatabaseInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.batch; import javax.annotation.PostConstruct; import javax.sql.DataSource; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java index 45de40a4322..064235c9320 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.batch; import org.springframework.batch.core.JobExecution; import org.springframework.context.ApplicationEvent; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java similarity index 93% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java index a34c38524e8..4231c8013f0 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobExecutionExitCodeGenerator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.batch; import java.util.ArrayList; import java.util.List; import org.springframework.batch.core.JobExecution; -import org.springframework.bootstrap.ExitCodeGenerator; +import org.springframework.boot.strap.ExitCodeGenerator; import org.springframework.context.ApplicationListener; /** diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java index 6ebdaa48b5a..a21f7e20aa1 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/batch/JobLauncherCommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.batch; import java.util.Arrays; import java.util.Collection; @@ -30,7 +30,7 @@ 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.boot.strap.CommandLineRunner; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.stereotype.Component; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java similarity index 83% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java index 38bcd8698aa..f0a7ec4005b 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfiguration.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.autoconfigure.data; +package org.springframework.boot.config.data; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.context.condition.ConditionalOnClass; -import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java index 5645016437d..8b8e73d97e2 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigureRegistrar.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.autoconfigure.data; +package org.springframework.boot.config.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; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.boot.config.AutoConfigurationUtils; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java similarity index 98% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java index bbe06ebb059..ec7f14321f9 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/AbstractDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java index c2f3f480f2c..21c2bcfd566 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/BasicDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import java.sql.SQLException; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java index 574abe9e039..f9477268a9d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import java.util.ArrayList; import java.util.Arrays; @@ -25,13 +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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionLogUtils; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java similarity index 83% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java index 3d45dad44de..b0a57d75376 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java index 6087ebc1812..d952288ff4c 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import java.util.LinkedHashMap; import java.util.Map; @@ -22,7 +22,7 @@ import java.util.Map; import javax.annotation.PreDestroy; import javax.sql.DataSource; -import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.config.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java index f666315dfe2..e6f73136983 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import javax.annotation.PreDestroy; import javax.sql.DataSource; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java similarity index 94% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java index eb658a2d963..06dbd2618bc 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfiguration.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure.orm.jpa; +package org.springframework.boot.config.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java similarity index 88% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaBaseConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java index 1caf45f2694..e90fe4f1b57 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaBaseConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/orm/jpa/JpaBaseConfiguration.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.springframework.autoconfigure.orm.jpa; +package org.springframework.boot.config.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.bootstrap.context.condition.ConditionalOnExpression; -import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.condition.ConditionalOnWebApplication; +import org.springframework.boot.config.AutoConfigurationUtils; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnExpression; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.orm.jpa.JpaTransactionManager; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/reactor/ReactorAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java similarity index 82% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/reactor/ReactorAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java index b605c5b97c4..9e61a96568a 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/reactor/ReactorAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/reactor/ReactorAutoConfiguration.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.autoconfigure.reactor; +package org.springframework.boot.config.reactor; -import org.springframework.autoconfigure.AutoConfigureAfter; -import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.bootstrap.context.condition.ConditionalOnClass; -import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.web.WebMvcAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java index 05cab907b5b..781612f5a16 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.thymeleaf; +package org.springframework.boot.config.thymeleaf; import java.io.IOException; import java.io.InputStream; @@ -25,13 +25,13 @@ import javax.servlet.Servlet; import nz.net.ultraq.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.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.config.web.WebMvcAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.DefaultResourceLoader; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java similarity index 82% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java index 7c0498260ea..7f3afcc72da 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfiguration.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.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.autoconfigure.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -30,14 +28,16 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.bootstrap.context.condition.ConditionalOnClass; -import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.condition.SearchStrategy; -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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration.EmbeddedServletContainerCustomizerBeanPostProcessorRegistrar; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.condition.SearchStrategy; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.ServletContextInitializer; +import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java similarity index 81% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java index 20d66acca0d..8c5fe3c073d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/web/MultipartAutoConfiguration.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.embedded.EmbeddedWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.multipart.support.StandardServletMultipartResolver; diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java similarity index 76% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java index 8d24953d2d8..af391a7870d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/web/ServerPropertiesAutoConfiguration.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.boot.strap.context.embedded.properties.ServerProperties; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; @@ -44,7 +44,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar private ApplicationContext applicationContext; - @Bean(name = "org.springframework.bootstrap.context.embedded.properties.ServerProperties") + @Bean(name = "org.springframework.boot.strap.context.embedded.properties.ServerProperties") @ConditionalOnMissingBean public ServerProperties serverProperties() { return new ServerProperties(); diff --git a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-config/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java similarity index 93% rename from spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java rename to spring-boot-config/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java index 4a389c9d786..cb8e988bab4 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-boot-config/src/main/java/org/springframework/boot/config/web/WebMvcAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.web; import java.util.Arrays; import java.util.Collection; @@ -22,14 +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.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-boot-config/src/main/resources/META-INF/spring.factories b/spring-boot-config/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..4bc3179f49f --- /dev/null +++ b/spring-boot-config/src/main/resources/META-INF/spring.factories @@ -0,0 +1,15 @@ +# Auto Configure +org.springframework.boot.config.EnableAutoConfiguration=\ +org.springframework.boot.config.MessageSourceAutoConfiguration,\ +org.springframework.boot.config.PropertyPlaceholderAutoConfiguration,\ +org.springframework.boot.config.batch.BatchAutoConfiguration,\ +org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration,\ +org.springframework.boot.config.jdbc.DataSourceAutoConfiguration,\ +org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration,\ +org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration,\ +org.springframework.boot.config.reactor.ReactorAutoConfiguration,\ +org.springframework.boot.config.thymeleaf.ThymeleafAutoConfiguration,\ +org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration,\ +org.springframework.boot.config.web.ServerPropertiesAutoConfiguration,\ +org.springframework.boot.config.web.MultipartAutoConfiguration,\ +org.springframework.boot.config.web.WebMvcAutoConfiguration diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java b/spring-boot-config/src/test/java/org/springframework/boot/config/AdhocTestSuite.java similarity index 83% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/AdhocTestSuite.java index 4c0d7661c53..5b62d501a2d 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/AdhocTestSuite.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.springframework.bootstrap.SimpleMainTests; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; +import org.springframework.boot.strap.SimpleMainTests; +import org.springframework.boot.strap.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/autoconfigure/AutoConfigurationSorterTest.java b/spring-boot-config/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java index 515e64ccdee..1d10c2eae54 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/AutoConfigurationSorterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; import java.util.Arrays; import java.util.List; @@ -23,8 +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.boot.config.AutoConfigurationSorter; +import org.springframework.boot.config.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/autoconfigure/ComponentScanDetectorConfiguration.java b/spring-boot-config/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java index d9080225e68..094258e198d 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/ComponentScanDetectorConfiguration.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; -import org.springframework.autoconfigure.ComponentScanDetector; +import org.springframework.boot.config.ComponentScanDetector; import org.springframework.context.annotation.Import; /** diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java index 954cf8a8c46..22a2ca0a858 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/MessageSourceAutoConfigurationTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; 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.boot.config.MessageSourceAutoConfiguration; +import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/SpringJUnitTests.java similarity index 86% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/SpringJUnitTests.java index f634acb6144..8ef8e83b836 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/SpringJUnitTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.autoconfigure; +package org.springframework.boot.config; 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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.SpringJUnitTests.TestConfiguration; +import org.springframework.boot.strap.context.initializer.ConfigFileApplicationContextInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java index a05424ba4f6..c4ec19fc59e 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/batch/BatchAutoConfigurationTests.java @@ -14,16 +14,12 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.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; @@ -35,6 +31,10 @@ 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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.batch.BatchAutoConfiguration; +import org.springframework.boot.config.batch.JobLauncherCommandLineRunner; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java index 1433f03cde1..118c54609d0 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/batch/JobExecutionExitCodeGeneratorTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.autoconfigure.batch; +package org.springframework.boot.config.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; +import org.springframework.boot.config.batch.JobExecutionEvent; +import org.springframework.boot.config.batch.JobExecutionExitCodeGenerator; import static org.junit.Assert.assertEquals; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java similarity index 78% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java index 3aa7f88c50a..1196c9e0c98 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaRepositoriesAutoConfigurationTests.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.autoconfigure.data; +package org.springframework.boot.config.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.boot.config.ComponentScanDetectorConfiguration; +import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration; +import org.springframework.boot.config.data.test.City; +import org.springframework.boot.config.data.test.CityRepository; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java similarity index 80% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java index 58656ee336b..e5c603929cd 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/data/JpaWebAutoConfigurationTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.autoconfigure.data; +package org.springframework.boot.config.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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.data.JpaRepositoriesAutoConfiguration; +import org.springframework.boot.config.data.test.City; +import org.springframework.boot.config.data.test.CityRepository; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.repository.support.DomainClassConverter; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java b/spring-boot-config/src/test/java/org/springframework/boot/config/data/test/City.java similarity index 96% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/data/test/City.java index 1bab8dd0a3b..67c44e95d5c 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/data/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.data.test; +package org.springframework.boot.config.data.test; import java.io.Serializable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java b/spring-boot-config/src/test/java/org/springframework/boot/config/data/test/CityRepository.java similarity index 95% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/data/test/CityRepository.java index 7879b2c96fc..10bb86b9466 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/data/test/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.data.test; +package org.springframework.boot.config.data.test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java index 4e25fefb337..160e29653a6 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/BasicDataSourceConfigurationTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import javax.sql.DataSource; import org.junit.Test; -import org.springframework.autoconfigure.jdbc.BasicDataSourceConfiguration; +import org.springframework.boot.config.jdbc.BasicDataSourceConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java similarity index 95% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java index 0625fd40e96..ecf0ea7cc46 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import java.util.HashMap; import java.util.Map; @@ -23,8 +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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 59628667be2..0515842659c 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import javax.sql.DataSource; import org.junit.Test; -import org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.jdbc.datasource.DataSourceTransactionManager; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java index d407542eebf..d168a69c197 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/EmbeddedDatabaseConfigurationTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import javax.sql.DataSource; import org.junit.Test; -import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java index 604f14a029e..48e9ba8c08d 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/jdbc/TomcatDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.jdbc; +package org.springframework.boot.config.jdbc; import java.lang.reflect.Field; import java.util.HashMap; @@ -24,10 +24,10 @@ 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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.config.jdbc.TomcatDataSourceConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.util.ReflectionUtils; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java index 5330efae5d4..99f8d23d9dd 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package org.springframework.autoconfigure.orm.jpa; +package org.springframework.boot.config.orm.jpa; import javax.sql.DataSource; import org.junit.After; 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.test.City; -import org.springframework.bootstrap.TestUtils; +import org.springframework.boot.config.ComponentScanDetectorConfiguration; +import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.boot.config.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.boot.config.orm.jpa.HibernateJpaAutoConfiguration; +import org.springframework.boot.config.orm.jpa.test.City; +import org.springframework.boot.strap.TestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java b/spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java similarity index 96% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java index 0b812115014..add14f7df84 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/orm/jpa/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.orm.jpa.test; +package org.springframework.boot.config.orm.jpa.test; import java.io.Serializable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/reactor/ReactorAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/reactor/ReactorAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java index c53a4181911..ef3d0a29a63 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/reactor/ReactorAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/reactor/ReactorAutoConfigurationTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.autoconfigure.reactor; +package org.springframework.boot.config.reactor; import org.junit.Test; +import org.springframework.boot.config.reactor.ReactorAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import reactor.core.Reactor; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java index 5998be72c9e..3666339df43 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/thymeleaf/ThymeleafAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.thymeleaf; +package org.springframework.boot.config.thymeleaf; import java.util.Collections; import java.util.HashMap; @@ -22,8 +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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.thymeleaf.ThymeleafAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java similarity index 84% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java index f1f31df840d..e9dedd197ff 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.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.boot.config.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.boot.strap.context.condition.ConditionalOnExpression; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java similarity index 92% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java index d36e25cee6e..01e58ff0da5 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/web/MultipartAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.web; import javax.servlet.MultipartConfigElement; @@ -22,11 +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.boot.config.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.boot.config.web.MultipartAutoConfiguration; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Controller; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java similarity index 82% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java index 2ad73a28d1f..842542251cc 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/web/ServerPropertiesAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.web; import java.io.File; @@ -24,16 +24,16 @@ 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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration; +import org.springframework.boot.strap.TestUtils; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.properties.ServerProperties; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-config/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java similarity index 87% rename from spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java rename to spring-boot-config/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java index 6bbc6170277..1f8de4636f8 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-boot-config/src/test/java/org/springframework/boot/config/web/WebMvcAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.autoconfigure.web; +package org.springframework.boot.config.web; import java.util.Map; @@ -25,10 +25,11 @@ 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.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory; +import org.springframework.boot.config.web.WebMvcAutoConfiguration; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.HandlerAdapter; diff --git a/spring-autoconfigure/src/test/resources/org/springframework/autoconfigure/jdbc/schema.sql b/spring-boot-config/src/test/resources/org/springframework/boot/config/jdbc/schema.sql similarity index 100% rename from spring-autoconfigure/src/test/resources/org/springframework/autoconfigure/jdbc/schema.sql rename to spring-boot-config/src/test/resources/org/springframework/boot/config/jdbc/schema.sql diff --git a/spring-autoconfigure/src/test/resources/templates/layout.html b/spring-boot-config/src/test/resources/templates/layout.html similarity index 100% rename from spring-autoconfigure/src/test/resources/templates/layout.html rename to spring-boot-config/src/test/resources/templates/layout.html diff --git a/spring-autoconfigure/src/test/resources/templates/template.txt b/spring-boot-config/src/test/resources/templates/template.txt similarity index 100% rename from spring-autoconfigure/src/test/resources/templates/template.txt rename to spring-boot-config/src/test/resources/templates/template.txt diff --git a/spring-autoconfigure/src/test/resources/templates/tiles.xml b/spring-boot-config/src/test/resources/templates/tiles.xml similarity index 100% rename from spring-autoconfigure/src/test/resources/templates/tiles.xml rename to spring-boot-config/src/test/resources/templates/tiles.xml diff --git a/spring-autoconfigure/src/test/resources/templates/view.html b/spring-boot-config/src/test/resources/templates/view.html similarity index 100% rename from spring-autoconfigure/src/test/resources/templates/view.html rename to spring-boot-config/src/test/resources/templates/view.html diff --git a/spring-autoconfigure/src/test/resources/test/messages.properties b/spring-boot-config/src/test/resources/test/messages.properties similarity index 100% rename from spring-autoconfigure/src/test/resources/test/messages.properties rename to spring-boot-config/src/test/resources/test/messages.properties diff --git a/spring-zero-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml similarity index 76% rename from spring-zero-integration-tests/pom.xml rename to spring-boot-integration-tests/pom.xml index 1d16b84aa5b..afdfd46abba 100644 --- a/spring-zero-integration-tests/pom.xml +++ b/spring-boot-integration-tests/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-zero-integration-tests + spring-boot-integration-tests pom ${basedir}/.. @@ -16,67 +16,67 @@ ${project.groupId} - spring-actuator + spring-boot-ops ${project.version} ${project.groupId} - spring-autoconfigure + spring-boot-config ${project.version} ${project.groupId} - spring-cli + spring-boot-cli ${project.version} ${project.groupId} - spring-bootstrap + spring-boot-strap ${project.version} ${project.groupId} - spring-launcher + spring-boot-load ${project.version} ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin ${project.version} ${project.groupId} - spring-starter + spring-boot-up ${project.version} ${project.groupId} - spring-starter-actuator + spring-boot-up-ops ${project.version} ${project.groupId} - spring-starter-batch + spring-boot-up-batch ${project.version} ${project.groupId} - spring-starter-data-jpa + spring-boot-up-data-jpa ${project.version} ${project.groupId} - spring-starter-integration + spring-boot-up-integration ${project.version} ${project.groupId} - spring-starter-security + spring-boot-up-security ${project.version} ${project.groupId} - spring-starter-web + spring-boot-up-web ${project.version} @@ -87,7 +87,7 @@ maven-invoker-plugin src/it/settings.xml - ${project.parent.basedir}/spring-zero-samples/ + ${project.parent.basedir}/spring-boot-samples/ ${project.build.directory}/local-repo ${skipTests} diff --git a/spring-launcher/src/it/settings.xml b/spring-boot-integration-tests/src/it/settings.xml similarity index 100% rename from spring-launcher/src/it/settings.xml rename to spring-boot-integration-tests/src/it/settings.xml diff --git a/spring-launcher/README.md b/spring-boot-load/README.md similarity index 100% rename from spring-launcher/README.md rename to spring-boot-load/README.md diff --git a/spring-launcher/pom.xml b/spring-boot-load/pom.xml similarity index 90% rename from spring-launcher/pom.xml rename to spring-boot-load/pom.xml index 8a9d9e82980..eb729dc8e76 100644 --- a/spring-launcher/pom.xml +++ b/spring-boot-load/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-launcher + spring-boot-load jar ${basedir}/.. diff --git a/spring-launcher/src/it/executable-jar/pom.xml b/spring-boot-load/src/it/executable-jar/pom.xml similarity index 91% rename from spring-launcher/src/it/executable-jar/pom.xml rename to spring-boot-load/src/it/executable-jar/pom.xml index c9b4c7a6ae3..821178099d6 100644 --- a/spring-launcher/src/it/executable-jar/pom.xml +++ b/spring-boot-load/src/it/executable-jar/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.zero.launcher.it + org.springframework.boot.launcher.it executable-jar 0.0.1.BUILD-SNAPSHOT jar @@ -52,10 +52,10 @@ - org.springframework.launcher.JarLauncher + org.springframework.boot.load.JarLauncher - org.springframework.launcher.it.jar.EmbeddedJarStarter + org.springframework.boot.load.it.jar.EmbeddedJarStarter diff --git a/spring-launcher/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml b/spring-boot-load/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml similarity index 100% rename from spring-launcher/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml rename to spring-boot-load/src/it/executable-jar/src/main/assembly/jar-with-dependencies.xml diff --git a/spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java b/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java similarity index 97% rename from spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java rename to spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java index 8bafbd9f8ba..dbac1f7b636 100644 --- a/spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java +++ b/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/EmbeddedJarStarter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.jar; +package org.springframework.boot.load.it.jar; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.servlet.ServletContextHandler; diff --git a/spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java b/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java similarity index 95% rename from spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java rename to spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java index 2ad0474a43d..e81cda737eb 100644 --- a/spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java +++ b/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/ExampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.jar; +package org.springframework.boot.load.it.jar; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java b/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java similarity index 95% rename from spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java rename to spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java index d1fdd10d95b..454dcab9d61 100644 --- a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java +++ b/spring-boot-load/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.war; +package org.springframework.boot.load.it.jar; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-launcher/src/it/executable-war/pom.xml b/spring-boot-load/src/it/executable-war/pom.xml similarity index 90% rename from spring-launcher/src/it/executable-war/pom.xml rename to spring-boot-load/src/it/executable-war/pom.xml index ff2b1118c84..21ba1b2325b 100644 --- a/spring-launcher/src/it/executable-war/pom.xml +++ b/spring-boot-load/src/it/executable-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.zero.launcher.it + org.springframework.boot.launcher.it executable-war 0.0.1.BUILD-SNAPSHOT war @@ -15,10 +15,10 @@ - org.springframework.launcher.WarLauncher + org.springframework.boot.load.WarLauncher - org.springframework.launcher.it.war.embedded.EmbeddedWarStarter + org.springframework.boot.load.it.war.embedded.EmbeddedWarStarter false diff --git a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java similarity index 95% rename from spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java rename to spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java index 3cef4c506a2..9f800df167a 100644 --- a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java +++ b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/ExampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.war; +package org.springframework.boot.load.it.war; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java similarity index 95% rename from spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java rename to spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java index 2d533998db9..b25f1e74741 100644 --- a/spring-launcher/src/it/executable-jar/src/main/java/org/springframework/launcher/it/jar/SpringConfiguration.java +++ b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.jar; +package org.springframework.boot.load.it.war; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java similarity index 96% rename from spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java rename to spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java index 8099eb77c78..43b089873e3 100644 --- a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java +++ b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/SpringInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.war; +package org.springframework.boot.load.it.war; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java similarity index 92% rename from spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java rename to spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java index a3d54083ab2..f86fbb68aa4 100644 --- a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java +++ b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/EmbeddedWarStarter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.launcher.it.war.embedded; +package org.springframework.boot.load.it.war.embedded; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; -import org.springframework.launcher.it.war.SpringInitializer; +import org.springframework.boot.load.it.war.SpringInitializer; /** * Starter to launch the embedded server. NOTE: Jetty annotation scanning is not diff --git a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java similarity index 97% rename from spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java rename to spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java index 9fefb25391a..8056724b899 100644 --- a/spring-launcher/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java +++ b/spring-boot-load/src/it/executable-war/src/main/java/org/springframework/launcher/it/war/embedded/WebApplicationInitializersConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.it.war.embedded; +package org.springframework.boot.load.it.war.embedded; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/spring-package-maven-plugin/src/it/settings.xml b/spring-boot-load/src/it/settings.xml similarity index 100% rename from spring-package-maven-plugin/src/it/settings.xml rename to spring-boot-load/src/it/settings.xml diff --git a/spring-launcher/src/main/java/org/springframework/launcher/Archive.java b/spring-boot-load/src/main/java/org/springframework/boot/load/Archive.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/launcher/Archive.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/Archive.java index 61e2142cdb9..7161c1d8def 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/Archive.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/Archive.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.IOException; import java.net.MalformedURLException; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/ExplodedArchive.java b/spring-boot-load/src/main/java/org/springframework/boot/load/ExplodedArchive.java similarity index 99% rename from spring-launcher/src/main/java/org/springframework/launcher/ExplodedArchive.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/ExplodedArchive.java index 91d221c72c8..95069ad9c01 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/ExplodedArchive.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/ExplodedArchive.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.File; import java.io.FileInputStream; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/JarFileArchive.java b/spring-boot-load/src/main/java/org/springframework/boot/load/JarFileArchive.java similarity index 95% rename from spring-launcher/src/main/java/org/springframework/launcher/JarFileArchive.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/JarFileArchive.java index 6b9c648bcfa..ee270f5df4d 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/JarFileArchive.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/JarFileArchive.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.File; import java.io.IOException; @@ -27,8 +27,8 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.jar.Manifest; -import org.springframework.launcher.jar.JarEntryFilter; -import org.springframework.launcher.jar.RandomAccessJarFile; +import org.springframework.boot.load.jar.JarEntryFilter; +import org.springframework.boot.load.jar.RandomAccessJarFile; /** * {@link Archive} implementation backed by a {@link RandomAccessJarFile}. diff --git a/spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java b/spring-boot-load/src/main/java/org/springframework/boot/load/JarLauncher.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/JarLauncher.java index 6e07532ea37..d6c371a4cda 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/JarLauncher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.util.List; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/LaunchedURLClassLoader.java b/spring-boot-load/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/launcher/LaunchedURLClassLoader.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java index be2368f4bc1..186fa5a97d6 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/LaunchedURLClassLoader.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/LaunchedURLClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.IOException; import java.net.URL; @@ -22,7 +22,7 @@ import java.net.URLClassLoader; import java.security.AccessController; import java.security.PrivilegedExceptionAction; -import org.springframework.launcher.jar.RandomAccessJarFile; +import org.springframework.boot.load.jar.RandomAccessJarFile; /** * {@link ClassLoader} used by the {@link Launcher}. diff --git a/spring-launcher/src/main/java/org/springframework/launcher/Launcher.java b/spring-boot-load/src/main/java/org/springframework/boot/load/Launcher.java similarity index 99% rename from spring-launcher/src/main/java/org/springframework/launcher/Launcher.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/Launcher.java index f097ee8fda4..f6f9b73c02f 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/Launcher.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/Launcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.File; import java.lang.reflect.Constructor; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java b/spring-boot-load/src/main/java/org/springframework/boot/load/MainMethodRunner.java similarity index 97% rename from spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/MainMethodRunner.java index 6fe050bcc2f..6f1a79b1fa2 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/MainMethodRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.lang.reflect.Method; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java b/spring-boot-load/src/main/java/org/springframework/boot/load/WarLauncher.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/WarLauncher.java index 478dc7e914f..2803af2dede 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/WarLauncher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.IOException; import java.util.List; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java b/spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessData.java similarity index 97% rename from spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessData.java index a549b247d41..8c583283b21 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.data; +package org.springframework.boot.load.data; import java.io.InputStream; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java b/spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java similarity index 99% rename from spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java index 687e5c9230f..e25e5542165 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/data/RandomAccessDataFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.data; +package org.springframework.boot.load.data; import java.io.File; import java.io.IOException; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java b/spring-boot-load/src/main/java/org/springframework/boot/load/data/package-info.java similarity index 86% rename from spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/data/package-info.java index 06f1bdc3508..34039e34feb 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/data/package-info.java @@ -17,7 +17,7 @@ /** * Classes and interfaces to allows random access to a block of data. * - * @see org.springframework.launcher.data.RandomAccessData + * @see org.springframework.boot.load.data.RandomAccessData */ -package org.springframework.launcher.data; +package org.springframework.boot.load.data; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java index d368d4586be..443bbc073e2 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/JarEntryFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.jar; import java.util.jar.JarEntry; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java similarity index 92% rename from spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java index 98f641e3603..0f8056c9fd3 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipEntry.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.jar; import java.util.zip.ZipEntry; -import org.springframework.launcher.data.RandomAccessData; +import org.springframework.boot.load.data.RandomAccessData; /** * A {@link ZipEntry} returned from a {@link RandomAccessDataZipInputStream}. diff --git a/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java similarity index 97% rename from spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java index 8f0c6d1340e..2f7bc86bd92 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.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.launcher.data.RandomAccessData; +import org.springframework.boot.load.data.RandomAccessData; /** * A {@link ZipInputStream} backed by {@link RandomAccessData}. Parsed entries provide diff --git a/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java index ffb6368dcbf..af87b3fcd6f 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/RandomAccessJarFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.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.launcher.data.RandomAccessData; -import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.boot.load.data.RandomAccessData; +import org.springframework.boot.load.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/launcher/jar/package-info.java b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/package-info.java similarity index 94% rename from spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/jar/package-info.java index 4a44ebcdb78..31ab1513b2a 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/jar/package-info.java @@ -17,5 +17,5 @@ /** * Support for loading and manipulating JAR/WAR files. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.jar; diff --git a/spring-launcher/src/main/java/org/springframework/launcher/package-info.java b/spring-boot-load/src/main/java/org/springframework/boot/load/package-info.java similarity index 87% rename from spring-launcher/src/main/java/org/springframework/launcher/package-info.java rename to spring-boot-load/src/main/java/org/springframework/boot/load/package-info.java index c05c211eea0..d52d7137b7d 100644 --- a/spring-launcher/src/main/java/org/springframework/launcher/package-info.java +++ b/spring-boot-load/src/main/java/org/springframework/boot/load/package-info.java @@ -20,8 +20,8 @@ * no 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.launcher.JarLauncher - * @see org.springframework.launcher.WarLauncher + * @see org.springframework.boot.load.JarLauncher + * @see org.springframework.boot.load.WarLauncher */ -package org.springframework.launcher; +package org.springframework.boot.load; diff --git a/spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java b/spring-boot-load/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java similarity index 97% rename from spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java index b586f9fb407..81b81084d2c 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/ByteArrayStartsWith.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/spring-launcher/src/test/java/org/springframework/launcher/ExplodedArchiveTests.java b/spring-boot-load/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java similarity index 95% rename from spring-launcher/src/test/java/org/springframework/launcher/ExplodedArchiveTests.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java index 1c6e2967c58..00b656a1f01 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/ExplodedArchiveTests.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/ExplodedArchiveTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.File; import java.io.FileOutputStream; @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.launcher.Archive.Entry; +import org.springframework.boot.load.Archive; +import org.springframework.boot.load.ExplodedArchive; +import org.springframework.boot.load.Archive.Entry; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-launcher/src/test/java/org/springframework/launcher/JarFileArchiveTests.java b/spring-boot-load/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java similarity index 93% rename from spring-launcher/src/test/java/org/springframework/launcher/JarFileArchiveTests.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java index d3c3b732b5f..f7ae0b33868 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/JarFileArchiveTests.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/JarFileArchiveTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.File; import java.net.URL; @@ -25,7 +25,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.launcher.Archive.Entry; +import org.springframework.boot.load.Archive; +import org.springframework.boot.load.JarFileArchive; +import org.springframework.boot.load.Archive.Entry; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-launcher/src/test/java/org/springframework/launcher/TestJarCreator.java b/spring-boot-load/src/test/java/org/springframework/boot/load/TestJarCreator.java similarity index 98% rename from spring-launcher/src/test/java/org/springframework/launcher/TestJarCreator.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/TestJarCreator.java index 362da85e09c..483b9bc1fef 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/TestJarCreator.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/TestJarCreator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher; +package org.springframework.boot.load; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTests.java b/spring-boot-load/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java similarity index 97% rename from spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTests.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java index 245b5e866ac..b07121fdedb 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTests.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/data/RandomAccessDataFileTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.data; +package org.springframework.boot.load.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.launcher.ByteArrayStartsWith; -import org.springframework.launcher.data.RandomAccessData; -import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.boot.load.ByteArrayStartsWith; +import org.springframework.boot.load.data.RandomAccessData; +import org.springframework.boot.load.data.RandomAccessDataFile; /** * Tests for {@link RandomAccessDataFile}. diff --git a/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTests.java b/spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java similarity index 91% rename from spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTests.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java index bba954ec11b..234cb3dec75 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTests.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessDataZipInputStreamTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.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.launcher.data.RandomAccessDataFile; -import org.springframework.launcher.jar.RandomAccessDataZipEntry; -import org.springframework.launcher.jar.RandomAccessDataZipInputStream; +import org.springframework.boot.load.data.RandomAccessDataFile; +import org.springframework.boot.load.jar.RandomAccessDataZipEntry; +import org.springframework.boot.load.jar.RandomAccessDataZipInputStream; /** * Tests for {@link RandomAccessDataZipInputStream}. diff --git a/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTests.java b/spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java similarity index 97% rename from spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTests.java rename to spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java index e374f12ad0f..f55aa7a4d80 100644 --- a/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTests.java +++ b/spring-boot-load/src/test/java/org/springframework/boot/load/jar/RandomAccessJarFileTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.launcher.jar; +package org.springframework.boot.load.jar; import java.io.File; import java.io.FileNotFoundException; @@ -32,8 +32,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.launcher.TestJarCreator; -import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.boot.load.TestJarCreator; +import org.springframework.boot.load.data.RandomAccessDataFile; +import org.springframework.boot.load.jar.JarEntryFilter; +import org.springframework.boot.load.jar.RandomAccessJarFile; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; diff --git a/spring-package-maven-plugin/README.md b/spring-boot-maven-plugin/README.md similarity index 95% rename from spring-package-maven-plugin/README.md rename to spring-boot-maven-plugin/README.md index a475c3a9de9..8d3aea81d22 100644 --- a/spring-package-maven-plugin/README.md +++ b/spring-boot-maven-plugin/README.md @@ -9,7 +9,7 @@ section ```xml - org.springframework.zero + org.springframework.boot spring-package-maven-plugin {{project.version}} diff --git a/spring-package-maven-plugin/pom.xml b/spring-boot-maven-plugin/pom.xml similarity index 94% rename from spring-package-maven-plugin/pom.xml rename to spring-boot-maven-plugin/pom.xml index fb552f43f7f..674a2136b41 100644 --- a/spring-package-maven-plugin/pom.xml +++ b/spring-boot-maven-plugin/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-package-maven-plugin + spring-boot-maven-plugin maven-plugin ${basedir}/.. @@ -16,7 +16,7 @@ ${project.groupId} - spring-launcher + spring-boot-load ${project.version} @@ -97,7 +97,7 @@ maven-plugin-plugin - spring-package + spring-boot diff --git a/spring-package-maven-plugin/src/it/jar/pom.xml b/spring-boot-maven-plugin/src/it/jar/pom.xml similarity index 96% rename from spring-package-maven-plugin/src/it/jar/pom.xml rename to spring-boot-maven-plugin/src/it/jar/pom.xml index 2894197439f..ab120d833b8 100644 --- a/spring-package-maven-plugin/src/it/jar/pom.xml +++ b/spring-boot-maven-plugin/src/it/jar/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.zero.maven.it + org.springframework.boot.maven.it jar 0.0.1.BUILD-SNAPSHOT jar diff --git a/spring-package-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java b/spring-boot-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-package-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java rename to spring-boot-maven-plugin/src/it/jar/src/main/java/org/test/SampleApplication.java diff --git a/spring-package-maven-plugin/src/it/jar/verify.groovy b/spring-boot-maven-plugin/src/it/jar/verify.groovy similarity index 72% rename from spring-package-maven-plugin/src/it/jar/verify.groovy rename to spring-boot-maven-plugin/src/it/jar/verify.groovy index 9af0c9b1cb9..07b375b51fc 100644 --- a/spring-package-maven-plugin/src/it/jar/verify.groovy +++ b/spring-boot-maven-plugin/src/it/jar/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.maven.packaging.*; +import org.springframework.boot.maven.*; Verify.verifyJar( new File( basedir, "target/jar-0.0.1.BUILD-SNAPSHOT.jar" ), "some.random.Main" diff --git a/spring-package-maven-plugin/src/it/run/pom.xml b/spring-boot-maven-plugin/src/it/run/pom.xml similarity index 93% rename from spring-package-maven-plugin/src/it/run/pom.xml rename to spring-boot-maven-plugin/src/it/run/pom.xml index d2b82255d2d..d7bb26c1ba5 100644 --- a/spring-package-maven-plugin/src/it/run/pom.xml +++ b/spring-boot-maven-plugin/src/it/run/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.zero.maven.it + org.springframework.boot.maven.it run 0.0.1.BUILD-SNAPSHOT jar diff --git a/spring-package-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java b/spring-boot-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-package-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java rename to spring-boot-maven-plugin/src/it/run/src/main/java/org/test/SampleApplication.java diff --git a/spring-package-maven-plugin/src/it/run/verify.groovy b/spring-boot-maven-plugin/src/it/run/verify.groovy similarity index 100% rename from spring-package-maven-plugin/src/it/run/verify.groovy rename to spring-boot-maven-plugin/src/it/run/verify.groovy diff --git a/spring-zero-integration-tests/src/it/settings.xml b/spring-boot-maven-plugin/src/it/settings.xml similarity index 100% rename from spring-zero-integration-tests/src/it/settings.xml rename to spring-boot-maven-plugin/src/it/settings.xml diff --git a/spring-package-maven-plugin/src/it/war/pom.xml b/spring-boot-maven-plugin/src/it/war/pom.xml similarity index 96% rename from spring-package-maven-plugin/src/it/war/pom.xml rename to spring-boot-maven-plugin/src/it/war/pom.xml index 01b1234cae1..07302df86dc 100644 --- a/spring-package-maven-plugin/src/it/war/pom.xml +++ b/spring-boot-maven-plugin/src/it/war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.zero.maven.it + org.springframework.boot.maven.it war 0.0.1.BUILD-SNAPSHOT war diff --git a/spring-package-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java b/spring-boot-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-package-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java rename to spring-boot-maven-plugin/src/it/war/src/main/java/org/test/SampleApplication.java diff --git a/spring-package-maven-plugin/src/it/war/src/main/webapp/index.html b/spring-boot-maven-plugin/src/it/war/src/main/webapp/index.html similarity index 100% rename from spring-package-maven-plugin/src/it/war/src/main/webapp/index.html rename to spring-boot-maven-plugin/src/it/war/src/main/webapp/index.html diff --git a/spring-package-maven-plugin/src/it/war/verify.groovy b/spring-boot-maven-plugin/src/it/war/verify.groovy similarity index 68% rename from spring-package-maven-plugin/src/it/war/verify.groovy rename to spring-boot-maven-plugin/src/it/war/verify.groovy index 01221279b22..19135817091 100644 --- a/spring-package-maven-plugin/src/it/war/verify.groovy +++ b/spring-boot-maven-plugin/src/it/war/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.maven.packaging.*; +import org.springframework.boot.maven.*; Verify.verifyWar( new File( basedir, "target/war-0.0.1.BUILD-SNAPSHOT.war" ) diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractExecutableArchiveMojo.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractExecutableArchiveMojo.java index 0d0174799ef..8b8ab65afcb 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractExecutableArchiveMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.File; import java.util.Collections; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ArchiveHelper.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArchiveHelper.java similarity index 96% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ArchiveHelper.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArchiveHelper.java index 839a6b3af64..9e961832c33 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ArchiveHelper.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArchiveHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import org.apache.maven.artifact.Artifact; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableArchiveMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableArchiveMojo.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java index f2004d132b8..d705f7d3a7a 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableArchiveMojo.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableArchiveMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.File; import java.io.FileInputStream; @@ -247,7 +247,7 @@ public class ExecutableArchiveMojo extends AbstractExecutableArchiveMojo { String version = getClass().getPackage().getImplementationVersion(); DefaultArtifact artifact = new DefaultArtifact( - "org.springframework.zero:spring-launcher:" + version); + "org.springframework.boot:spring-boot-load:" + version); ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest( artifact, repositories, "plugin"); ArtifactDescriptorResult descriptorResult = this.repositorySystem diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarHelper.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java similarity index 92% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarHelper.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java index b2d19b05f55..60921440b15 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarHelper.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableJarHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.util.Arrays; import java.util.HashSet; @@ -43,6 +43,6 @@ public class ExecutableJarHelper implements ArchiveHelper { @Override public String getLauncherClass() { - return "org.springframework.launcher.JarLauncher"; + return "org.springframework.boot.load.JarLauncher"; } } diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarHelper.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java similarity index 93% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarHelper.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java index 4e2f7ffac14..d4d86915dfe 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarHelper.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ExecutableWarHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.util.Collections; import java.util.HashMap; @@ -46,6 +46,6 @@ public class ExecutableWarHelper implements ArchiveHelper { @Override public String getLauncherClass() { - return "org.springframework.launcher.WarLauncher"; + return "org.springframework.boot.load.WarLauncher"; } } diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/MainClassFinder.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/MainClassFinder.java index 71d518aac83..bfe924acd06 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/MainClassFinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.BufferedInputStream; import java.io.File; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java index 93c0a70c8f0..d045453a19a 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.IOException; import java.io.InputStream; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/RunMojo.java b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java similarity index 99% rename from spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/RunMojo.java rename to spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java index d05f4fd3f0c..74a2569661c 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/RunMojo.java +++ b/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.File; import java.lang.reflect.Method; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/MainClassFinderTests.java similarity index 92% rename from spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java rename to spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/MainClassFinderTests.java index 63a7ad8ebb1..5ca77c23a9b 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java +++ b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/MainClassFinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.File; import java.io.FileOutputStream; @@ -26,9 +26,9 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.maven.packaging.MainClassFinder; -import org.springframework.maven.packaging.sample.ClassWithMainMethod; -import org.springframework.maven.packaging.sample.ClassWithoutMainMethod; +import org.springframework.boot.maven.MainClassFinder; +import org.springframework.boot.maven.sample.ClassWithMainMethod; +import org.springframework.boot.maven.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/maven/packaging/PropertiesMergingResourceTransformerTests.java b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java similarity index 94% rename from spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java rename to spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java index b39089248e7..346cdbe900e 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java +++ b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/PropertiesMergingResourceTransformerTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.jar.JarOutputStream; import org.junit.Test; -import org.springframework.maven.packaging.PropertiesMergingResourceTransformer; +import org.springframework.boot.maven.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/maven/packaging/Verify.java b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java similarity index 94% rename from spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java rename to spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java index 7727acb2ffe..bba2dda1ca7 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java +++ b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging; +package org.springframework.boot.maven; import java.io.File; import java.util.Enumeration; @@ -109,14 +109,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/launcher/JarLauncher.class")); + + "springframework/boot/load/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("org/" + "test/SampleApplication.class")); } @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.launcher.JarLauncher", manifest + assertEquals("org.springframework.boot.load.JarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals(this.main, manifest.getMainAttributes().getValue("Start-Class")); assertEquals("Foo", manifest.getMainAttributes().getValue("Not-Used")); @@ -138,7 +138,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/launcher/JarLauncher.class")); + + "springframework/boot/load/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("WEB-INF/classes/org/" + "test/SampleApplication.class")); assertTrue("Web content", entries.containsKey("index.html")); @@ -146,7 +146,7 @@ public class Verify { @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.launcher.WarLauncher", manifest + assertEquals("org.springframework.boot.load.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/maven/packaging/sample/ClassWithMainMethod.java b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java rename to spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java index 47957be0743..630276f6fe4 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java +++ b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging.sample; +package org.springframework.boot.maven.sample; /** * Sample class with a main method. diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java rename to spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java index 58d3a2d66f0..b22ecd4ae57 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java +++ b/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/sample/ClassWithoutMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.maven.packaging.sample; +package org.springframework.boot.maven.sample; /** * Sample class without a main method. diff --git a/spring-actuator/README.md b/spring-boot-ops/README.md similarity index 95% rename from spring-actuator/README.md rename to spring-boot-ops/README.md index 4fa88e38df9..599740f7c00 100644 --- a/spring-actuator/README.md +++ b/spring-boot-ops/README.md @@ -1,4 +1,4 @@ -# Spring Zero Actuator +# Spring Boot Ops The aim of this project is minimum fuss for getting applications up and running in production, and in other environments. There is a @@ -24,7 +24,7 @@ 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 Zero Actuator, go to the +of Spring Boot Ops, go to the [Feature Guide](docs/Features.md). # Getting Started @@ -48,24 +48,24 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies: 1.0.0-SNAPSHOT jar - org.springframework.zero + org.springframework.boot spring-starter-parent {{project.version}} - org.springframework.zero + org.springframework.boot spring-starter-web - org.springframework.zero + org.springframework.boot spring-starter-actuator - org.springframework.zero + org.springframework.boot spring-package-maven-plugin @@ -73,7 +73,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 Zero auto +those dependencies. The first dependency adds Spring Boot auto configuration and the Tomcat container to your application, and the second one adds some more opinionated stuff like the default management endpoints. If you prefer Jetty you can just add the @@ -102,7 +102,7 @@ endpoint. An endpoint can be implemented as a Spring MVC } -You can launch that straight away using the Spring Zero CLI +You can launch that straight away using the Spring Boot 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 @@ -156,7 +156,7 @@ on a class and run it. ## Externalizing configuration -Spring Zero likes you to externalize your configuration so you +Spring Boot 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 @@ -176,7 +176,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 Zero itself binds to +Those examples are properties that Spring Boot 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: diff --git a/spring-actuator/docs/Features.md b/spring-boot-ops/docs/Features.md similarity index 100% rename from spring-actuator/docs/Features.md rename to spring-boot-ops/docs/Features.md diff --git a/spring-actuator/pom.xml b/spring-boot-ops/pom.xml similarity index 91% rename from spring-actuator/pom.xml rename to spring-boot-ops/pom.xml index 97ac2466dc6..7f8a7867c25 100644 --- a/spring-actuator/pom.xml +++ b/spring-boot-ops/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-actuator + spring-boot-ops jar ${basedir}/.. @@ -16,7 +16,7 @@ ${project.groupId} - spring-autoconfigure + spring-boot-config ${project.version} @@ -69,7 +69,7 @@ ${project.groupId} - spring-bootstrap + spring-boot-strap ${project.version} tests test diff --git a/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java index 73b26542470..75ca0c69c43 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.audit; +package org.springframework.boot.ops.audit; import java.io.Serializable; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java index 874fdbb7dd9..3751d706c7f 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.audit; +package org.springframework.boot.ops.audit; import java.util.Date; import java.util.List; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java index 399863364be..43127c1031b 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.audit; +package org.springframework.boot.ops.audit; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java index 2fe8910e3c0..92db931a946 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.audit.listener; +package org.springframework.boot.ops.audit.listener; import java.util.Date; import java.util.Map; -import org.springframework.actuate.audit.AuditEvent; +import org.springframework.boot.ops.audit.AuditEvent; import org.springframework.context.ApplicationEvent; import org.springframework.util.Assert; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java index 78c07fdad0d..9cea90835b5 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.audit.listener; +package org.springframework.boot.ops.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.boot.ops.audit.AuditEvent; +import org.springframework.boot.ops.audit.AuditEventRepository; import org.springframework.context.ApplicationListener; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java similarity index 74% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java index 22fd35ec0a1..586b91c15f9 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.audit.AuditEvent; +import org.springframework.boot.ops.audit.AuditEventRepository; +import org.springframework.boot.ops.audit.InMemoryAuditEventRepository; +import org.springframework.boot.ops.audit.listener.AuditListener; +import org.springframework.boot.ops.security.AuthenticationAuditListener; +import org.springframework.boot.ops.security.AuthorizationAuditListener; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java similarity index 78% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java index 0c1c56404c2..fa8309bac8d 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java @@ -14,34 +14,34 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.endpoint.BeansEndpoint; +import org.springframework.boot.ops.endpoint.DumpEndpoint; +import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.ops.endpoint.EnvironmentEndpoint; +import org.springframework.boot.ops.endpoint.HealthEndpoint; +import org.springframework.boot.ops.endpoint.InfoEndpoint; +import org.springframework.boot.ops.endpoint.MetricsEndpoint; +import org.springframework.boot.ops.endpoint.PublicMetrics; +import org.springframework.boot.ops.endpoint.ShutdownEndpoint; +import org.springframework.boot.ops.endpoint.TraceEndpoint; +import org.springframework.boot.ops.endpoint.VanillaPublicMetrics; +import org.springframework.boot.ops.health.HealthIndicator; +import org.springframework.boot.ops.health.VanillaHealthIndicator; +import org.springframework.boot.ops.metrics.InMemoryMetricRepository; +import org.springframework.boot.ops.metrics.MetricRepository; +import org.springframework.boot.ops.trace.InMemoryTraceRepository; +import org.springframework.boot.ops.trace.TraceRepository; +import org.springframework.boot.strap.bind.PropertiesConfigurationFactory; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 84% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java index a2ce8775e2e..d4d62947951 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.boot.config.web.WebMvcAutoConfiguration; +import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.properties.ServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 80% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java index d6457a0a5ce..4274a844826 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.condition.SearchStrategy; -import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.SearchStrategy; +import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 69% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java index 0f77f010a3d..fd6b52c6796 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.web.BasicErrorController; +import org.springframework.boot.ops.web.ErrorController; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.boot.strap.context.embedded.ErrorPage; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 71% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 0d11eb74306..da8458421f7 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration; +import org.springframework.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java index 73b0ed6584e..8b6f09f190c 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.autoconfigure; import java.io.IOException; @@ -27,13 +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.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.metrics.CounterService; +import org.springframework.boot.ops.metrics.GaugeService; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 69% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java index ae9132b1682..295e236882a 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.metrics.CounterService; +import org.springframework.boot.ops.metrics.DefaultCounterService; +import org.springframework.boot.ops.metrics.DefaultGaugeService; +import org.springframework.boot.ops.metrics.GaugeService; +import org.springframework.boot.ops.metrics.InMemoryMetricRepository; +import org.springframework.boot.ops.metrics.MetricRepository; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java index 9a3ad6b6bbe..dfaac6ffaa1 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.boot.ops.properties.SecurityProperties; +import org.springframework.boot.ops.web.ErrorController; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 76% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java index bedc829059f..d6ba454f15e 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.trace.InMemoryTraceRepository; +import org.springframework.boot.ops.trace.TraceRepository; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 81% rename from spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java index 81efc9ed0e0..921f6fe586c 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.AutoConfigureAfter; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.trace.TraceRepository; +import org.springframework.boot.ops.trace.WebRequestTraceFilter; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java index 86bb2d551d0..9600fd4202f 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java index 2c7139de7b1..a4ae2203654 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; /** * Tagging interface used to indicate that {@link Endpoint} that performs some action. diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java index c71b513e0ca..b60e7b9ace6 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import org.springframework.beans.BeansException; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.LiveBeansView; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java index 754c2078f3f..814e7c22783 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.util.Arrays; import java.util.List; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose thread info. diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java index a1770d22248..dbbfd2d4ed5 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import org.springframework.http.MediaType; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java index 42e09427a6a..2254305a2db 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.EnumerablePropertySource; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java similarity index 87% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java index 0da4f1e6b3e..3bf18d9eb8e 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; -import org.springframework.actuate.health.HealthIndicator; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.ops.health.HealthIndicator; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java index 701dd82e35c..8992745e3ba 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java index 508fa696077..66df7f6a7dd 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.metrics.Metric; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java index 72836aef623..ed5d4dca955 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import java.util.Collection; -import org.springframework.actuate.metrics.Metric; +import org.springframework.boot.ops.metrics.Metric; /** * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}. diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java index 7a10b7684e0..6245aabdef8 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java similarity index 84% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java index 3fdbc9acbbd..74a5db7db4a 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.trace.Trace; +import org.springframework.boot.ops.trace.TraceRepository; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java similarity index 91% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java index 44fcf1f0715..bf954008037 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import java.util.Collection; import java.util.LinkedHashSet; -import org.springframework.actuate.metrics.Metric; -import org.springframework.actuate.metrics.MetricRepository; +import org.springframework.boot.ops.metrics.Metric; +import org.springframework.boot.ops.metrics.MetricRepository; import org.springframework.util.Assert; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java index c7984ae2b45..32aa08ca2f7 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint.mvc; +package org.springframework.boot.ops.endpoint.mvc; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +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.boot.ops.endpoint.Endpoint; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java index b37634c9941..c3da435bfb3 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint.mvc; +package org.springframework.boot.ops.endpoint.mvc; import java.util.ArrayList; import java.util.Collection; @@ -23,10 +23,10 @@ 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.boot.ops.endpoint.ActionEndpoint; +import org.springframework.boot.ops.endpoint.Endpoint; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java index 11e85dd672d..7a3c80bd7f9 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.health; +package org.springframework.boot.ops.health; /** * Strategy interface used to provide an indication of application health. diff --git a/spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java index 968a6249a9a..1f813c32908 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.health; +package org.springframework.boot.ops.health; /** * Default implementation of {@link HealthIndicator} that simply returns "ok". diff --git a/spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/CounterService.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/CounterService.java index a42d0012665..e41695b475c 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/CounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.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/actuate/metrics/DefaultCounterService.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java index 973dd0b54fa..7166bc3b5f1 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java index 39cb28733da..2520a68b868 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java index c682a2c9a48..e0fecde0dbe 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.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/actuate/metrics/InMemoryMetricRepository.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java index 7480b479865..c69a3e9fb13 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Measurement.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Measurement.java index 653707da9ef..bc7339cd66b 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Measurement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Metric.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Metric.java index 2250a3f9a1b..03387cb7076 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Metric.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java index 291cc13b29b..aee98274b15 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import java.util.Collection; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java index 86429bbd01e..67367021028 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.properties; +package org.springframework.boot.ops.properties; import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.bootstrap.context.embedded.properties.ServerProperties; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.embedded.properties.ServerProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; /** * Properties for the management server (e.g. port and path settings). diff --git a/spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java index ca866889a6c..36cbabcf2eb 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.actuate.properties; +package org.springframework.boot.ops.properties; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy; /** diff --git a/spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java index ecf10b7bd2c..329030adfdf 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.security; +package org.springframework.boot.ops.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.boot.ops.audit.AuditEvent; +import org.springframework.boot.ops.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java index f0df73c7bb5..4b0267f8584 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.security; +package org.springframework.boot.ops.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.boot.ops.audit.AuditEvent; +import org.springframework.boot.ops.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java index 16b3aa61c5b..79f852487f6 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.trace; +package org.springframework.boot.ops.trace; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/Trace.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/Trace.java index bfa9951e9c3..2b19b92c185 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/Trace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.trace; +package org.springframework.boot.ops.trace; import java.util.Date; import java.util.Map; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java index eb93239c770..c91c2b0e5c6 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.trace; +package org.springframework.boot.ops.trace; import java.util.List; import java.util.Map; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java index d3543cefa5f..b35a630c681 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.trace; +package org.springframework.boot.ops.trace; import java.io.IOException; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java index 5929cae533f..57a288f52ec 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.web; +package org.springframework.boot.ops.web; import java.io.PrintWriter; import java.io.StringWriter; @@ -28,7 +28,7 @@ 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.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java b/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/ErrorController.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java rename to spring-boot-ops/src/main/java/org/springframework/boot/ops/web/ErrorController.java index f9952eb41ad..90ab20eb713 100644 --- a/spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java +++ b/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/ErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.web; +package org.springframework.boot.ops.web; import org.springframework.stereotype.Controller; diff --git a/spring-boot-ops/src/main/resources/META-INF/spring.factories b/spring-boot-ops/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..e997a1aba60 --- /dev/null +++ b/spring-boot-ops/src/main/resources/META-INF/spring.factories @@ -0,0 +1,11 @@ +org.springframework.boot.config.EnableAutoConfiguration=\ +org.springframework.boot.ops.autoconfigure.AuditAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.ErrorMvcAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.MetricFilterAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.MetricRepositoryAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.SecurityAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration,\ +org.springframework.boot.ops.autoconfigure.TraceWebFilterAutoConfiguration diff --git a/spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java similarity index 93% rename from spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java index 114adff90e3..c1b5609db79 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.audit; +package org.springframework.boot.ops.audit; import java.util.Collections; import org.junit.Test; -import org.springframework.actuate.audit.AuditEvent; +import org.springframework.boot.ops.audit.AuditEvent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java index f35d85aee14..afa9b7c9d41 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.audit; +package org.springframework.boot.ops.audit; import java.util.Date; import org.junit.Test; -import org.springframework.actuate.audit.AuditEvent; -import org.springframework.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.boot.ops.audit.AuditEvent; +import org.springframework.boot.ops.audit.InMemoryAuditEventRepository; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java index 5ffdba06503..03adb4db942 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.actuate.audit.listener; +package org.springframework.boot.ops.audit.listener; import java.util.Collections; import org.junit.Test; -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 org.springframework.boot.ops.audit.AuditEvent; +import org.springframework.boot.ops.audit.AuditEventRepository; +import org.springframework.boot.ops.audit.listener.AuditApplicationEvent; +import org.springframework.boot.ops.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/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java similarity index 84% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java index 9718dc805bb..cc1ac71004d 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.ops.audit.AuditEventRepository; +import org.springframework.boot.ops.audit.InMemoryAuditEventRepository; +import org.springframework.boot.ops.autoconfigure.AuditAutoConfiguration; +import org.springframework.boot.ops.security.AuthenticationAuditListener; +import org.springframework.boot.ops.security.AuthorizationAuditListener; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java index debfb531fc5..2c575bbc663 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.ops.autoconfigure.EndpointAutoConfiguration; +import org.springframework.boot.ops.endpoint.BeansEndpoint; +import org.springframework.boot.ops.endpoint.DumpEndpoint; +import org.springframework.boot.ops.endpoint.EnvironmentEndpoint; +import org.springframework.boot.ops.endpoint.HealthEndpoint; +import org.springframework.boot.ops.endpoint.InfoEndpoint; +import org.springframework.boot.ops.endpoint.MetricsEndpoint; +import org.springframework.boot.ops.endpoint.ShutdownEndpoint; +import org.springframework.boot.ops.endpoint.TraceEndpoint; +import org.springframework.boot.strap.TestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 605ae54e46a..509ed7764cd 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.autoconfigure; import java.io.FileNotFoundException; import java.net.SocketException; @@ -23,15 +23,17 @@ import java.nio.charset.Charset; import org.junit.After; import org.junit.Test; -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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.boot.config.web.ServerPropertiesAutoConfiguration; +import org.springframework.boot.config.web.WebMvcAutoConfiguration; +import org.springframework.boot.ops.autoconfigure.EndpointWebMvcAutoConfiguration; +import org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.boot.ops.endpoint.AbstractEndpoint; +import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.strap.TestUtils; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 90% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index 65893ef8e97..3f0e6209616 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.autoconfigure; import org.junit.Test; -import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; -import org.springframework.actuate.properties.ManagementServerProperties; +import org.springframework.boot.ops.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.boot.ops.properties.ManagementServerProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 92% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java index cec7a2cd99e..f9c3a9aeda7 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.autoconfigure; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -22,9 +22,9 @@ 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.boot.ops.autoconfigure.MetricFilterAutoConfiguration; +import org.springframework.boot.ops.metrics.CounterService; +import org.springframework.boot.ops.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 84% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java index 672d4a69e92..865d24b3f5a 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.ops.autoconfigure.MetricRepositoryAutoConfiguration; +import org.springframework.boot.ops.metrics.CounterService; +import org.springframework.boot.ops.metrics.DefaultCounterService; +import org.springframework.boot.ops.metrics.DefaultGaugeService; +import org.springframework.boot.ops.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java similarity index 91% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java index 1a82a5d4568..3e2137e5a1c 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.ops.autoconfigure.EndpointAutoConfiguration; +import org.springframework.boot.ops.autoconfigure.SecurityAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java index fb4f41f0277..a16788027c7 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration; +import org.springframework.boot.ops.trace.InMemoryTraceRepository; +import org.springframework.boot.ops.trace.TraceRepository; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 79% rename from spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java index 6dca0c1a765..6babb455170 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.autoconfigure; +package org.springframework.boot.ops.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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.ops.autoconfigure.TraceRepositoryAutoConfiguration; +import org.springframework.boot.ops.autoconfigure.TraceWebFilterAutoConfiguration; +import org.springframework.boot.ops.trace.WebRequestTraceFilter; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java similarity index 95% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java index 080b1763545..69772423fc7 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.Endpoint; +import org.springframework.boot.strap.TestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java index deda3e4afeb..f136aac4ff6 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import org.junit.Test; -import org.springframework.actuate.endpoint.BeansEndpoint; -import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; +import org.springframework.boot.ops.endpoint.BeansEndpoint; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java index 481ab9fc7ef..c8c6cef70e8 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.DumpEndpoint; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java index f4cf456cbb5..eaf3ba3470d 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import org.junit.Test; -import org.springframework.actuate.endpoint.EnvironmentEndpoint; -import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; +import org.springframework.boot.ops.endpoint.EnvironmentEndpoint; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java similarity index 85% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java index 42c9d655a67..5d9eea55fb9 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.HealthEndpoint; +import org.springframework.boot.ops.health.HealthIndicator; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java index 955331a031e..6e999c17d59 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.InfoEndpoint; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java similarity index 84% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java index aae788d7346..e9c7f234518 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.MetricsEndpoint; +import org.springframework.boot.ops.endpoint.PublicMetrics; +import org.springframework.boot.ops.metrics.Metric; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java index babc5507cd7..7a88efef437 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.ShutdownEndpoint; +import org.springframework.boot.ops.properties.ManagementServerProperties; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java similarity index 81% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java index 092cbb5b1a2..fdd6a03d42f 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.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.boot.ops.endpoint.TraceEndpoint; +import org.springframework.boot.ops.trace.InMemoryTraceRepository; +import org.springframework.boot.ops.trace.Trace; +import org.springframework.boot.ops.trace.TraceRepository; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java similarity index 86% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java index dcada6d2ca1..609ff1e205d 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint; +package org.springframework.boot.ops.endpoint; import java.util.Date; import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.actuate.endpoint.VanillaPublicMetrics; -import org.springframework.actuate.metrics.InMemoryMetricRepository; -import org.springframework.actuate.metrics.Metric; +import org.springframework.boot.ops.endpoint.VanillaPublicMetrics; +import org.springframework.boot.ops.metrics.InMemoryMetricRepository; +import org.springframework.boot.ops.metrics.Metric; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 86% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java index 4d0e3d3736a..de6b220cbb2 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint.mvc; +package org.springframework.boot.ops.endpoint.mvc; import org.junit.Test; -import org.springframework.actuate.endpoint.Endpoint; -import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.boot.ops.endpoint.Endpoint; +import org.springframework.boot.ops.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/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 94% rename from spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java index 7f2012467e0..2396e05de48 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.endpoint.mvc; +package org.springframework.boot.ops.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.boot.ops.endpoint.AbstractEndpoint; +import org.springframework.boot.ops.endpoint.ActionEndpoint; +import org.springframework.boot.ops.endpoint.mvc.EndpointHandlerMapping; import org.springframework.mock.web.MockHttpServletRequest; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java similarity index 97% rename from spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java index 069572ffae1..e4c9abbab30 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.actuate.fixme; +package org.springframework.boot.ops.fixme; /** * @author Dave Syer diff --git a/spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java similarity index 90% rename from spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java index bb028061046..7ab275d9d7d 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.actuate.health; +package org.springframework.boot.ops.health; import org.junit.Test; -import org.springframework.actuate.health.VanillaHealthIndicator; +import org.springframework.boot.ops.health.VanillaHealthIndicator; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java index 096cd82772e..f933f363238 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.actuate.metrics.DefaultCounterService; +import org.springframework.boot.ops.metrics.DefaultCounterService; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java index 11a83466ba6..970833712a0 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.actuate.metrics.DefaultGaugeService; +import org.springframework.boot.ops.metrics.DefaultGaugeService; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java index bea311bea42..de0aed551c8 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.metrics; +package org.springframework.boot.ops.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.actuate.metrics.InMemoryMetricRepository; +import org.springframework.boot.ops.metrics.InMemoryMetricRepository; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java similarity index 91% rename from spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java index 8f4bd1ba5f4..029d3230808 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.properties; +package org.springframework.boot.ops.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.boot.ops.properties.SecurityProperties; +import org.springframework.boot.strap.bind.RelaxedDataBinder; import org.springframework.core.convert.support.DefaultConversionService; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java index cf453a13835..f5f45b1429d 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.security; +package org.springframework.boot.ops.security; import org.junit.Ignore; import org.junit.Test; -import org.springframework.actuate.security.AuthenticationAuditListener; +import org.springframework.boot.ops.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java index 5de62f12e52..74408d2b8b8 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.actuate.security; +package org.springframework.boot.ops.security; import org.junit.Ignore; import org.junit.Test; -import org.springframework.actuate.security.AuthenticationAuditListener; +import org.springframework.boot.ops.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java index 1b134e17fa8..4302c3acf36 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.actuate.trace; +package org.springframework.boot.ops.trace; import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.actuate.trace.InMemoryTraceRepository; -import org.springframework.actuate.trace.Trace; +import org.springframework.boot.ops.trace.InMemoryTraceRepository; +import org.springframework.boot.ops.trace.Trace; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java b/spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java rename to spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java index 94abd500f88..d0c25dd8801 100644 --- a/spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java +++ b/spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.actuate.trace; +package org.springframework.boot.ops.trace; import java.util.Map; import org.junit.Test; -import org.springframework.actuate.trace.InMemoryTraceRepository; -import org.springframework.actuate.trace.WebRequestTraceFilter; +import org.springframework.boot.ops.trace.InMemoryTraceRepository; +import org.springframework.boot.ops.trace.WebRequestTraceFilter; import org.springframework.mock.web.MockHttpServletRequest; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/resources/git.properties b/spring-boot-ops/src/test/resources/git.properties similarity index 100% rename from spring-actuator/src/test/resources/git.properties rename to spring-boot-ops/src/test/resources/git.properties diff --git a/spring-zero-samples/pom.xml b/spring-boot-samples/pom.xml similarity index 53% rename from spring-zero-samples/pom.xml rename to spring-boot-samples/pom.xml index 760abd07173..a34ad3517cc 100644 --- a/spring-zero-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -3,35 +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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-zero-samples + spring-boot-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 + spring-boot-sample-ops + spring-boot-sample-ops-ui + spring-boot-sample-batch + spring-boot-sample-data-jpa + spring-boot-sample-integration + spring-boot-sample-jetty + spring-boot-sample-profile + spring-boot-sample-simple + spring-boot-sample-tomcat + spring-boot-sample-traditional + spring-boot-sample-web-ui + spring-boot-sample-xml ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-batch/pom.xml b/spring-boot-samples/spring-boot-sample-batch/pom.xml similarity index 74% rename from spring-zero-samples/spring-zero-sample-batch/pom.xml rename to spring-boot-samples/spring-boot-sample-batch/pom.xml index ea3d914db8e..efd77ddcb49 100644 --- a/spring-zero-samples/spring-zero-sample-batch/pom.xml +++ b/spring-boot-samples/spring-boot-sample-batch/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-batch + spring-boot-sample-batch jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-starter-batch + spring-boot-up-batch ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java b/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java rename to spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java index a6f9e1ca284..6fbd1e354cd 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java +++ b/spring-boot-samples/spring-boot-sample-batch/src/main/java/org/springframework/boot/sample/batch/SampleBatchApplication.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.zero.sample.batch; +package org.springframework.boot.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; @@ -27,7 +26,8 @@ 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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java b/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java similarity index 90% rename from spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java rename to spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java index acd66cdb0a8..55cba6ee4b7 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-batch/src/test/java/org/springframework/boot/sample/batch/SampleBatchApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.batch; +package org.springframework.boot.sample.batch; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -22,7 +22,8 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.sample.batch.SampleBatchApplication; +import org.springframework.boot.strap.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml similarity index 76% rename from spring-zero-samples/spring-zero-sample-data-jpa/pom.xml rename to spring-boot-samples/spring-boot-sample-data-jpa/pom.xml index 414bbb81560..1688717f22d 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml +++ b/spring-boot-samples/spring-boot-sample-data-jpa/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-data-jpa + spring-boot-sample-data-jpa jar ${basedir}/../.. @@ -15,12 +15,12 @@ ${project.groupId} - spring-starter-data-jpa + spring-boot-up-data-jpa ${project.version} ${project.groupId} - spring-starter-web + spring-boot-up-web ${project.version} @@ -33,7 +33,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin true diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java similarity index 84% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java index fc6ab264431..1b34ffc6b46 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa; +package org.springframework.boot.sample.data.jpa; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/City.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/City.java index e06bdd18aca..ecec6f829bf 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.sample.data.jpa.domain; import java.io.Serializable; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Hotel.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Hotel.java index 60fc40cff1c..7e37908133b 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Hotel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.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/zero/sample/data/jpa/domain/HotelSummary.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/HotelSummary.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/HotelSummary.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/HotelSummary.java index 03be7fd9f7e..b16182dea7f 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/HotelSummary.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/HotelSummary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.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/zero/sample/data/jpa/domain/Rating.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Rating.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Rating.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Rating.java index db46dff8580..aca7b05de34 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Rating.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Rating.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.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/zero/sample/data/jpa/domain/RatingCount.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/RatingCount.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/RatingCount.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/RatingCount.java index 5b0c928a091..f8476fb08f7 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/RatingCount.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/RatingCount.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.sample.data.jpa.domain; import java.io.Serializable; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Review.java similarity index 98% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Review.java index afcb0544314..20ccd2f171f 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/Review.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.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/zero/sample/data/jpa/domain/ReviewDetails.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/ReviewDetails.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/ReviewDetails.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/ReviewDetails.java index f51eb18660c..caec1b46818 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/ReviewDetails.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/ReviewDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.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/zero/sample/data/jpa/domain/TripType.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/TripType.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/TripType.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/TripType.java index 5a7729f204f..9404ad8effd 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/TripType.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/TripType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain; +package org.springframework.boot.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/zero/sample/data/jpa/domain/repository/CityRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/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/zero/sample/data/jpa/domain/repository/CityRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/CityRepository.java index 59adf3e3f9f..24468039f15 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/CityRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/CityRepository.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain.repository; +package org.springframework.boot.sample.data.jpa.domain.repository; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/domain/repository/HotelRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/HotelRepository.java similarity index 81% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/HotelRepository.java index dd55b2c1632..988105f33de 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/HotelRepository.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain.repository; +package org.springframework.boot.sample.data.jpa.domain.repository; +import org.springframework.boot.sample.data.jpa.domain.City; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/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/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/HotelSummaryRepository.java index 01ccb52ac92..01c1a0c170d 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/HotelSummaryRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain.repository; +package org.springframework.boot.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.boot.sample.data.jpa.domain.City; +import org.springframework.boot.sample.data.jpa.domain.Hotel; +import org.springframework.boot.sample.data.jpa.domain.HotelSummary; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/domain/repository/ReviewRepository.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/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/zero/sample/data/jpa/domain/repository/ReviewRepository.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/ReviewRepository.java index 1d9ed4ae422..508b7fb6ac0 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/ReviewRepository.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/domain/repository/ReviewRepository.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.domain.repository; +package org.springframework.boot.sample.data.jpa.domain.repository; +import org.springframework.boot.sample.data.jpa.domain.Hotel; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/service/CitySearchCriteria.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CitySearchCriteria.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CitySearchCriteria.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CitySearchCriteria.java index aa959542bbc..9966704574e 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CitySearchCriteria.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CitySearchCriteria.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.service; +package org.springframework.boot.sample.data.jpa.service; import java.io.Serializable; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityService.java similarity index 83% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityService.java index 8ab550bba93..1ad412218ba 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/CityService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.service; +package org.springframework.boot.sample.data.jpa.service; +import org.springframework.boot.sample.data.jpa.domain.City; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/service/HotelService.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelService.java similarity index 76% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/HotelService.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelService.java index a3c70a5789f..abd11c6afdf 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/HotelService.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/HotelService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.service; +package org.springframework.boot.sample.data.jpa.service; +import org.springframework.boot.sample.data.jpa.domain.City; +import org.springframework.boot.sample.data.jpa.domain.Hotel; +import org.springframework.boot.sample.data.jpa.domain.Review; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/service/ReviewsSummary.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewsSummary.java similarity index 85% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/ReviewsSummary.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewsSummary.java index acd8df2ec5b..dc56bfa58d6 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/ReviewsSummary.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/ReviewsSummary.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.service; +package org.springframework.boot.sample.data.jpa.service; -import org.springframework.zero.sample.data.jpa.domain.Rating; +import org.springframework.boot.sample.data.jpa.domain.Rating; public interface ReviewsSummary { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/impl/CityServiceImpl.java similarity index 85% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/impl/CityServiceImpl.java index 70280837f42..add3b2afbb3 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/impl/CityServiceImpl.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.service.impl; +package org.springframework.boot.sample.data.jpa.service.impl; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sample.data.jpa.domain.City; +import org.springframework.boot.sample.data.jpa.domain.HotelSummary; +import org.springframework.boot.sample.data.jpa.domain.repository.CityRepository; +import org.springframework.boot.sample.data.jpa.domain.repository.HotelSummaryRepository; +import org.springframework.boot.sample.data.jpa.service.CitySearchCriteria; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/service/impl/HotelServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/impl/HotelServiceImpl.java similarity index 81% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/HotelServiceImpl.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/impl/HotelServiceImpl.java index f24c6fc7a11..d7a73c2370a 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/HotelServiceImpl.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/service/impl/HotelServiceImpl.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.service.impl; +package org.springframework.boot.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.boot.sample.data.jpa.domain.City; +import org.springframework.boot.sample.data.jpa.domain.Hotel; +import org.springframework.boot.sample.data.jpa.domain.Rating; +import org.springframework.boot.sample.data.jpa.domain.RatingCount; +import org.springframework.boot.sample.data.jpa.domain.Review; +import org.springframework.boot.sample.data.jpa.domain.ReviewDetails; +import org.springframework.boot.sample.data.jpa.domain.repository.HotelRepository; +import org.springframework.boot.sample.data.jpa.domain.repository.HotelSummaryRepository; +import org.springframework.boot.sample.data.jpa.domain.repository.ReviewRepository; +import org.springframework.boot.sample.data.jpa.service.HotelService; +import org.springframework.boot.sample.data.jpa.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/zero/sample/data/jpa/web/SampleController.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/web/SampleController.java similarity index 90% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/web/SampleController.java index 9de90d5f69f..1b6fc6ad393 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/org/springframework/boot/sample/data/jpa/web/SampleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa.web; +package org.springframework.boot.sample.data.jpa.web; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sample.data.jpa.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/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/application.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/application.properties diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/import.sql b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/import.sql similarity index 100% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/import.sql rename to spring-boot-samples/spring-boot-sample-data-jpa/src/main/resources/import.sql diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java rename to spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java index eaac3109e81..e2c0c1cc3ae 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/org/springframework/boot/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.data.jpa; +package org.springframework.boot.sample.data.jpa; import java.io.IOException; import java.util.concurrent.Callable; @@ -25,7 +25,8 @@ 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.boot.sample.data.jpa.SampleDataJpaApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-integration/pom.xml b/spring-boot-samples/spring-boot-sample-integration/pom.xml similarity index 68% rename from spring-zero-samples/spring-zero-sample-integration/pom.xml rename to spring-boot-samples/spring-boot-sample-integration/pom.xml index 525a69d34f5..10c31d6f624 100644 --- a/spring-zero-samples/spring-zero-sample-integration/pom.xml +++ b/spring-boot-samples/spring-boot-sample-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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-integration + spring-boot-sample-integration jar ${basedir}/../.. - org.springframework.zero - spring-starter-integration + org.springframework.boot + spring-boot-up-integration ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java index 299edfa399a..a9584eeeba0 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.integration; +package org.springframework.boot.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/zero/sample/integration/SampleEndpoint.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleEndpoint.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java index 0e80ddbb951..14217e01165 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleEndpoint.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.integration; +package org.springframework.boot.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/zero/sample/integration/SampleIntegrationApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java similarity index 81% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java index 7d26d2e54d9..0e8345b4a8a 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/SampleIntegrationApplication.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.sample.integration; +package org.springframework.boot.sample.integration; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java similarity index 87% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java index 8c9792e1cba..b1c1d66b1f2 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/main/java/org/springframework/boot/sample/integration/ServiceProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.zero.sample.integration; +package org.springframework.boot.sample.integration; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) public class ServiceProperties { diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-integration/src/main/resources/application.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-integration/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-integration/src/main/resources/application.properties diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/resources/integration-context.xml b/spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml similarity index 100% rename from spring-zero-samples/spring-zero-sample-integration/src/main/resources/integration-context.xml rename to spring-boot-samples/spring-boot-sample-integration/src/main/resources/integration-context.xml diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/resources/logback.xml b/spring-boot-samples/spring-boot-sample-integration/src/main/resources/logback.xml similarity index 100% rename from spring-zero-samples/spring-zero-sample-integration/src/main/resources/logback.xml rename to spring-boot-samples/spring-boot-sample-integration/src/main/resources/logback.xml diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java similarity index 91% rename from spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java rename to spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java index 02e50a5befd..7cda1e4a327 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.integration.consumer; +package org.springframework.boot.sample.integration.consumer; import java.util.concurrent.Callable; import java.util.concurrent.Executors; @@ -24,14 +24,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.boot.sample.integration.SampleIntegrationApplication; +import org.springframework.boot.sample.integration.producer.ProducerApplication; +import org.springframework.boot.strap.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.sample.integration.SampleIntegrationApplication; -import org.springframework.zero.sample.integration.producer.ProducerApplication; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java similarity index 88% rename from spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java rename to spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java index 915b13bfb07..e48a773da3a 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java +++ b/spring-boot-samples/spring-boot-sample-integration/src/test/java/org/springframework/boot/sample/integration/producer/ProducerApplication.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.sample.integration.producer; +package org.springframework.boot.sample.integration.producer; import java.io.File; import java.io.FileOutputStream; -import org.springframework.bootstrap.CommandLineRunner; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.strap.CommandLineRunner; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.Configuration; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-jetty/pom.xml b/spring-boot-samples/spring-boot-sample-jetty/pom.xml similarity index 76% rename from spring-zero-samples/spring-zero-sample-jetty/pom.xml rename to spring-boot-samples/spring-boot-sample-jetty/pom.xml index 9a430bd7f5c..20aa4439007 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/pom.xml +++ b/spring-boot-samples/spring-boot-sample-jetty/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-jetty + spring-boot-sample-jetty jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} @@ -24,7 +24,7 @@ ${project.groupId} - spring-starter-jetty + spring-boot-up-jetty ${project.version} @@ -32,7 +32,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java similarity index 85% rename from spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java rename to spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java index b0a3dabde98..a513d4ce073 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/SampleJettyApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.sample.jetty; +package org.springframework.boot.sample.jetty; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java index 573514f811c..1ace3897811 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.jetty.service; +package org.springframework.boot.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/zero/sample/jetty/web/SampleController.java b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java similarity index 90% rename from spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java index 8e1a2171e29..aac4c49e17e 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/java/org/springframework/boot/sample/jetty/web/SampleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.sample.jetty.web; +package org.springframework.boot.sample.jetty.web; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.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/zero/sample/jetty/SampleJettyApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java rename to spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java index 0fde9232e10..a41b8f4777e 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/org/springframework/boot/sample/jetty/SampleJettyApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.jetty; +package org.springframework.boot.sample.jetty; import java.io.IOException; import java.util.concurrent.Callable; @@ -25,7 +25,8 @@ 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.boot.sample.jetty.SampleJettyApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml b/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml similarity index 79% rename from spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml rename to spring-boot-samples/spring-boot-sample-ops-ui/pom.xml index d4715292f2f..c07ca1dc824 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-actuator-ui + spring-boot-sample-ops-ui jar ${basedir}/../.. @@ -15,12 +15,12 @@ ${project.groupId} - spring-starter-actuator + spring-boot-up-ops ${project.version} ${project.groupId} - spring-starter-web + spring-boot-up-web ${project.version} @@ -40,7 +40,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java similarity index 86% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java rename to spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java index 6bbf74c6b5a..758796c95cd 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator.ui; +package org.springframework.boot.sample.ops.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.ops.properties.SecurityProperties; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.stereotype.Controller; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/static/css/bootstrap.min.css b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/static/css/bootstrap.min.css similarity index 100% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/static/css/bootstrap.min.css rename to spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/static/css/bootstrap.min.css diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/error.html b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/error.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/error.html rename to spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/error.html diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/home.html b/spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/home.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/home.html rename to spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/home.html diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java similarity index 95% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java rename to spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java index f99624eb673..9376840ac2e 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator.ui; +package org.springframework.boot.sample.ops.ui; import java.io.IOException; import java.util.Map; @@ -27,7 +27,8 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.sample.ops.ui.SampleActuatorUiApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java similarity index 95% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java index 5f83df24879..87725b1ae8f 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator.ui; +package org.springframework.boot.sample.ops.ui; import java.io.IOException; import java.util.Arrays; @@ -27,7 +27,8 @@ 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.boot.sample.ops.ui.SampleActuatorUiApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/spring-zero-samples/spring-zero-sample-actuator/pom.xml b/spring-boot-samples/spring-boot-sample-ops/pom.xml similarity index 89% rename from spring-zero-samples/spring-zero-sample-actuator/pom.xml rename to spring-boot-samples/spring-boot-sample-ops/pom.xml index 5b7c8193444..d456212f3be 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/pom.xml +++ b/spring-boot-samples/spring-boot-sample-ops/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-actuator + spring-boot-sample-ops jar ${basedir}/../.. @@ -15,12 +15,12 @@ ${project.groupId} - spring-starter-actuator + spring-boot-up-ops ${project.version} - org.springframework.zero - spring-starter-logging + org.springframework.boot + spring-boot-up-logging @@ -49,7 +49,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java index 0c914ab20db..342c02a8850 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; 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/zero/sample/actuator/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java similarity index 79% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java rename to spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java index 19584b207c3..a38febbb137 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleController.java b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleController.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleController.java rename to spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleController.java index 86ce0481c88..4c5f9950e25 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.util.Collections; import java.util.Map; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java similarity index 87% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java index 0c2ed16d200..d0f6198467d 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; -import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-ops/src/main/resources/application.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-ops/src/main/resources/application.properties diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml b/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml similarity index 87% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml rename to spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml index 8232e3a3cbd..705052307d1 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml +++ b/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java similarity index 95% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java index 0b0df3421e1..9f0be2accc8 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.ArrayList; @@ -27,7 +27,8 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java index cedcef257a3..96ae8f18b99 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.ArrayList; @@ -29,7 +29,8 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java index 9965eb5f105..b6bfc010c00 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.Map; @@ -26,7 +26,8 @@ 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.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java index 8bf53c6d2b1..882ea74f2e7 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.ArrayList; @@ -28,7 +28,8 @@ 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.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java similarity index 97% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java index b055a7e3c84..fde0bfd06ce 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.ArrayList; @@ -28,7 +28,8 @@ 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.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java index d16e6b92500..f98e409a67e 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.ArrayList; @@ -28,7 +28,8 @@ 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.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java index 46eff5ffa61..9bdd547038d 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.actuator; +package org.springframework.boot.sample.ops; import java.io.IOException; import java.util.Map; @@ -26,7 +26,8 @@ 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.boot.sample.ops.SampleActuatorApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-boot-samples/spring-boot-sample-ops/start.groovy b/spring-boot-samples/spring-boot-sample-ops/start.groovy new file mode 100644 index 00000000000..9310af15acc --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-ops/start.groovy @@ -0,0 +1,5 @@ +@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT") +@Grab("org.springframework.boot:spring-boot-up-web:0.5.0.BUILD-SNAPSHOT") +@ComponentScan("org.springframework.boot.sample.service") +class Start { +} diff --git a/spring-zero-samples/spring-zero-sample-profile/pom.xml b/spring-boot-samples/spring-boot-sample-profile/pom.xml similarity index 77% rename from spring-zero-samples/spring-zero-sample-profile/pom.xml rename to spring-boot-samples/spring-boot-sample-profile/pom.xml index 09affe2b727..450d611fb6a 100644 --- a/spring-zero-samples/spring-zero-sample-profile/pom.xml +++ b/spring-boot-samples/spring-boot-sample-profile/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-profile + spring-boot-sample-profile jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} @@ -28,7 +28,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java similarity index 83% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java index 3fd108e4482..3b2815a4541 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/SampleProfileApplication.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.sample.profile; +package org.springframework.boot.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.sample.profile.service.MessageService; +import org.springframework.boot.strap.CommandLineRunner; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.sample.profile.service.MessageService; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/GoodbyeWorldService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/GoodbyeWorldService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java index 6d7be8d3107..24153b71eea 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/GoodbyeWorldService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/GoodbyeWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.profile.service; +package org.springframework.boot.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/zero/sample/profile/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java index dd388f535f7..ff0d62330cd 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.profile.service; +package org.springframework.boot.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/zero/sample/profile/service/MessageService.java b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/MessageService.java rename to spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java index f3758cb1802..5c53c583296 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/MessageService.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/java/org/springframework/boot/sample/profile/service/MessageService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.profile.service; +package org.springframework.boot.sample.profile.service; /** * @author Dave Syer diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml similarity index 100% rename from spring-zero-samples/spring-zero-sample-profile/src/main/resources/application.yml rename to spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml diff --git a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java b/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java similarity index 95% rename from spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java rename to spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java index 03eb7460582..d5f9e37d48b 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-profile/src/test/java/org/springframework/boot/sample/profile/SampleProfileApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.profile; +package org.springframework.boot.sample.profile; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -24,6 +24,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.boot.sample.profile.SampleProfileApplication; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-xml/pom.xml b/spring-boot-samples/spring-boot-sample-simple/pom.xml similarity index 74% rename from spring-zero-samples/spring-zero-sample-xml/pom.xml rename to spring-boot-samples/spring-boot-sample-simple/pom.xml index b5c6bc691cd..d988dd00732 100644 --- a/spring-zero-samples/spring-zero-sample-xml/pom.xml +++ b/spring-boot-samples/spring-boot-sample-simple/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-xml + spring-boot-sample-simple jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java similarity index 83% rename from spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java rename to spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java index f9f60dea65a..c203e33fc27 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/SampleSimpleApplication.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.sample.simple; +package org.springframework.boot.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.boot.config.EnableAutoConfiguration; +import org.springframework.boot.sample.simple.service.HelloWorldService; +import org.springframework.boot.strap.CommandLineRunner; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.sample.simple.service.HelloWorldService; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java index 33c9f4e0430..0afcb31268e 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/main/java/org/springframework/boot/sample/simple/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.tomcat.service; +package org.springframework.boot.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/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-simple/src/main/resources/application.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-simple/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-simple/src/main/resources/application.properties diff --git a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java b/spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java rename to spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java index f9459132b80..a1f1f6addb6 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/test/java/org/springframework/boot/sample/simple/SampleSimpleApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.simple; +package org.springframework.boot.sample.simple; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -22,6 +22,7 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.sample.simple.SampleSimpleApplication; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/pom.xml b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml similarity index 76% rename from spring-zero-samples/spring-zero-sample-tomcat/pom.xml rename to spring-boot-samples/spring-boot-sample-tomcat/pom.xml index 61d8227e1b0..8ae6fca8913 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/pom.xml +++ b/spring-boot-samples/spring-boot-sample-tomcat/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-tomcat + spring-boot-sample-tomcat jar ${basedir}/../.. @@ -15,12 +15,12 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} ${project.groupId} - spring-starter-tomcat + spring-boot-up-tomcat ${project.version} @@ -32,7 +32,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java similarity index 84% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java index e66d71400ef..9cb2168d696 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/SampleTomcatApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.sample.tomcat; +package org.springframework.boot.sample.tomcat; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java index 60266ba21da..ca7c1e7fa72 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.simple.service; +package org.springframework.boot.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/zero/sample/tomcat/web/SampleController.java b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java similarity index 90% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/web/SampleController.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java index 7a74c8443a8..99bdc021f14 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/web/SampleController.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/main/java/org/springframework/boot/sample/tomcat/web/SampleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.sample.tomcat.web; +package org.springframework.boot.sample.tomcat.web; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.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/main/resources/public/test.css b/spring-boot-samples/spring-boot-sample-tomcat/src/main/resources/public/test.css similarity index 100% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/resources/public/test.css rename to spring-boot-samples/spring-boot-sample-tomcat/src/main/resources/public/test.css diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java similarity index 85% rename from spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index 75b940f53ac..6a98a2311f2 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.tomcat; +package org.springframework.boot.sample.tomcat; import java.io.IOException; import java.util.concurrent.Callable; @@ -25,10 +25,13 @@ 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.boot.config.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.config.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.boot.config.web.WebMvcAutoConfiguration; +import org.springframework.boot.sample.tomcat.SampleTomcatApplication; +import org.springframework.boot.sample.tomcat.service.HelloWorldService; +import org.springframework.boot.sample.tomcat.web.SampleController; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -38,8 +41,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.sample.tomcat.service.HelloWorldService; -import org.springframework.zero.sample.tomcat.web.SampleController; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java rename to spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java index 3f318fe78ec..f4802b65bfa 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/org/springframework/boot/sample/tomcat/SampleTomcatApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.tomcat; +package org.springframework.boot.sample.tomcat; import java.io.IOException; import java.util.concurrent.Callable; @@ -25,7 +25,8 @@ 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.boot.sample.tomcat.SampleTomcatApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-traditional/.gitignore b/spring-boot-samples/spring-boot-sample-traditional/.gitignore similarity index 100% rename from spring-zero-samples/spring-zero-sample-traditional/.gitignore rename to spring-boot-samples/spring-boot-sample-traditional/.gitignore diff --git a/spring-zero-samples/spring-zero-sample-traditional/pom.xml b/spring-boot-samples/spring-boot-sample-traditional/pom.xml similarity index 79% rename from spring-zero-samples/spring-zero-sample-traditional/pom.xml rename to spring-boot-samples/spring-boot-sample-traditional/pom.xml index 1f49d3d74a6..7a2f197818e 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/pom.xml +++ b/spring-boot-samples/spring-boot-sample-traditional/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.springframework.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-traditional + spring-boot-sample-traditional war ${basedir}/../.. @@ -16,7 +16,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} @@ -26,7 +26,7 @@ ${project.groupId} - spring-starter-tomcat + spring-boot-up-tomcat ${project.version} @@ -39,7 +39,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java similarity index 84% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java rename to spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java index 80f18d28580..eb7b28f9922 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/SampleTraditionalApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.sample.traditional; +package org.springframework.boot.sample.traditional; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/config/WebConfig.java b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java similarity index 97% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/config/WebConfig.java rename to spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java index b3a36006789..d169b9b45e2 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/config/WebConfig.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/main/java/org/springframework/boot/sample/traditional/config/WebConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.traditional.config; +package org.springframework.boot.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/main/resources/log4j.properties b/spring-boot-samples/spring-boot-sample-traditional/src/main/resources/log4j.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/resources/log4j.properties rename to spring-boot-samples/spring-boot-sample-traditional/src/main/resources/log4j.properties diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp similarity index 100% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp rename to spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/web.xml b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/web.xml rename to spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/WEB-INF/web.xml diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/index.html b/spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/index.html rename to spring-boot-samples/spring-boot-sample-traditional/src/main/webapp/index.html diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java rename to spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java index 165ce412f17..da5dd297451 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/org/springframework/boot/sample/traditional/SampleTraditionalApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.traditional; +package org.springframework.boot.sample.traditional; import java.io.IOException; import java.util.concurrent.Callable; @@ -25,7 +25,8 @@ 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.boot.sample.traditional.SampleTraditionalApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/test/resources/log4j.properties b/spring-boot-samples/spring-boot-sample-traditional/src/test/resources/log4j.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-traditional/src/test/resources/log4j.properties rename to spring-boot-samples/spring-boot-sample-traditional/src/test/resources/log4j.properties diff --git a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml similarity index 72% rename from spring-zero-samples/spring-zero-sample-web-ui/pom.xml rename to spring-boot-samples/spring-boot-sample-web-ui/pom.xml index fe64c8eba5b..8d00afaa843 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-web-ui/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-web-ui + spring-boot-sample-web-ui jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-starter-web + spring-boot-up-web ${project.version} @@ -26,16 +26,16 @@ nz.net.ultraq.thymeleaf thymeleaf-layout-dialect - + + org.hibernate + hibernate-validator + ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/InMemoryMessageRespository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/InMemoryMessageRespository.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java index 9a82f027cc5..c73aaf42853 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/InMemoryMessageRespository.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/InMemoryMessageRespository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.web.ui; +package org.springframework.boot.sample.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/zero/sample/web/ui/Message.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/Message.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java index c013381b5ef..aab8cd49204 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/Message.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/Message.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.zero.sample.web.ui; +package org.springframework.boot.sample.ui; import java.util.Calendar; diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/MessageRepository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/MessageRepository.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java index 057149a859f..6e687569ce7 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/MessageRepository.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/MessageRepository.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.zero.sample.web.ui; +package org.springframework.boot.sample.ui; /** * @author Rob Winch diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java index 987d109cd55..25160ed266c 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/SampleWebUiApplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.sample.web.ui; +package org.springframework.boot.sample.ui; -import org.springframework.autoconfigure.EnableAutoConfiguration; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.config.EnableAutoConfiguration; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/mvc/MessageController.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/mvc/MessageController.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java index c9203d23736..4831020739e 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/mvc/MessageController.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/org/springframework/boot/sample/ui/mvc/MessageController.java @@ -11,11 +11,13 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.zero.sample.web.ui.mvc; +package org.springframework.boot.sample.ui.mvc; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.sample.ui.Message; +import org.springframework.boot.sample.ui.MessageRepository; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; @@ -24,8 +26,6 @@ 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/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/application.properties similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/application.properties diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/favicon.ico b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/favicon.ico similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/favicon.ico rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/favicon.ico diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/logback.xml b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/logback.xml similarity index 87% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/logback.xml rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/logback.xml index 8232e3a3cbd..705052307d1 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/logback.xml +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - + diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/static/css/bootstrap.min.css b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/css/bootstrap.min.css similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/static/css/bootstrap.min.css rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/css/bootstrap.min.css diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery-1.7.2.js diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/static/js/jquery.validate.js b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery.validate.js similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/static/js/jquery.validate.js rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/static/js/jquery.validate.js diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/layout.html rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/layout.html diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/form.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/form.html rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/form.html diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/list.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/list.html rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/list.html diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/view.html b/spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html similarity index 100% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/view.html rename to spring-boot-samples/spring-boot-sample-web-ui/src/main/resources/templates/messages/view.html diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java rename to spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java index dd7d39e5975..79a3442b3af 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/org/springframework/boot/sample/ui/SampleWebUiApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.zero.sample.web.ui; +package org.springframework.boot.sample.ui; import java.io.IOException; import java.net.URI; @@ -10,7 +10,8 @@ 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.boot.sample.ui.SampleWebUiApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/spring-zero-samples/spring-zero-sample-simple/pom.xml b/spring-boot-samples/spring-boot-sample-xml/pom.xml similarity index 74% rename from spring-zero-samples/spring-zero-sample-simple/pom.xml rename to spring-boot-samples/spring-boot-sample-xml/pom.xml index 212aef4c9ab..d66652fa6bd 100644 --- a/spring-zero-samples/spring-zero-sample-simple/pom.xml +++ b/spring-boot-samples/spring-boot-sample-xml/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero-samples + org.springframework.boot + spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-zero-sample-simple + spring-boot-sample-xml jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-package-maven-plugin + spring-boot-maven-plugin diff --git a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java similarity index 79% rename from spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java rename to spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java index d503e9ad644..928bdf4e489 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/SampleSpringXmlApplication.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.sample.xml; +package org.springframework.boot.sample.xml; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.CommandLineRunner; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.zero.sample.xml.service.HelloWorldService; +import org.springframework.boot.sample.xml.service.HelloWorldService; +import org.springframework.boot.strap.CommandLineRunner; +import org.springframework.boot.strap.SpringApplication; public class SampleSpringXmlApplication implements CommandLineRunner { @@ -32,7 +32,7 @@ public class SampleSpringXmlApplication 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-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java index 96bae7d73fe..fca916031b7 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/main/java/org/springframework/boot/sample/xml/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.xml.service; +package org.springframework.boot.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-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml similarity index 82% rename from spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml rename to spring-boot-samples/spring-boot-sample-xml/src/main/resources/META-INF/application-context.xml index 369e0795244..8b3ebbe4df9 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml +++ b/spring-boot-samples/spring-boot-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/zero/sample/xml/SampleSpringXmlApplicationTests.java b/spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java rename to spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java index 1e5f33ce998..afeadfdf06c 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-xml/src/test/java/org/springframework/boot/sample/xml/SampleSpringXmlApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sample.xml; +package org.springframework.boot.sample.xml; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -22,6 +22,7 @@ import java.io.PrintStream; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.boot.sample.xml.SampleSpringXmlApplication; import static org.junit.Assert.assertTrue; diff --git a/spring-bootstrap/README.md b/spring-boot-strap/README.md similarity index 89% rename from spring-bootstrap/README.md rename to spring-boot-strap/README.md index 8f4fcfab874..c59b907fa3b 100644 --- a/spring-bootstrap/README.md +++ b/spring-boot-strap/README.md @@ -1,7 +1,7 @@ -# Spring Bootstrap +# Spring Boot.Strap -Spring Bootstrap provides features for the other parts of Spring -Zero. It is relatively unopinionated and therefore usable as a +Spring Boot.Strap provides features for the other parts of Spring +Boot. It is relatively unopinionated and therefore usable as a standalone library for anyone whose tastes diverge from ours. |Feature |Implementation |Notes | @@ -13,7 +13,7 @@ standalone library for anyone whose tastes diverge from ours. 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 Zero Actuator, go to the [Feature Guide](docs/Features.md). +of Spring Boot.Strap, go to the [Feature Guide](docs/Features.md). # Getting Started @@ -42,20 +42,20 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies: com.mycompany.Application - org.springframework.zero + org.springframework.boot spring-starter-parent {{project.version}} - org.springframework.zero + org.springframework.boot spring-starter - org.springframework.zero + org.springframework.boot spring-package-maven-plugin @@ -64,7 +64,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 one dependency adds Spring Zero auto +those dependencies. The one dependency adds Spring Boot.Config auto configuration and the Tomcat container to your application. If you prefer Jetty you can just add the embedded Jetty jars to your classpath instead of Tomcat. @@ -75,7 +75,7 @@ Now write a simple main class ``` package com.mycompany; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.boot.strap.SpringApplication; import org.springframework.context.annotation.Configuration; @Configuration diff --git a/spring-bootstrap/docs/Features.md b/spring-boot-strap/docs/Features.md similarity index 100% rename from spring-bootstrap/docs/Features.md rename to spring-boot-strap/docs/Features.md diff --git a/spring-bootstrap/pom.xml b/spring-boot-strap/pom.xml similarity index 96% rename from spring-bootstrap/pom.xml rename to spring-boot-strap/pom.xml index c4fe90d551e..6425e861dfe 100644 --- a/spring-bootstrap/pom.xml +++ b/spring-boot-strap/pom.xml @@ -3,11 +3,11 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-bootstrap + spring-boot-strap jar ${basedir}/.. diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/Banner.java similarity index 83% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/Banner.java index eea8b02ffd5..9b069ca189c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/Banner.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.io.PrintStream; -import org.springframework.bootstrap.ansi.AnsiOutput; +import org.springframework.boot.strap.ansi.AnsiOutput; + +import static org.springframework.boot.strap.ansi.AnsiElement.DEFAULT; +import static org.springframework.boot.strap.ansi.AnsiElement.FAINT; +import static org.springframework.boot.strap.ansi.AnsiElement.GREEN; -import static org.springframework.bootstrap.ansi.AnsiElement.DEFAULT; -import static org.springframework.bootstrap.ansi.AnsiElement.FAINT; -import static org.springframework.bootstrap.ansi.AnsiElement.GREEN; /** * Writes the 'Spring' banner. diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java index 16f4a9529f5..7e2ec67f934 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/BeanDefinitionLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.util.HashSet; import java.util.Set; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/CommandLineRunner.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/CommandLineRunner.java index 0911a009914..37a4eed269a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/CommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java index 565cab2774e..bf1a69fbc7e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/ExitCodeGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; /** * Interface used to generate an 'exit code' from a running command line diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplication.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplication.java index dcff5399302..5a76976cb27 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.util.ArrayList; import java.util.Arrays; @@ -128,7 +128,7 @@ public class SpringApplication { + "annotation.AnnotationConfigApplicationContext"; public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework." - + "bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext"; + + "boot.strap.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/bootstrap/SpringApplicationInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplicationInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java index 6c54b8b3d15..9051066ddbb 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplicationInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/SpringApplicationInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.Environment; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/StartupInfoLogger.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/StartupInfoLogger.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java index 3a8f8bf7793..18ed13712fb 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/StartupInfoLogger.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/StartupInfoLogger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.io.File; import java.net.InetAddress; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ansi/AnsiElement.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/ansi/AnsiElement.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java index 80f8dfbf4dc..cad0a9935d8 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ansi/AnsiElement.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiElement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.ansi; +package org.springframework.boot.strap.ansi; /** * An ANSI encodable element. diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ansi/AnsiOutput.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/ansi/AnsiOutput.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java index b0bfde49618..4163e6ae60c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ansi/AnsiOutput.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/ansi/AnsiOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.ansi; +package org.springframework.boot.strap.ansi; import org.springframework.util.Assert; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java index 6e368106424..00273a02a61 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/CustomPropertyConstructor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.beans.IntrospectionException; import java.util.HashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java index e6cadd2f977..6ee8c3d508f 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/InetAddressEditor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.beans.PropertyEditor; import java.beans.PropertyEditorSupport; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java index 57ef3ec5eed..f96f5d71a31 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.util.Locale; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java index f5e2e347e24..93a875f2ba2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValues.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.util.Collection; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java index bd3d4fdd06c..228ab18bab9 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/RelaxedDataBinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.net.InetAddress; import java.util.ArrayList; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java index 8a356e82dc5..4ece6650ca2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/bind/YamlConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.nio.charset.Charset; import java.util.Collections; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/ArrayDocumentMatcher.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java similarity index 89% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/ArrayDocumentMatcher.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java index 93477f97bbf..da84c733950 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/ArrayDocumentMatcher.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/ArrayDocumentMatcher.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.Properties; import java.util.Set; -import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher; +import org.springframework.boot.strap.config.YamlProcessor.MatchStatus; import org.springframework.util.StringUtils; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/DefaultProfileDocumentMatcher.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java similarity index 85% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/DefaultProfileDocumentMatcher.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java index d8dcadd7a56..f634b6dd1de 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/DefaultProfileDocumentMatcher.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/DefaultProfileDocumentMatcher.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.Properties; -import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher; +import org.springframework.boot.strap.config.YamlProcessor.MatchStatus; /** * A {@link DocumentMatcher} that matches the default profile implicitly but not diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java index 3239e346027..cbb368cda55 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JacksonJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParser.java index fe342652722..96ab14188a2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java index 8409bcc1a9a..2800ac8d192 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/JsonParserFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import org.springframework.util.ClassUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/PropertiesPropertySourceLoader.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/PropertiesPropertySourceLoader.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java index 3cc3de93a20..f3e9f272c4d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/PropertiesPropertySourceLoader.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertiesPropertySourceLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.io.IOException; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/PropertySourceLoader.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/PropertySourceLoader.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java index 54944b38b76..f50bc947641 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/PropertySourceLoader.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/PropertySourceLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import org.springframework.core.env.PropertySource; import org.springframework.core.io.Resource; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java index ab7c2a41029..c72dccda732 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SimpleJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SpringProfileDocumentMatcher.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java similarity index 90% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SpringProfileDocumentMatcher.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java index ac4f077aba7..afd3e0d1f65 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SpringProfileDocumentMatcher.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/SpringProfileDocumentMatcher.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Properties; -import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher; +import org.springframework.boot.strap.config.YamlProcessor.MatchStatus; import org.springframework.core.env.Environment; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java index 8c0463923e5..d2a8deabb8d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java index 0e9927d0e8d..b7380ba7ec4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlMapFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java index c3c672a97c4..6bf4c810d4e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.io.IOException; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java index 0a7934dd800..c719718512a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.Map; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertySourceLoader.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertySourceLoader.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java index 37274c2db5e..c50cbac5422 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertySourceLoader.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/config/YamlPropertySourceLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.io.IOException; import java.util.Arrays; @@ -22,8 +22,8 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher; +import org.springframework.boot.strap.config.YamlProcessor.MatchStatus; import org.springframework.core.env.PropertySource; import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java index afa4cb97e69..8b8a9f7dc0e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/AbstractOnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java index 7ab5c397187..0d898f165b5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionLogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.apache.commons.logging.Log; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java index 869ca873dca..dea22e35edf 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java index 6721801fbea..7b82b03505d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java index 2f38e4f29a0..d8976a17418 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java index 8f1c8193087..6bb909269cc 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java index 5e0bfa45efe..26f93f88d5a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnMissingClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java index f98289d9fd5..f96df763384 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnNotWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java index 4123513d08e..7632993ab61 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java index cbe6256ba8b..2327b8cf3fe 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/ConditionalOnWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java index 70f378c6174..932a96661f0 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.springframework.context.annotation.Condition; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java index 8b051929edf..15a5cb0e9d4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java index b21a3db2dd2..782e06b8273 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnExpressionCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java index e13ca077fb8..a5e715fc401 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java index a9d53bcdc01..21c49b9cfdd 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnMissingClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java index 1aa96c10341..d2bd2735884 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java index 60898e4635e..b350cb8e5a3 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnResourceCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java index 4aea37fbcaf..271851d1e66 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/OnWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/SearchStrategy.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/SearchStrategy.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java index 2e9aa284958..c530707ff5a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/SearchStrategy.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/condition/SearchStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; /** * Some named search strategies for beans in the bean factory hierarchy. diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java index a3768d58fe4..4131ce6b8fa 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.File; import java.io.IOException; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java index 3bf7739b1bd..7bcb7b405a1 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java index cb5ee7f5d6b..3685ac9beb6 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.File; import java.net.InetAddress; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java index 99a9af69c89..4d7978d4dbf 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; /** * Simple interface that represents a fully configured embedded servlet container (for diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java index 65d5d8ebd9b..d376affa9a1 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java index 04eed37f74a..ea8193d225d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java index 23bc99c8cba..07887e91ebb 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; /** * Exceptions thrown by an embedded servlet container. diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java similarity index 87% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java index fe76b9f0772..6b5d0aff081 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerFactory.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import org.apache.catalina.core.ApplicationContext; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.boot.strap.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/bootstrap/context/embedded/EmbeddedWebApplicationContext.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java index f77eeb84c53..380a592aee4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java index b2fce25bb25..a25684a9bc4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ErrorPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import org.springframework.http.HttpStatus; import org.springframework.util.ObjectUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java index 9cbca04c681..cc97d400256 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/MimeMappings.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/MimeMappings.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java index 78d8fb79963..7055f4c6290 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/MimeMappings.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/MimeMappings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.Collection; import java.util.Collections; @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.context.embedded.MimeMappings.Mapping; +import org.springframework.boot.strap.context.embedded.MimeMappings.Mapping; import org.springframework.util.Assert; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java index c3c732a8f4c..f52fd6cd7ad 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/RegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java index d771e042e31..2d49bf37de9 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java index 7f0a3cbf11a..ba990bcd429 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java index 9eaa7b726a2..cc751aeaac7 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/WebApplicationContextServletContextAwareProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java index bec96588509..9518f3fc952 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import org.springframework.beans.BeansException; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java similarity index 92% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java index fc6209bfdee..52bfec84aef 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.boot.strap.context.embedded.jetty; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 08496dc0152..1f3a10cefc6 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.boot.strap.context.embedded.jetty; import java.io.File; import java.net.InetSocketAddress; @@ -33,12 +33,12 @@ 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.MimeMappings; -import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.ErrorPage; +import org.springframework.boot.strap.context.embedded.MimeMappings; +import org.springframework.boot.strap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java index 2f5c1218e76..0a02afcd079 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/ServletContextInitializerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.boot.strap.context.embedded.jetty; import javax.servlet.ServletContext; @@ -23,7 +23,7 @@ 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.boot.strap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java similarity index 84% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java index 802345a1f90..ea857a7bfdc 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/jetty/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Tomcat {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Jetty {@link org.springframework.boot.strap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.boot.strap.context.embedded.jetty; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java similarity index 74% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/package-info.java index de3401d2277..ca8bef25174 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/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.boot.strap.context.embedded.EmbeddedServletContainerFactory + * @see org.springframework.boot.strap.context.embedded.EmbeddedWebApplicationContext */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java similarity index 87% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java index cdfb5a488fc..ea7256e9087 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/properties/ServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.properties; +package org.springframework.boot.strap.context.embedded.properties; import java.io.File; import java.net.InetAddress; @@ -23,12 +23,12 @@ 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.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; import org.springframework.util.StringUtils; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java similarity index 93% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java index 94452e4f9b8..ad9d7bd777c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.boot.strap.context.embedded.tomcat; import javax.servlet.ServletException; @@ -22,7 +22,7 @@ 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.boot.strap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java similarity index 92% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index 8c2bf56509b..09cbde43102 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.boot.strap.context.embedded.tomcat; import org.apache.catalina.LifecycleException; import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.Tomcat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 51bece8ef23..3a86f27068a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.boot.strap.context.embedded.tomcat; import java.io.File; import java.io.IOException; @@ -34,13 +34,13 @@ 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.MimeMappings; -import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.ErrorPage; +import org.springframework.boot.strap.context.embedded.MimeMappings; +import org.springframework.boot.strap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java index 494c32676f4..ecea4dab467 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.boot.strap.context.embedded.tomcat; /* * Copyright 2012-2013 the original author or authors. diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java similarity index 76% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java index 532ff9779f8..2942233d8cc 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/embedded/tomcat/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Jetty {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Tomcat {@link org.springframework.boot.strap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.boot.strap.context.embedded.tomcat; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java similarity index 93% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java index 13ce8898bf9..e08538ecbd9 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.util.ArrayList; import java.util.HashMap; @@ -23,13 +23,13 @@ import java.util.Map; import java.util.Set; import org.springframework.beans.PropertyValues; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.SpringApplicationInitializer; -import org.springframework.bootstrap.bind.PropertySourcesPropertyValues; -import org.springframework.bootstrap.bind.RelaxedDataBinder; -import org.springframework.bootstrap.config.PropertiesPropertySourceLoader; -import org.springframework.bootstrap.config.PropertySourceLoader; -import org.springframework.bootstrap.config.YamlPropertySourceLoader; +import org.springframework.boot.strap.SpringApplication; +import org.springframework.boot.strap.SpringApplicationInitializer; +import org.springframework.boot.strap.bind.PropertySourcesPropertyValues; +import org.springframework.boot.strap.bind.RelaxedDataBinder; +import org.springframework.boot.strap.config.PropertiesPropertySourceLoader; +import org.springframework.boot.strap.config.PropertySourceLoader; +import org.springframework.boot.strap.config.YamlPropertySourceLoader; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.EnvironmentAware; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java index c2c1f1b23a4..a00a7545209 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java index 8f765bb0c75..086257ab82e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java index 1d48a1d1b83..90960d01c5b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.lang.management.ManagementFactory; import java.util.HashMap; @@ -22,9 +22,9 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.SpringApplicationInitializer; -import org.springframework.bootstrap.logging.LoggingSystem; +import org.springframework.boot.strap.SpringApplication; +import org.springframework.boot.strap.SpringApplicationInitializer; +import org.springframework.boot.strap.logging.LoggingSystem; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java index b1470162913..491f4ef7392 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.util.Collection; import java.util.Collections; @@ -23,8 +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.boot.strap.config.JsonParser; +import org.springframework.boot.strap.config.JsonParserFactory; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java index bc145bf2bcc..9fce0f0df7e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java index fff1436532d..075f946ad04 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; @@ -26,10 +26,10 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; -import org.springframework.bootstrap.config.PropertiesPropertySourceLoader; -import org.springframework.bootstrap.config.PropertySourceLoader; -import org.springframework.bootstrap.config.YamlPropertySourceLoader; +import org.springframework.boot.strap.bind.PropertiesConfigurationFactory; +import org.springframework.boot.strap.config.PropertiesPropertySourceLoader; +import org.springframework.boot.strap.config.PropertySourceLoader; +import org.springframework.boot.strap.config.YamlPropertySourceLoader; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java index be4c5b8ee42..4ee8d962801 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesBindingPostProcessorRegistrar.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java index 2e6f9bdc007..23ffb0a7e33 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/ConfigurationPropertiesHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; /** * Properties holder registered by {@link EnableConfigurationPropertiesImportSelector} to diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java index 90880b6f55b..db7fe2bb131 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java index a8d3516236a..81d9a8b0007 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/AbstractLoggingSystem.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/AbstractLoggingSystem.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java index 4a9b5752f35..06d320bf26d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/AbstractLoggingSystem.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/AbstractLoggingSystem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.boot.strap.logging; import org.springframework.core.io.ClassPathResource; import org.springframework.util.ClassUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LoggingSystem.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LoggingSystem.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java index 08372782db6..6a94e9656d5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LoggingSystem.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/LoggingSystem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.boot.strap.logging; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/java/JavaLoggingSystem.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java similarity index 88% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/java/JavaLoggingSystem.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java index 14afa8e8fb6..49f3019cd2c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/java/JavaLoggingSystem.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/JavaLoggingSystem.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.java; +package org.springframework.boot.strap.logging.java; import java.util.logging.LogManager; import java.util.logging.Logger; -import org.springframework.bootstrap.logging.AbstractLoggingSystem; -import org.springframework.bootstrap.logging.LoggingSystem; +import org.springframework.boot.strap.logging.AbstractLoggingSystem; +import org.springframework.boot.strap.logging.LoggingSystem; import org.springframework.util.ResourceUtils; import org.springframework.util.SystemPropertyUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/java/SimpleFormatter.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/java/SimpleFormatter.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java index 9e1e17a3b25..6bb295f439b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/java/SimpleFormatter.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/java/SimpleFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.java; +package org.springframework.boot.strap.logging.java; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/log4j/Log4JLoggingSystem.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java similarity index 87% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/log4j/Log4JLoggingSystem.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java index 25ae2411786..50dc2d64114 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/log4j/Log4JLoggingSystem.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/log4j/Log4JLoggingSystem.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.log4j; +package org.springframework.boot.strap.logging.log4j; -import org.springframework.bootstrap.logging.AbstractLoggingSystem; -import org.springframework.bootstrap.logging.LoggingSystem; +import org.springframework.boot.strap.logging.AbstractLoggingSystem; +import org.springframework.boot.strap.logging.LoggingSystem; import org.springframework.util.Log4jConfigurer; /** diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/ColorConverter.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java similarity index 93% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/ColorConverter.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java index 69312c3287f..25e4622c294 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/ColorConverter.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/ColorConverter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.logback; +package org.springframework.boot.strap.logging.logback; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.springframework.bootstrap.ansi.AnsiElement; -import org.springframework.bootstrap.ansi.AnsiOutput; +import org.springframework.boot.strap.ansi.AnsiElement; +import org.springframework.boot.strap.ansi.AnsiOutput; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/LogbackLoggingSystem.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java similarity index 92% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/LogbackLoggingSystem.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java index 9c8eab0baa7..ce772ad7d0d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/LogbackLoggingSystem.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystem.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.logback; +package org.springframework.boot.strap.logging.logback; import java.net.URL; import org.slf4j.ILoggerFactory; import org.slf4j.bridge.SLF4JBridgeHandler; import org.slf4j.impl.StaticLoggerBinder; -import org.springframework.bootstrap.logging.AbstractLoggingSystem; -import org.springframework.bootstrap.logging.LoggingSystem; +import org.springframework.boot.strap.logging.AbstractLoggingSystem; +import org.springframework.boot.strap.logging.LoggingSystem; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.ResourceUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/WhitespaceThrowableProxyConverter.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/WhitespaceThrowableProxyConverter.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java index 946e4d6422e..1154efab2ba 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/logback/WhitespaceThrowableProxyConverter.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.logback; +package org.springframework.boot.strap.logging.logback; import ch.qos.logback.classic.pattern.ThrowableProxyConverter; import ch.qos.logback.classic.spi.IThrowableProxy; diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java b/spring-boot-strap/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java rename to spring-boot-strap/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java index ffbb17fb0bf..03304527bfa 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java +++ b/spring-boot-strap/src/main/java/org/springframework/boot/strap/web/SpringServletInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.web; +package org.springframework.boot.strap.web; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -22,8 +22,8 @@ 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.boot.strap.SpringApplication; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.ApplicationContext; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; diff --git a/spring-boot-strap/src/main/resources/META-INF/spring.factories b/spring-boot-strap/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000000..b8f71f6ae55 --- /dev/null +++ b/spring-boot-strap/src/main/resources/META-INF/spring.factories @@ -0,0 +1,7 @@ +# Application Context Initializers +org.springframework.context.ApplicationContextInitializer=\ +org.springframework.boot.strap.context.initializer.ConfigFileApplicationContextInitializer,\ +org.springframework.boot.strap.context.initializer.ContextIdApplicationContextInitializer,\ +org.springframework.boot.strap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ +org.springframework.boot.strap.context.initializer.LoggingApplicationContextInitializer,\ +org.springframework.boot.strap.context.initializer.VcapApplicationContextInitializer diff --git a/spring-bootstrap/src/main/resources/favicon.ico b/spring-boot-strap/src/main/resources/favicon.ico similarity index 100% rename from spring-bootstrap/src/main/resources/favicon.ico rename to spring-boot-strap/src/main/resources/favicon.ico diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/java/logging.properties b/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties similarity index 84% rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/java/logging.properties rename to spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties index 4ad37217b4f..fe490f90167 100644 --- a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/java/logging.properties +++ b/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/java/logging.properties @@ -3,9 +3,9 @@ handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler # File Logging java.util.logging.FileHandler.pattern = %t/service.log -java.util.logging.FileHandler.formatter = org.springframework.bootstrap.logging.java.SimpleFormatter +java.util.logging.FileHandler.formatter = org.springframework.boot.strap.logging.java.SimpleFormatter java.util.logging.FileHandler.level = INFO java.util.logging.FileHandler.limit = 10485760 java.util.logging.FileHandler.count = 10 -java.util.logging.ConsoleHandler.formatter = org.springframework.bootstrap.logging.java.SimpleFormatter +java.util.logging.ConsoleHandler.formatter = org.springframework.boot.strap.logging.java.SimpleFormatter diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j/log4j.properties b/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j/log4j.properties rename to spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/log4j/log4j.properties diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback/logback.xml b/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml similarity index 92% rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback/logback.xml rename to spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml index e3854fd7bcd..b5206040dba 100644 --- a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback/logback.xml +++ b/spring-boot-strap/src/main/resources/org/springframework/boot/strap/logging/logback/logback.xml @@ -4,8 +4,8 @@ - - + + diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/BannerTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/BannerTests.java similarity index 90% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/BannerTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/BannerTests.java index 98b63c4be65..e59e1685b0d 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/BannerTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/BannerTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import org.junit.Test; +import org.springframework.boot.strap.Banner; /** * Tests for {@link Banner}. diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java index 9e56f5a71c7..be3359eedf7 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/BeanDefinitionLoaderTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.sampleconfig.MyComponent; +import org.springframework.boot.strap.BeanDefinitionLoader; +import org.springframework.boot.strap.sampleconfig.MyComponent; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.io.ClassPathResource; @@ -82,7 +83,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/boot/strap/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/bootstrap/SimpleMainTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/SimpleMainTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/SimpleMainTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/SimpleMainTests.java index 08e7b229b28..db550f3c3c8 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SimpleMainTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/SimpleMainTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -77,14 +77,15 @@ public class SimpleMainTests { @Test public void xmlContext() throws Exception { - SpringApplication.main(getArgs("org/springframework/bootstrap/sample-beans.xml")); + SpringApplication + .main(getArgs("org/springframework/boot/strap/sample-beans.xml")); assertTrue(getOutput().contains(SPRING_STARTUP)); } @Test public void mixedContext() throws Exception { SpringApplication.main(getArgs(getClass().getName(), - "org/springframework/bootstrap/sample-beans.xml")); + "org/springframework/boot/strap/sample-beans.xml")); assertTrue(getOutput().contains(SPRING_STARTUP)); } diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java index aeb508a94f0..e948c21b1b7 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/SpringApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.util.concurrent.atomic.AtomicReference; @@ -26,8 +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.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.boot.strap.BeanDefinitionLoader; +import org.springframework.boot.strap.CommandLineRunner; +import org.springframework.boot.strap.ExitCodeGenerator; +import org.springframework.boot.strap.SpringApplication; +import org.springframework.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/StartUpLoggerTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/StartUpLoggerTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java index bcefcdde20d..2d3ee079329 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/StartUpLoggerTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/StartUpLoggerTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import org.apache.commons.logging.impl.SimpleLog; import org.junit.Test; +import org.springframework.boot.strap.StartupInfoLogger; import static org.junit.Assert.assertTrue; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/TestUtils.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/TestUtils.java index e58267b9e21..0c55da0bb26 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/TestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.boot.strap; import java.util.HashMap; import java.util.Map; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/ansi/AnsiOutputTest.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java similarity index 72% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/ansi/AnsiOutputTest.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java index 7242769933f..dd783ae4736 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/ansi/AnsiOutputTest.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/ansi/AnsiOutputTest.java @@ -14,20 +14,22 @@ * limitations under the License. */ -package org.springframework.bootstrap.ansi; +package org.springframework.boot.strap.ansi; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.bootstrap.ansi.AnsiOutput.Enabled; +import org.springframework.boot.strap.ansi.AnsiOutput; +import org.springframework.boot.strap.ansi.AnsiOutput.Enabled; + +import static org.springframework.boot.strap.ansi.AnsiElement.BOLD; +import static org.springframework.boot.strap.ansi.AnsiElement.FAINT; +import static org.springframework.boot.strap.ansi.AnsiElement.GREEN; +import static org.springframework.boot.strap.ansi.AnsiElement.NORMAL; +import static org.springframework.boot.strap.ansi.AnsiElement.RED; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; -import static org.springframework.bootstrap.ansi.AnsiElement.BOLD; -import static org.springframework.bootstrap.ansi.AnsiElement.FAINT; -import static org.springframework.bootstrap.ansi.AnsiElement.GREEN; -import static org.springframework.bootstrap.ansi.AnsiElement.NORMAL; -import static org.springframework.bootstrap.ansi.AnsiElement.RED; /** * Tests for {@link AnsiOutput}. diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/BindingPreparationTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java similarity index 98% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/BindingPreparationTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java index 3bed4c66c08..1cb9b268089 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/BindingPreparationTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/BindingPreparationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -24,7 +24,8 @@ import java.util.Map; import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.BeanWrapperImpl; -import org.springframework.bootstrap.bind.RelaxedDataBinderTests.TargetWithNestedObject; +import org.springframework.boot.strap.bind.RelaxedDataBinder; +import org.springframework.boot.strap.bind.RelaxedDataBinderTests.TargetWithNestedObject; import org.springframework.context.expression.MapAccessor; import org.springframework.core.convert.TypeDescriptor; import org.springframework.expression.Expression; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java index a19f4583d19..f057c191d1c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertiesConfigurationFactoryTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.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.boot.strap.bind.PropertiesConfigurationFactory; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java index ceec5e2d660..b32ad23953b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/PropertySourcesPropertyValuesTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.util.Collections; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.bind.PropertySourcesPropertyValues; +import org.springframework.boot.strap.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/bootstrap/bind/RelaxedDataBinderTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java similarity index 99% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java index 85ccfe7545c..566ae56ced3 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/RelaxedDataBinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -41,6 +41,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.NotWritablePropertyException; +import org.springframework.boot.strap.bind.RelaxedDataBinder; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java index b95dc387259..66731a20765 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/bind/YamlConfigurationFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.boot.strap.bind; import java.util.Collections; import java.util.HashMap; @@ -24,7 +24,7 @@ import javax.validation.Validation; import javax.validation.constraints.NotNull; import org.junit.Test; -import org.springframework.bootstrap.bind.YamlConfigurationFactory; +import org.springframework.boot.strap.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/bootstrap/config/ArrayDocumentMatcherTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java similarity index 90% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/ArrayDocumentMatcherTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java index c3210756126..b85381a37f8 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/ArrayDocumentMatcherTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/ArrayDocumentMatcherTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.io.IOException; import java.util.Properties; import org.junit.Test; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.boot.strap.config.ArrayDocumentMatcher; +import org.springframework.boot.strap.config.YamlProcessor.MatchStatus; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java similarity index 83% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java index 5f06d06d243..3351a405c8b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/JacksonParserTests.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; -import org.springframework.bootstrap.config.JacksonJsonParser; -import org.springframework.bootstrap.config.JsonParser; +import org.springframework.boot.strap.config.JacksonJsonParser; +import org.springframework.boot.strap.config.JsonParser; /** diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java index fc8cc9e2f2f..6bd172a9645 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/SimpleJsonParserTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.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 org.springframework.boot.strap.config.JsonParser; +import org.springframework.boot.strap.config.SimpleJsonParser; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java similarity index 83% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java index b00fe8b1278..5f68c6ffd5c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlJsonParserTests.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; -import org.springframework.bootstrap.config.JsonParser; -import org.springframework.bootstrap.config.YamlJsonParser; +import org.springframework.boot.strap.config.JsonParser; +import org.springframework.boot.strap.config.YamlJsonParser; /** diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java index 101e434f1ab..fff38c2862e 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlMapFactoryBeanTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.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.boot.strap.config.YamlMapFactoryBean; +import org.springframework.boot.strap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.FileSystemResource; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlProcessorTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlProcessorTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java index cd3d8911a90..d3bb0154422 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlProcessorTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlProcessorTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.Map; import java.util.Properties; import org.junit.Test; -import org.springframework.bootstrap.config.YamlProcessor.MatchCallback; +import org.springframework.boot.strap.config.YamlProcessor; +import org.springframework.boot.strap.config.YamlProcessor.MatchCallback; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java index 07cb50d48b1..2cd5c3cf340 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/config/YamlPropertiesFactoryBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.boot.strap.config; import java.util.Arrays; import java.util.Map; @@ -22,9 +22,10 @@ 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.boot.strap.config.YamlPropertiesFactoryBean; +import org.springframework.boot.strap.config.YamlProcessor.DocumentMatcher; +import org.springframework.boot.strap.config.YamlProcessor.MatchStatus; +import org.springframework.boot.strap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java index 59eaa7c7812..65e0fd10386 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,7 +23,7 @@ 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.boot.strap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Conditional; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java index cd3af4903b5..03fc63826f8 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/AssertMissingBeanCondition.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import java.util.List; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.bootstrap.context.condition.OnMissingBeanCondition; +import org.springframework.boot.strap.context.condition.OnMissingBeanCondition; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java index 9ce448c7c28..a0f015bb079 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnBeanConditionTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.junit.Ignore; import org.junit.Test; +import org.springframework.boot.strap.context.condition.ConditionalOnBean; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -102,13 +103,13 @@ public class OnBeanConditionTests { } @Configuration - @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") + @ImportResource("org/springframework/boot/strap/context/annotation/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(OnBeanNameConfiguration.class) - @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") + @ImportResource("org/springframework/boot/strap/context/annotation/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java similarity index 89% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java index f0d542e098c..26a0ddbe7a6 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnClassConditionTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.junit.Test; +import org.springframework.boot.strap.context.condition.ConditionalOnClass; +import org.springframework.boot.strap.context.condition.OnClassCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -95,13 +97,13 @@ public class OnClassConditionTests { } @Configuration - @ImportResource("org/springframework/bootstrap/context/foo.xml") + @ImportResource("org/springframework/boot/strap/context/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(BasicConfiguration.class) - @ImportResource("org/springframework/bootstrap/context/foo.xml") + @ImportResource("org/springframework/boot/strap/context/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java similarity index 89% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java index 40e187c69b5..0d3cd8baa18 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnExpressionConditionTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.junit.Test; -import org.springframework.bootstrap.context.condition.ConditionalOnExpression; -import org.springframework.bootstrap.context.condition.OnExpressionCondition; +import org.springframework.boot.strap.context.condition.ConditionalOnExpression; +import org.springframework.boot.strap.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/bootstrap/context/condition/OnMissingBeanConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java index a2937ec41dd..916adc878e1 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingBeanConditionTests.java @@ -14,9 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.junit.Test; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.condition.OnMissingBeanCondition; +import org.springframework.boot.strap.context.condition.SearchStrategy; 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/bootstrap/context/condition/OnMissingClassConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java similarity index 86% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java index 2ab8b1c44c3..fdaa9939a0c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnMissingClassConditionTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.junit.Test; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingClass; +import org.springframework.boot.strap.context.condition.OnMissingClassCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,7 +53,7 @@ public class OnMissingClassConditionTests { } @Configuration - @ConditionalOnMissingClass("org.springframework.bootstrap.context.condition.OnMissingClassConditionTests") + @ConditionalOnMissingClass("org.springframework.boot.strap.context.condition.OnMissingClassConditionTests") protected static class BasicConfiguration { @Bean public String bar() { diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java similarity index 85% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java index 19fb587c107..7aa4351e130 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnNotWebApplicationConditionTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.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.boot.strap.context.condition.ConditionalOnNotWebApplication; +import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication; +import org.springframework.boot.strap.context.condition.OnNotWebApplicationCondition; 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/bootstrap/context/condition/OnResourceConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java similarity index 90% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java index 8e304820be1..a0dc672aa35 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnResourceConditionTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.context.condition; import org.junit.Test; -import org.springframework.bootstrap.context.condition.ConditionalOnResource; -import org.springframework.bootstrap.context.condition.OnResourceCondition; +import org.springframework.boot.strap.context.condition.ConditionalOnResource; +import org.springframework.boot.strap.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/bootstrap/context/condition/OnWebApplicationConditionTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java similarity index 86% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java index 95171af5375..e403dda2959 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/condition/OnWebApplicationConditionTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.condition; +package org.springframework.boot.strap.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.boot.strap.context.condition.ConditionalOnNotWebApplication; +import org.springframework.boot.strap.context.condition.ConditionalOnWebApplication; +import org.springframework.boot.strap.context.condition.OnWebApplicationCondition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index a9b0ed05bfb..02e0996a3a8 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.FileWriter; import java.io.IOException; @@ -38,6 +38,13 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.mockito.InOrder; +import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.FilterRegistrationBean; +import org.springframework.boot.strap.context.embedded.MimeMappings; +import org.springframework.boot.strap.context.embedded.ServletContextInitializer; +import org.springframework.boot.strap.context.embedded.ServletRegistrationBean; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpResponse; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java index 573c0c0dfea..40a1f0e2dd0 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.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.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.context.ServletContextAware; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index 5c83bdd31be..66fa28b4ce0 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.net.URI; import java.nio.charset.Charset; @@ -22,8 +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.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -117,7 +117,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { @Configuration @EnableWebMvc - @PropertySource("classpath:/org/springframework/bootstrap/context/embedded/conf.properties") + @PropertySource("classpath:/org/springframework/boot/strap/context/embedded/conf.properties") public static class AdvancedConfig { @Autowired diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java index 5a693962e29..1cbd9619bc6 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/EmbeddedWebApplicationContextTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.lang.reflect.Field; import java.util.Properties; @@ -33,10 +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.boot.strap.context.embedded.EmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.FilterRegistrationBean; +import org.springframework.boot.strap.context.embedded.ServletContextInitializer; +import org.springframework.boot.strap.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/bootstrap/context/embedded/ExampleFilter.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java index ec9a287638c..8433ed21eab 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java index be9ec5fe829..0a05b31b69a 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ExampleServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java index 39dd0c2937a..a5672d0b1d9 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/FilterRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.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.boot.strap.context.embedded.FilterRegistrationBean; +import org.springframework.boot.strap.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.*; import static org.mockito.Matchers.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MimeMappingsTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MimeMappingsTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java index 18893b471bd..c63166f1b1b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MimeMappingsTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MimeMappingsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.ArrayList; import java.util.HashMap; @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.springframework.boot.strap.context.embedded.MimeMappings; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java index 44024945a04..15b9d25fe49 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.ArrayList; import java.util.Enumeration; @@ -31,6 +31,11 @@ import javax.servlet.ServletRegistration; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerException; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.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/bootstrap/context/embedded/MockFilter.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java index 4cc05216977..4370aa9e86a 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java index b40ff18c6d5..4c762a9e44c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/MockServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java index 00a74a952d2..a51be118f62 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/ServletRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import java.util.Arrays; import java.util.Collections; @@ -34,7 +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 org.springframework.boot.strap.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/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java index 94834f00502..4be0188f02c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/XmlEmbeddedWebApplicationContextTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.boot.strap.context.embedded; import javax.servlet.Servlet; import org.junit.Test; -import org.springframework.bootstrap.context.embedded.XmlEmbeddedWebApplicationContext; +import org.springframework.boot.strap.context.embedded.XmlEmbeddedWebApplicationContext; import org.springframework.core.io.ClassPathResource; import static org.mockito.Mockito.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java similarity index 73% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java index 5b0a0a9b3b6..3ae253a6cc3 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.config; +package org.springframework.boot.strap.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.boot.strap.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests; +import org.springframework.boot.strap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.MockEmbeddedServletContainerFactory; +import org.springframework.boot.strap.context.embedded.MockServlet; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java similarity index 89% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 04c3adaeda5..b98c2e765db 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.boot.strap.context.embedded.jetty; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -24,7 +24,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.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java index 304947cbcc7..390663e7b56 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/properties/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.properties; +package org.springframework.boot.strap.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.bootstrap.bind.RelaxedDataBinder; -import org.springframework.bootstrap.context.embedded.properties.ServerProperties; +import org.springframework.boot.strap.bind.RelaxedDataBinder; +import org.springframework.boot.strap.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/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java similarity index 89% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java index c1c8d563bc7..1252000b9a2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.boot.strap.context.embedded.tomcat; import java.util.Arrays; import java.util.concurrent.TimeUnit; @@ -25,7 +25,9 @@ import org.apache.catalina.LifecycleListener; import org.apache.catalina.startup.Tomcat; import org.junit.Test; import org.mockito.InOrder; -import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.boot.strap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainer; +import org.springframework.boot.strap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java index 66b4de012f8..23db0a95368 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ConfigFileApplicationContextInitializerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.springframework.boot.strap.context.initializer.ConfigFileApplicationContextInitializer; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.SimpleCommandLinePropertySource; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java index a62762a0bda..fa57e03ce22 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/ContextIdApplicationContextInitializerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import org.junit.Test; -import org.springframework.bootstrap.TestUtils; -import org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer; +import org.springframework.boot.strap.TestUtils; +import org.springframework.boot.strap.context.initializer.ContextIdApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java index 838cdce9b38..f56ebae1a7e 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.util.HashMap; import java.util.Map; @@ -22,7 +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.boot.strap.context.initializer.EnvironmentDelegateApplicationContextInitializer; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializerTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializerTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java index d3ce0b8b014..09218685456 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializerTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/LoggingApplicationContextInitializerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,8 +29,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.logging.java.JavaLoggingSystem; +import org.springframework.boot.strap.SpringApplication; +import org.springframework.boot.strap.context.initializer.LoggingApplicationContextInitializer; +import org.springframework.boot.strap.logging.java.JavaLoggingSystem; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.env.PropertySource; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java index 046d2e2d3de..700daa383af 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/initializer/VcapApplicationContextInitializerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.boot.strap.context.initializer; import org.junit.Test; -import org.springframework.bootstrap.TestUtils; -import org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer; +import org.springframework.boot.strap.TestUtils; +import org.springframework.boot.strap.context.initializer.VcapApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java index b53a0e52a2f..7a3c0b49788 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/properties/EnableConfigurationPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.properties; +package org.springframework.boot.strap.context.properties; import java.util.ArrayList; import java.util.Arrays; @@ -25,9 +25,11 @@ 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.boot.strap.TestUtils; +import org.springframework.boot.strap.context.condition.AssertMissingBean; +import org.springframework.boot.strap.context.condition.ConditionalOnMissingBean; +import org.springframework.boot.strap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -208,7 +210,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.boot.strap.context.annotation.EnableConfigurationPropertiesTests$TestProperties") public TestProperties testProperties() { return new TestProperties(); } @@ -226,7 +228,7 @@ public class EnableConfigurationPropertiesTests { } @Configuration - @ImportResource("org/springframework/bootstrap/context/properties/testProperties.xml") + @ImportResource("org/springframework/boot/strap/context/properties/testProperties.xml") protected static class DefaultXmlConfiguration { } diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java index d62388d12ce..1b85a242922 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/context/test/EnableConfigurationPropertiesTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.test; +package org.springframework.boot.strap.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.boot.strap.context.properties.ConfigurationProperties; +import org.springframework.boot.strap.context.properties.EnableConfigurationProperties; 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/bootstrap/logging/java/JavaLoggerSystemTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/java/JavaLoggerSystemTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java index 4c4265acb7b..7f5b2d2c9ee 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/java/JavaLoggerSystemTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/JavaLoggerSystemTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.java; +package org.springframework.boot.strap.logging.java; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,6 +25,7 @@ import org.apache.commons.logging.impl.Jdk14Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.strap.logging.java.JavaLoggingSystem; import org.springframework.util.ClassUtils; import static org.junit.Assert.assertTrue; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/java/TestFormatter.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/java/TestFormatter.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java index 3537d15db8b..f7ce6313ac5 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/java/TestFormatter.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/java/TestFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.java; +package org.springframework.boot.strap.logging.java; import java.util.logging.Formatter; import java.util.logging.LogRecord; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/ColorConverterTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/ColorConverterTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java index 711a5754ba9..1903dda1a53 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/ColorConverterTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/ColorConverterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.logback; +package org.springframework.boot.strap.logging.logback; import java.util.Collections; @@ -22,7 +22,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.bootstrap.ansi.AnsiOutput; +import org.springframework.boot.strap.ansi.AnsiOutput; +import org.springframework.boot.strap.logging.logback.ColorConverter; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.LoggingEvent; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/LogbackLoggingSystemTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java index 1e25d08d532..b3ffd455fb4 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/LogbackLoggingSystemTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/LogbackLoggingSystemTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.logback; +package org.springframework.boot.strap.logging.logback; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.logging.logback.LogbackLoggingSystem; +import org.springframework.boot.strap.logging.logback.LogbackLoggingSystem; import static org.junit.Assert.assertTrue; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/WhitespaceThrowableProxyConverterTests.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/WhitespaceThrowableProxyConverterTests.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java index 5d807e9d79b..1d57d7f49dc 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/logback/WhitespaceThrowableProxyConverterTests.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/logging/logback/WhitespaceThrowableProxyConverterTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging.logback; +package org.springframework.boot.strap.logging.logback; import org.junit.Test; +import org.springframework.boot.strap.logging.logback.WhitespaceThrowableProxyConverter; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java index 1e43159bb8c..9147cf55ca4 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/MyComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sampleconfig; +package org.springframework.boot.strap.sampleconfig; import org.springframework.stereotype.Component; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/package-info.java b/spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/package-info.java rename to spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java index 04a1f01bbaa..215a667f6bc 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/package-info.java +++ b/spring-boot-strap/src/test/java/org/springframework/boot/strap/sampleconfig/package-info.java @@ -17,5 +17,5 @@ /** * Sample config for tests */ -package org.springframework.bootstrap.sampleconfig; +package org.springframework.boot.strap.sampleconfig; diff --git a/spring-bootstrap/src/test/resources/application.properties b/spring-boot-strap/src/test/resources/application.properties similarity index 100% rename from spring-bootstrap/src/test/resources/application.properties rename to spring-boot-strap/src/test/resources/application.properties diff --git a/spring-boot-strap/src/test/resources/dispatcher.properties b/spring-boot-strap/src/test/resources/dispatcher.properties new file mode 100644 index 00000000000..851ea9b5d5f --- /dev/null +++ b/spring-boot-strap/src/test/resources/dispatcher.properties @@ -0,0 +1 @@ +main.sources: org.springframework.boot.strap.main.DispatcherMainTests \ No newline at end of file diff --git a/spring-bootstrap/src/test/resources/enableprofile-myprofile.properties b/spring-boot-strap/src/test/resources/enableprofile-myprofile.properties similarity index 100% rename from spring-bootstrap/src/test/resources/enableprofile-myprofile.properties rename to spring-boot-strap/src/test/resources/enableprofile-myprofile.properties diff --git a/spring-bootstrap/src/test/resources/enableprofile.properties b/spring-boot-strap/src/test/resources/enableprofile.properties similarity index 100% rename from spring-bootstrap/src/test/resources/enableprofile.properties rename to spring-boot-strap/src/test/resources/enableprofile.properties diff --git a/spring-bootstrap/src/test/resources/logback-nondefault.xml b/spring-boot-strap/src/test/resources/logback-nondefault.xml similarity index 100% rename from spring-bootstrap/src/test/resources/logback-nondefault.xml rename to spring-boot-strap/src/test/resources/logback-nondefault.xml diff --git a/spring-bootstrap/src/test/resources/logback-test.xml b/spring-boot-strap/src/test/resources/logback-test.xml similarity index 77% rename from spring-bootstrap/src/test/resources/logback-test.xml rename to spring-boot-strap/src/test/resources/logback-test.xml index 9cc6069b88f..a15ea5dbe19 100644 --- a/spring-bootstrap/src/test/resources/logback-test.xml +++ b/spring-boot-strap/src/test/resources/logback-test.xml @@ -7,8 +7,8 @@ ${LOG_PATTERN} - - + + diff --git a/spring-bootstrap/src/test/resources/logging-nondefault.properties b/spring-boot-strap/src/test/resources/logging-nondefault.properties similarity index 100% rename from spring-bootstrap/src/test/resources/logging-nondefault.properties rename to spring-boot-strap/src/test/resources/logging-nondefault.properties diff --git a/spring-bootstrap/src/test/resources/logging.properties b/spring-boot-strap/src/test/resources/logging.properties similarity index 80% rename from spring-bootstrap/src/test/resources/logging.properties rename to spring-boot-strap/src/test/resources/logging.properties index 5f28febf8e6..2e306c9a5d2 100644 --- a/spring-bootstrap/src/test/resources/logging.properties +++ b/spring-boot-strap/src/test/resources/logging.properties @@ -1,4 +1,4 @@ handlers= java.util.logging.ConsoleHandler .level= INFO java.util.logging.ConsoleHandler.level = INFO -java.util.logging.ConsoleHandler.formatter = org.springframework.bootstrap.logging.java.SimpleFormatter +java.util.logging.ConsoleHandler.formatter = org.springframework.boot.strap.logging.java.SimpleFormatter diff --git a/spring-bootstrap/src/test/resources/moreproperties.properties b/spring-boot-strap/src/test/resources/moreproperties.properties similarity index 100% rename from spring-bootstrap/src/test/resources/moreproperties.properties rename to spring-boot-strap/src/test/resources/moreproperties.properties diff --git a/spring-bootstrap/src/test/resources/name.yml b/spring-boot-strap/src/test/resources/name.yml similarity index 100% rename from spring-bootstrap/src/test/resources/name.yml rename to spring-boot-strap/src/test/resources/name.yml diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties rename to spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/conf.properties diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml similarity index 63% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml rename to spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml index c4a4d1737a0..4b81b8f5913 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml +++ b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/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.boot.strap.context.embedded.MockEmbeddedServletContainerFactory" /> - + diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/foo.xml b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/foo.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/foo.xml rename to spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/foo.xml diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml similarity index 61% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml rename to spring-boot-strap/src/test/resources/org/springframework/boot/strap/context/properties/testProperties.xml index 24a4b905ec9..3591aef3474 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml +++ b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/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.boot.strap.context.properties.EnableConfigurationPropertiesTests$TestProperties" + class="org.springframework.boot.strap.context.properties.EnableConfigurationPropertiesTests$TestProperties"> diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/sample-beans.xml similarity index 83% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml rename to spring-boot-strap/src/test/resources/org/springframework/boot/strap/sample-beans.xml index 3658eb12749..6c1b3aa12d1 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml +++ b/spring-boot-strap/src/test/resources/org/springframework/boot/strap/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-bootstrap/src/test/resources/other.yml b/spring-boot-strap/src/test/resources/other.yml similarity index 100% rename from spring-bootstrap/src/test/resources/other.yml rename to spring-boot-strap/src/test/resources/other.yml diff --git a/spring-bootstrap/src/test/resources/specificfile-specificprofile.properties b/spring-boot-strap/src/test/resources/specificfile-specificprofile.properties similarity index 100% rename from spring-bootstrap/src/test/resources/specificfile-specificprofile.properties rename to spring-boot-strap/src/test/resources/specificfile-specificprofile.properties diff --git a/spring-bootstrap/src/test/resources/specificlocation.properties b/spring-boot-strap/src/test/resources/specificlocation.properties similarity index 100% rename from spring-bootstrap/src/test/resources/specificlocation.properties rename to spring-boot-strap/src/test/resources/specificlocation.properties diff --git a/spring-bootstrap/src/test/resources/testprofiles.yml b/spring-boot-strap/src/test/resources/testprofiles.yml similarity index 100% rename from spring-bootstrap/src/test/resources/testprofiles.yml rename to spring-boot-strap/src/test/resources/testprofiles.yml diff --git a/spring-bootstrap/src/test/resources/testproperties.properties b/spring-boot-strap/src/test/resources/testproperties.properties similarity index 100% rename from spring-bootstrap/src/test/resources/testproperties.properties rename to spring-boot-strap/src/test/resources/testproperties.properties diff --git a/spring-bootstrap/src/test/resources/testsetprofiles.yml b/spring-boot-strap/src/test/resources/testsetprofiles.yml similarity index 100% rename from spring-bootstrap/src/test/resources/testsetprofiles.yml rename to spring-boot-strap/src/test/resources/testsetprofiles.yml diff --git a/spring-bootstrap/src/test/resources/testyaml.yml b/spring-boot-strap/src/test/resources/testyaml.yml similarity index 100% rename from spring-bootstrap/src/test/resources/testyaml.yml rename to spring-boot-strap/src/test/resources/testyaml.yml diff --git a/spring-starters/README.md b/spring-boot-ups/README.md similarity index 100% rename from spring-starters/README.md rename to spring-boot-ups/README.md diff --git a/spring-starters/pom.xml b/spring-boot-ups/pom.xml similarity index 65% rename from spring-starters/pom.xml rename to spring-boot-ups/pom.xml index 151f0ee0ea5..e5ff528d216 100644 --- a/spring-starters/pom.xml +++ b/spring-boot-ups/pom.xml @@ -3,27 +3,27 @@ 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.zero - spring-zero + org.springframework.boot + spring-boot 0.5.0.BUILD-SNAPSHOT - spring-starters + spring-boot-ups pom ${basedir}/.. - spring-starter - spring-starter-actuator - spring-starter-batch - spring-starter-data-jpa - spring-starter-integration - spring-starter-jetty - spring-starter-logging - spring-starter-parent - spring-starter-security - spring-starter-tomcat - spring-starter-web + spring-boot-up-parent + spring-boot-up + spring-boot-up-batch + spring-boot-up-data-jpa + spring-boot-up-integration + spring-boot-up-jetty + spring-boot-up-logging + spring-boot-up-ops + spring-boot-up-security + spring-boot-up-tomcat + spring-boot-up-web @@ -48,7 +48,7 @@ true - ${basedir}/spring-starter-parent + ${basedir}/spring-boot-up-parent diff --git a/spring-starters/spring-starter-batch/pom.xml b/spring-boot-ups/spring-boot-up-batch/pom.xml similarity index 79% rename from spring-starters/spring-starter-batch/pom.xml rename to spring-boot-ups/spring-boot-up-batch/pom.xml index dff74e224cb..b9b60be95ff 100644 --- a/spring-starters/spring-starter-batch/pom.xml +++ b/spring-boot-ups/spring-boot-up-batch/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-batch + spring-boot-up-batch jar ${basedir}/../.. @@ -15,7 +16,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} diff --git a/spring-starters/spring-starter-data-jpa/pom.xml b/spring-boot-ups/spring-boot-up-data-jpa/pom.xml similarity index 82% rename from spring-starters/spring-starter-data-jpa/pom.xml rename to spring-boot-ups/spring-boot-up-data-jpa/pom.xml index 42419b4afd4..cd2a0af0b28 100644 --- a/spring-starters/spring-starter-data-jpa/pom.xml +++ b/spring-boot-ups/spring-boot-up-data-jpa/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-data-jpa + spring-boot-up-data-jpa jar ${basedir}/../.. @@ -15,7 +16,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} diff --git a/spring-starters/spring-starter-integration/pom.xml b/spring-boot-ups/spring-boot-up-integration/pom.xml similarity index 87% rename from spring-starters/spring-starter-integration/pom.xml rename to spring-boot-ups/spring-boot-up-integration/pom.xml index dc16234ac05..db678a0b4f2 100644 --- a/spring-starters/spring-starter-integration/pom.xml +++ b/spring-boot-ups/spring-boot-up-integration/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-integration + spring-boot-up-integration jar ${basedir}/../.. @@ -15,7 +16,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} diff --git a/spring-starters/spring-starter-jetty/pom.xml b/spring-boot-ups/spring-boot-up-jetty/pom.xml similarity index 77% rename from spring-starters/spring-starter-jetty/pom.xml rename to spring-boot-ups/spring-boot-up-jetty/pom.xml index 4d5f067a95e..09cdad91554 100644 --- a/spring-starters/spring-starter-jetty/pom.xml +++ b/spring-boot-ups/spring-boot-up-jetty/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-jetty + spring-boot-up-jetty jar ${basedir}/../.. diff --git a/spring-starters/spring-starter-logging/pom.xml b/spring-boot-ups/spring-boot-up-logging/pom.xml similarity index 79% rename from spring-starters/spring-starter-logging/pom.xml rename to spring-boot-ups/spring-boot-up-logging/pom.xml index e7ffe560ab0..9ab186ae86f 100644 --- a/spring-starters/spring-starter-logging/pom.xml +++ b/spring-boot-ups/spring-boot-up-logging/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-logging + spring-boot-up-logging jar ${basedir}/../.. diff --git a/spring-starters/spring-starter-actuator/pom.xml b/spring-boot-ups/spring-boot-up-ops/pom.xml similarity index 71% rename from spring-starters/spring-starter-actuator/pom.xml rename to spring-boot-ups/spring-boot-up-ops/pom.xml index b27d2776e9c..2c8250f0524 100644 --- a/spring-starters/spring-starter-actuator/pom.xml +++ b/spring-boot-ups/spring-boot-up-ops/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-actuator + spring-boot-up-ops jar ${basedir}/../.. @@ -15,12 +16,12 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} ${project.groupId} - spring-actuator + spring-boot-ops ${project.version} diff --git a/spring-starters/spring-starter-parent/pom.xml b/spring-boot-ups/spring-boot-up-parent/pom.xml similarity index 80% rename from spring-starters/spring-starter-parent/pom.xml rename to spring-boot-ups/spring-boot-up-parent/pom.xml index 5d5a36524be..c797f78910a 100644 --- a/spring-starters/spring-starter-parent/pom.xml +++ b/spring-boot-ups/spring-boot-up-parent/pom.xml @@ -4,8 +4,8 @@ 4.0.0 - org.springframework.zero - spring-starter-parent + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT pom @@ -13,8 +13,8 @@ UTF-8 UTF-8 4.0.0.BUILD-SNAPSHOT - 0.5.0.BUILD-SNAPSHOT - org.springframework.bootstrap.SpringApplication + 0.5.0.BUILD-SNAPSHOT + org.springframework.boot.strap.SpringApplication 3.0 @@ -22,66 +22,66 @@ - org.springframework.zero - spring-zero - ${spring.zero.version} + org.springframework.boot + spring-boot + ${spring.boot.version} pom import - org.springframework.zero - spring-bootstrap - ${spring.zero.version} + org.springframework.boot + spring-boot-strap + ${spring.boot.version} - org.springframework.zero - spring-actuator - ${spring.zero.version} + org.springframework.boot + spring-boot-ops + ${spring.boot.version} - org.springframework.zero - spring-starter - ${spring.zero.version} + org.springframework.boot + spring-boot-up + ${spring.boot.version} - org.springframework.zero - spring-starter-actuator - ${spring.zero.version} + org.springframework.boot + spring-boot-up-ops + ${spring.boot.version} - org.springframework.zero - spring-starter-web - ${spring.zero.version} + org.springframework.boot + spring-boot-up-web + ${spring.boot.version} - org.springframework.zero - spring-starter-tomcat - ${spring.zero.version} + org.springframework.boot + spring-boot-up-tomcat + ${spring.boot.version} - org.springframework.zero - spring-starter-jetty - ${spring.zero.version} + org.springframework.boot + spring-boot-up-jetty + ${spring.boot.version} - org.springframework.zero - spring-starter-data-jpa - ${spring.zero.version} + org.springframework.boot + spring-boot-up-data-jpa + ${spring.boot.version} - org.springframework.zero - spring-starter-batch - ${spring.zero.version} + org.springframework.boot + spring-boot-up-batch + ${spring.boot.version} - org.springframework.zero - spring-starter-integration - ${spring.zero.version} + org.springframework.boot + spring-boot-up-integration + ${spring.boot.version} - org.springframework.zero - spring-starter-security - ${spring.zero.version} + org.springframework.boot + spring-boot-up-security + ${spring.boot.version} @@ -110,7 +110,7 @@ http://www.springsource.com/download/community spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-zero/docs/${project.version} + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version} spring-repo-release @@ -281,9 +281,9 @@ - org.springframework.zero + org.springframework.boot spring-package-maven-plugin - ${spring.zero.version} + ${spring.boot.version} @@ -303,9 +303,9 @@ 2.1 - org.springframework.zero + org.springframework.boot spring-package-maven-plugin - ${spring.zero.version} + ${spring.boot.version} diff --git a/spring-starters/spring-starter-security/pom.xml b/spring-boot-ups/spring-boot-up-security/pom.xml similarity index 77% rename from spring-starters/spring-starter-security/pom.xml rename to spring-boot-ups/spring-boot-up-security/pom.xml index c1afc93055a..ae0c5bc9b54 100644 --- a/spring-starters/spring-starter-security/pom.xml +++ b/spring-boot-ups/spring-boot-up-security/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-security + spring-boot-up-security jar ${basedir}/../.. @@ -15,7 +16,7 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} diff --git a/spring-starters/spring-starter-tomcat/pom.xml b/spring-boot-ups/spring-boot-up-tomcat/pom.xml similarity index 78% rename from spring-starters/spring-starter-tomcat/pom.xml rename to spring-boot-ups/spring-boot-up-tomcat/pom.xml index fd8b0a1f1ff..6d375724ab5 100644 --- a/spring-starters/spring-starter-tomcat/pom.xml +++ b/spring-boot-ups/spring-boot-up-tomcat/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-tomcat + spring-boot-up-tomcat jar ${basedir}/../.. diff --git a/spring-starters/spring-starter-web/pom.xml b/spring-boot-ups/spring-boot-up-web/pom.xml similarity index 76% rename from spring-starters/spring-starter-web/pom.xml rename to spring-boot-ups/spring-boot-up-web/pom.xml index 22ee2688eb2..33edd6c4c15 100644 --- a/spring-starters/spring-starter-web/pom.xml +++ b/spring-boot-ups/spring-boot-up-web/pom.xml @@ -3,11 +3,12 @@ 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.zero - spring-starters + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent - spring-starter-web + spring-boot-up-web jar ${basedir}/../.. @@ -15,12 +16,12 @@ ${project.groupId} - spring-starter + spring-boot-up ${project.version} ${project.groupId} - spring-starter-tomcat + spring-boot-up-tomcat ${project.version} diff --git a/spring-boot-ups/spring-boot-up/pom.xml b/spring-boot-ups/spring-boot-up/pom.xml new file mode 100644 index 00000000000..b72e5e686c0 --- /dev/null +++ b/spring-boot-ups/spring-boot-up/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-up-parent + 0.5.0.BUILD-SNAPSHOT + ../spring-boot-up-parent + + spring-boot-up + jar + + ${basedir}/../.. + + + + ${project.groupId} + spring-boot-config + ${project.version} + + + ${project.groupId} + spring-boot-up-logging + ${project.version} + + + diff --git a/spring-starters/src/main/parent/pom.xml b/spring-boot-ups/src/main/parent/pom.xml similarity index 80% rename from spring-starters/src/main/parent/pom.xml rename to spring-boot-ups/src/main/parent/pom.xml index 0a6070d4df4..d63721897ab 100644 --- a/spring-starters/src/main/parent/pom.xml +++ b/spring-boot-ups/src/main/parent/pom.xml @@ -4,8 +4,8 @@ 4.0.0 - org.springframework.zero - spring-starter-parent + org.springframework.boot + spring-boot-up-parent 0.5.0.BUILD-SNAPSHOT pom @@ -13,8 +13,8 @@ UTF-8 UTF-8 4.0.0.BUILD-SNAPSHOT - @{project.version} - org.springframework.bootstrap.SpringApplication + @{project.version} + org.springframework.boot.strap.SpringApplication 3.0 @@ -22,66 +22,66 @@ - org.springframework.zero - spring-zero - ${spring.zero.version} + org.springframework.boot + spring-boot + ${spring.boot.version} pom import - org.springframework.zero - spring-bootstrap - ${spring.zero.version} + org.springframework.boot + spring-boot-strap + ${spring.boot.version} - org.springframework.zero - spring-actuator - ${spring.zero.version} + org.springframework.boot + spring-boot-ops + ${spring.boot.version} - org.springframework.zero - spring-starter - ${spring.zero.version} + org.springframework.boot + spring-boot-up + ${spring.boot.version} - org.springframework.zero - spring-starter-actuator - ${spring.zero.version} + org.springframework.boot + spring-boot-up-ops + ${spring.boot.version} - org.springframework.zero - spring-starter-web - ${spring.zero.version} + org.springframework.boot + spring-boot-up-web + ${spring.boot.version} - org.springframework.zero - spring-starter-tomcat - ${spring.zero.version} + org.springframework.boot + spring-boot-up-tomcat + ${spring.boot.version} - org.springframework.zero - spring-starter-jetty - ${spring.zero.version} + org.springframework.boot + spring-boot-up-jetty + ${spring.boot.version} - org.springframework.zero - spring-starter-data-jpa - ${spring.zero.version} + org.springframework.boot + spring-boot-up-data-jpa + ${spring.boot.version} - org.springframework.zero - spring-starter-batch - ${spring.zero.version} + org.springframework.boot + spring-boot-up-batch + ${spring.boot.version} - org.springframework.zero - spring-starter-integration - ${spring.zero.version} + org.springframework.boot + spring-boot-up-integration + ${spring.boot.version} - org.springframework.zero - spring-starter-security - ${spring.zero.version} + org.springframework.boot + spring-boot-up-security + ${spring.boot.version} @@ -110,7 +110,7 @@ http://www.springsource.com/download/community spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-zero/docs/${project.version} + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version} spring-repo-release @@ -281,9 +281,9 @@ - org.springframework.zero + org.springframework.boot spring-package-maven-plugin - ${spring.zero.version} + ${spring.boot.version} @@ -303,9 +303,9 @@ 2.1 - org.springframework.zero + org.springframework.boot spring-package-maven-plugin - ${spring.zero.version} + ${spring.boot.version} diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 03db1ac821f..00000000000 --- a/spring-bootstrap/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,7 +0,0 @@ -# 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/resources/dispatcher.properties b/spring-bootstrap/src/test/resources/dispatcher.properties deleted file mode 100644 index e030745edab..00000000000 --- a/spring-bootstrap/src/test/resources/dispatcher.properties +++ /dev/null @@ -1 +0,0 @@ -main.sources: org.springframework.bootstrap.main.DispatcherMainTests \ No newline at end of file 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 deleted file mode 100644 index 4c3ba9e9ff6..00000000000 --- a/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 208fd861642..00000000000 --- a/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration +++ /dev/null @@ -1,6 +0,0 @@ -org.springframework.cli.compiler.autoconfigure.SpringCompilerAutoConfiguration -org.springframework.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration -org.springframework.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration -org.springframework.cli.compiler.autoconfigure.ReactorCompilerAutoConfiguration -org.springframework.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration -org.springframework.cli.compiler.autoconfigure.SpringSecurityCompilerAutoConfiguration diff --git a/spring-cli/src/test/resources/commands/closure.groovy b/spring-cli/src/test/resources/commands/closure.groovy deleted file mode 100644 index a88fcea6966..00000000000 --- a/spring-cli/src/test/resources/commands/closure.groovy +++ /dev/null @@ -1,6 +0,0 @@ -def run = { msg -> - org.springframework.cli.command.ScriptCommandTests.executed = true - println "Hello ${msg}" -} - -run diff --git a/spring-starters/spring-starter/pom.xml b/spring-starters/spring-starter/pom.xml deleted file mode 100644 index e13c6798c25..00000000000 --- a/spring-starters/spring-starter/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - 4.0.0 - - org.springframework.zero - spring-starters - 0.5.0.BUILD-SNAPSHOT - - spring-starter - jar - - ${basedir}/../.. - - - - ${project.groupId} - spring-starter-logging - ${project.version} - - - ${project.groupId} - spring-bootstrap - ${project.version} - - - ${project.groupId} - spring-autoconfigure - ${project.version} - - - org.hibernate - hibernate-validator - - - org.slf4j - jcl-over-slf4j - - - org.springframework - spring-beans - - - org.springframework - spring-core - - - commons-logging - commons-logging - - - - - org.springframework - spring-context - - - org.springframework - spring-expression - - - diff --git a/spring-zero-samples/spring-zero-sample-actuator/start.groovy b/spring-zero-samples/spring-zero-sample-actuator/start.groovy deleted file mode 100644 index 59610a9bb8d..00000000000 --- a/spring-zero-samples/spring-zero-sample-actuator/start.groovy +++ /dev/null @@ -1,5 +0,0 @@ -@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 { -}