diff --git a/README.md b/README.md index 820b4f2def..6d47fcd9bf 100644 --- a/README.md +++ b/README.md @@ -143,15 +143,15 @@ can also watch files, automatically recompiling and restarting when they change. *See [spring-boot-cli/README.md](spring-boot-cli/README.md).* -### spring-boot-ops -Ops uses auto-configuration to decorate your application with features that +### spring-boot-actuator +The Actuator uses auto-configuration to decorate your application with features that make it instantly deployable and supportable in production. For instance if you are writing a JSON web service then it will provide a server, security, logging, externalized configuration, management endpoints, an audit abstraction, and more. If you want to switch off the built in features, or extend or replace them, it makes that really easy as well. -_See [spring-boot-ops/README.md](spring-boot-ops/README.md)._ +_See [spring-boot-actuator/README.md](spring-boot-actuator/README.md)._ ### spring-boot-loader @@ -176,8 +176,8 @@ samples are provided: * [spring-boot-sample-simple](spring-boot-sample-simple) - A simple command line application * [spring-boot-sample-tomcat](spring-boot-sample-tomcat) - Embedded Tomcat * [spring-boot-sample-jetty](spring-boot-sample-jetty) - Embedded Jetty -* [spring-boot-sample-ops](spring-boot-sample-ops) - Simple REST service with production features -* [spring-boot-sample-ops-ui](spring-boot-sample-ops-ui) - A web UI example with production features +* [spring-boot-sample-actuator](spring-boot-sample-actuator) - Simple REST service with production features +* [spring-boot-sample-actuator-ui](spring-boot-sample-actuator-ui) - A web UI example with production features * [spring-boot-sample-web-ui](spring-boot-sample-web-ui) - A thymeleaf web application * [spring-boot-sample-web-static](spring-boot-sample-web-static) - A web application service static files * [spring-sample-batch](spring-sample-batch) - Define and run a Batch job in a few lines of code diff --git a/pom.xml b/pom.xml index 912f4037ad..083a808f92 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ spring-boot-loader-tools spring-boot-maven-plugin spring-boot-gradle-plugin - spring-boot-ops + spring-boot-actuator spring-boot-starters spring-boot-cli spring-boot-integration-tests diff --git a/spring-boot-ops/README.md b/spring-boot-actuator/README.md similarity index 99% rename from spring-boot-ops/README.md rename to spring-boot-actuator/README.md index 599740f7c0..bb2fc1d60b 100644 --- a/spring-boot-ops/README.md +++ b/spring-boot-actuator/README.md @@ -1,4 +1,4 @@ -# Spring Boot Ops +# Spring Boot Actuator 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 Boot Ops, go to the +of Spring Boot Actuator, go to the [Feature Guide](docs/Features.md). # Getting Started diff --git a/spring-boot-ops/docs/Features.md b/spring-boot-actuator/docs/Features.md similarity index 100% rename from spring-boot-ops/docs/Features.md rename to spring-boot-actuator/docs/Features.md diff --git a/spring-boot-ops/pom.xml b/spring-boot-actuator/pom.xml similarity index 98% rename from spring-boot-ops/pom.xml rename to spring-boot-actuator/pom.xml index ed3d5c2f05..7c983e8d62 100644 --- a/spring-boot-ops/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -7,7 +7,7 @@ spring-boot-parent 0.5.0.BUILD-SNAPSHOT - spring-boot-ops + spring-boot-actuator jar ${basedir}/.. diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEvent.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/AuditEventRepository.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepository.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditApplicationEvent.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/audit/listener/AuditListener.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcChildContextConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ErrorMvcAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfiguration.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/AbstractEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ActionEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/BeansEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/DumpEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/Endpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/EnvironmentEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/HealthEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/InfoEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/MetricsEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/PublicMetrics.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/ShutdownEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/TraceEndpoint.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/VanillaPublicMetrics.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapter.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMapping.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/HealthIndicator.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/health/VanillaHealthIndicator.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/CounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/CounterService.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/CounterService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/CounterService.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultCounterService.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/DefaultGaugeService.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/GaugeService.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/InMemoryMetricRepository.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Measurement.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Measurement.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Measurement.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Measurement.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Metric.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Metric.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/Metric.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/Metric.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/metrics/MetricRepository.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/ManagementServerProperties.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/properties/SecurityProperties.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthenticationAuditListener.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/security/AuthorizationAuditListener.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/InMemoryTraceRepository.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/Trace.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/Trace.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/Trace.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/Trace.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/TraceRepository.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/trace/WebRequestTraceFilter.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/BasicErrorController.java diff --git a/spring-boot-ops/src/main/java/org/springframework/boot/ops/web/ErrorController.java b/spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/ErrorController.java similarity index 100% rename from spring-boot-ops/src/main/java/org/springframework/boot/ops/web/ErrorController.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/ops/web/ErrorController.java diff --git a/spring-boot-ops/src/main/resources/META-INF/spring.factories b/spring-boot-actuator/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-boot-ops/src/main/resources/META-INF/spring.factories rename to spring-boot-actuator/src/main/resources/META-INF/spring.factories diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/AuditEventTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/InMemoryAuditEventRepositoryTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/audit/listener/AuditListenerTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/AuditAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/EndpointWebMvcAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricFilterAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/MetricRepositoryAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/SecurityAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceRepositoryAutoConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/autoconfigure/TraceWebFilterAutoConfigurationTest.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/AbstractEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/BeansEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/DumpEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/EnvironmentEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/HealthEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/InfoEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/MetricsEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/ShutdownEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/TraceEndpointTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/VanillaPublicMetricsTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerAdapterTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/endpoint/mvc/EndpointHandlerMappingTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/fixme/ErrorConfigurationTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/health/VanillaHealthIndicatorTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultCounterServiceTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/DefaultGaugeServiceTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/metrics/InMemoryMetricRepositoryTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/properties/SecurityPropertiesTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthenticationAuditListenerTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/security/AuthorizationAuditListenerTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/InMemoryTraceRepositoryTests.java diff --git a/spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java similarity index 100% rename from spring-boot-ops/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/ops/trace/WebRequestTraceFilterTests.java diff --git a/spring-boot-ops/src/test/resources/git.properties b/spring-boot-actuator/src/test/resources/git.properties similarity index 100% rename from spring-boot-ops/src/test/resources/git.properties rename to spring-boot-actuator/src/test/resources/git.properties diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index 1903786766..57f4bb9a6c 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -13,8 +13,8 @@ ${basedir}/.. - spring-boot-sample-ops - spring-boot-sample-ops-ui + spring-boot-sample-actuator + spring-boot-sample-actuator-ui spring-boot-sample-batch spring-boot-sample-data-jpa spring-boot-sample-integration diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml similarity index 96% rename from spring-boot-samples/spring-boot-sample-ops-ui/pom.xml rename to spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml index bf06ee4280..bd54df1452 100644 --- a/spring-boot-samples/spring-boot-sample-ops-ui/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml @@ -7,7 +7,7 @@ spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-boot-sample-ops-ui + spring-boot-sample-actuator-ui jar ${basedir}/../.. diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/main/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplication.java diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/static/css/bootstrap.min.css b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/static/css/bootstrap.min.css similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/static/css/bootstrap.min.css rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/static/css/bootstrap.min.css diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/error.html b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.html similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/error.html rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/error.html diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/home.html b/spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.html similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops-ui/src/main/resources/templates/home.html rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/main/resources/templates/home.html diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationPortTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/org/springframework/boot/sample/ops/ui/SampleActuatorUiApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/pom.xml b/spring-boot-samples/spring-boot-sample-actuator/pom.xml similarity index 98% rename from spring-boot-samples/spring-boot-sample-ops/pom.xml rename to spring-boot-samples/spring-boot-sample-actuator/pom.xml index f4bf006a62..2a56c77fb1 100644 --- a/spring-boot-samples/spring-boot-sample-ops/pom.xml +++ b/spring-boot-samples/spring-boot-sample-actuator/pom.xml @@ -7,7 +7,7 @@ spring-boot-samples 0.5.0.BUILD-SNAPSHOT - spring-boot-sample-ops + spring-boot-sample-actuator jar ${basedir}/../.. diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/HelloWorldService.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/SampleActuatorApplication.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleController.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/SampleController.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/SampleController.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/SampleController.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java rename to spring-boot-samples/spring-boot-sample-actuator/src/main/java/org/springframework/boot/sample/ops/ServiceProperties.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-actuator/src/main/resources/application.properties similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-actuator/src/main/resources/application.properties diff --git a/spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml b/spring-boot-samples/spring-boot-sample-actuator/src/main/resources/logback.xml similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/main/resources/logback.xml rename to spring-boot-samples/spring-boot-sample-actuator/src/main/resources/logback.xml diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/EndpointsPropertiesSampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ManagementAddressSampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ManagementSampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/NoManagementSampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/SampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/ShutdownSampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java rename to spring-boot-samples/spring-boot-sample-actuator/src/test/java/org/springframework/boot/sample/ops/UnsecureSampleActuatorApplicationTests.java diff --git a/spring-boot-samples/spring-boot-sample-ops/start.groovy b/spring-boot-samples/spring-boot-sample-actuator/start.groovy similarity index 100% rename from spring-boot-samples/spring-boot-sample-ops/start.groovy rename to spring-boot-samples/spring-boot-sample-actuator/start.groovy diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/main/foo.html b/spring-boot-samples/spring-boot-sample-jetty/src/main/foo.html new file mode 100644 index 0000000000..b499243e0e --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-jetty/src/main/foo.html @@ -0,0 +1,10 @@ + + + + +Insert title here + + + + + \ No newline at end of file diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index f1ffd7bf08..3d8e0cab87 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -19,7 +19,7 @@ spring-boot-starter-integration spring-boot-starter-jetty spring-boot-starter-logging - spring-boot-starter-ops + spring-boot-starter-actuator spring-boot-starter-parent spring-boot-starter-security spring-boot-starter-tomcat diff --git a/spring-boot-starters/spring-boot-starter-ops/pom.xml b/spring-boot-starters/spring-boot-starter-actuator/pom.xml similarity index 94% rename from spring-boot-starters/spring-boot-starter-ops/pom.xml rename to spring-boot-starters/spring-boot-starter-actuator/pom.xml index aa8273493b..6a605122af 100644 --- a/spring-boot-starters/spring-boot-starter-ops/pom.xml +++ b/spring-boot-starters/spring-boot-starter-actuator/pom.xml @@ -7,7 +7,7 @@ spring-boot-starters 0.5.0.BUILD-SNAPSHOT - spring-boot-starter-ops + spring-boot-starter-actuator jar ${basedir}/../.. diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index 2140b06a2c..69c43a8097 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -51,7 +51,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify org.springframework.boot - spring-boot-ops + spring-boot-actuator ${spring.boot.version} @@ -61,7 +61,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify org.springframework.boot - spring-boot-starter-ops + spring-boot-starter-actuator ${spring.boot.version} diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml index 168facc36f..9d48442267 100644 --- a/spring-boot-starters/src/main/parent/pom.xml +++ b/spring-boot-starters/src/main/parent/pom.xml @@ -51,7 +51,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify org.springframework.boot - spring-boot-ops + spring-boot-actuator ${spring.boot.version} @@ -61,7 +61,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify org.springframework.boot - spring-boot-starter-ops + spring-boot-starter-actuator ${spring.boot.version}