diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java index d3bdad5c37..e39f124098 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEvent.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit; +package org.springframework.bootstrap.actuate.audit; import java.util.Collections; import java.util.Date; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java similarity index 95% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java index ab66ce5e51..0671fc5f57 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/AuditEventRepository.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit; +package org.springframework.bootstrap.actuate.audit; import java.util.Date; import java.util.List; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java index 45eac780f0..40c8769959 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepository.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit; +package org.springframework.bootstrap.actuate.audit; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java similarity index 89% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java index 5993632cc5..7cb62a0ee3 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditApplicationEvent.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit.listener; +package org.springframework.bootstrap.actuate.audit.listener; -import org.springframework.bootstrap.service.audit.AuditEvent; +import org.springframework.bootstrap.actuate.audit.AuditEvent; import org.springframework.context.ApplicationEvent; /** diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java similarity index 91% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java index 52e9785dd0..4b82562adb 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/audit/listener/AuditListener.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit.listener; +package org.springframework.bootstrap.actuate.audit.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.service.audit.AuditEventRepository; +import org.springframework.bootstrap.actuate.audit.AuditEventRepository; import org.springframework.context.ApplicationListener; /** diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ActuatorAutoConfiguration.java similarity index 88% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ActuatorAutoConfiguration.java index 48f21de1ca..b2cd5a677f 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServiceAutoConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ActuatorAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import java.util.List; +import org.springframework.bootstrap.actuate.properties.EndpointsProperties; +import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; +import org.springframework.bootstrap.actuate.properties.ServerProperties; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties; -import org.springframework.bootstrap.service.properties.EndpointsProperties; -import org.springframework.bootstrap.service.properties.ManagementServerProperties; -import org.springframework.bootstrap.service.properties.ServerProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -42,7 +42,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; @Import({ ManagementConfiguration.class, MetricConfiguration.class, ServerConfiguration.class, SecurityConfiguration.class, MetricFilterConfiguration.class, AuditConfiguration.class }) -public class ServiceAutoConfiguration extends WebMvcConfigurationSupport { +public class ActuatorAutoConfiguration extends WebMvcConfigurationSupport { @Override protected void configureMessageConverters(List> converters) { diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java similarity index 84% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java index 9b3b5c012a..76e2715000 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/AuditConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditConfiguration.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.actuate.audit.AuditEventRepository; +import org.springframework.bootstrap.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.bootstrap.actuate.audit.listener.AuditListener; +import org.springframework.bootstrap.actuate.security.AuthenticationAuditListener; +import org.springframework.bootstrap.actuate.security.AuthorizationAuditListener; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.service.audit.AuditEventRepository; -import org.springframework.bootstrap.service.audit.InMemoryAuditEventRepository; -import org.springframework.bootstrap.service.audit.listener.AuditListener; -import org.springframework.bootstrap.service.security.AuthenticationAuditListener; -import org.springframework.bootstrap.service.security.AuthorizationAuditListener; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/HealthzConfiguration.java similarity index 86% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/HealthzConfiguration.java index c21d3c066a..4d40146def 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/HealthzConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/HealthzConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.actuate.health.HealthIndicator; +import org.springframework.bootstrap.actuate.health.HealthzEndpoint; +import org.springframework.bootstrap.actuate.health.VanillaHealthIndicator; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.health.HealthIndicator; -import org.springframework.bootstrap.service.health.HealthzEndpoint; -import org.springframework.bootstrap.service.health.VanillaHealthIndicator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/InfoConfiguration.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/InfoConfiguration.java index 015cc292f2..c8f50a7e69 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/InfoConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/InfoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import java.io.IOException; import java.util.LinkedHashMap; @@ -26,11 +26,11 @@ import javax.servlet.Servlet; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.bootstrap.actuate.info.InfoEndpoint; import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.info.InfoEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementConfiguration.java similarity index 94% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementConfiguration.java index 0f569124c8..cdb56fac61 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementConfiguration.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import org.springframework.beans.BeansException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; +import org.springframework.bootstrap.actuate.properties.ServerProperties; import org.springframework.bootstrap.context.annotation.ConditionalOnExpression; import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.bootstrap.service.properties.ManagementServerProperties; -import org.springframework.bootstrap.service.properties.ServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerConfiguration.java similarity index 95% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerConfiguration.java index 8b3c9c1067..9dae0abacf 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ManagementServerConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import java.util.Collections; @@ -23,14 +23,14 @@ import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.bootstrap.actuate.error.ErrorEndpoint; +import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; import org.springframework.bootstrap.context.annotation.ConditionalOnBean; import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; import org.springframework.bootstrap.context.embedded.ErrorPage; import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.bootstrap.service.error.ErrorEndpoint; -import org.springframework.bootstrap.service.properties.ManagementServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricConfiguration.java similarity index 78% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricConfiguration.java index 0a534234f4..9226c73fb8 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricConfiguration.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; +import org.springframework.bootstrap.actuate.metrics.CounterService; +import org.springframework.bootstrap.actuate.metrics.DefaultCounterService; +import org.springframework.bootstrap.actuate.metrics.DefaultGaugeService; +import org.springframework.bootstrap.actuate.metrics.GaugeService; +import org.springframework.bootstrap.actuate.metrics.InMemoryMetricRepository; +import org.springframework.bootstrap.actuate.metrics.MetricRepository; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.metrics.CounterService; -import org.springframework.bootstrap.service.metrics.DefaultCounterService; -import org.springframework.bootstrap.service.metrics.DefaultGaugeService; -import org.springframework.bootstrap.service.metrics.GaugeService; -import org.springframework.bootstrap.service.metrics.InMemoryMetricRepository; -import org.springframework.bootstrap.service.metrics.MetricRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterConfiguration.java similarity index 95% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterConfiguration.java index 9eb451e41a..9044790443 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/MetricFilterConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import java.io.IOException; @@ -28,11 +28,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.actuate.metrics.CounterService; +import org.springframework.bootstrap.actuate.metrics.GaugeService; import org.springframework.bootstrap.context.annotation.ConditionalOnBean; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.metrics.CounterService; -import org.springframework.bootstrap.service.metrics.GaugeService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.annotation.Order; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java index 806d606e50..51fe694ee6 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/SecurityConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.actuate.properties.SecurityProperties; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties; -import org.springframework.bootstrap.service.properties.SecurityProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationEventPublisher; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ServerConfiguration.java similarity index 94% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ServerConfiguration.java index 9c5399af5d..85c44faa04 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ServerConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ServerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import java.util.Collections; @@ -27,14 +27,14 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.bootstrap.actuate.error.ErrorEndpoint; +import org.springframework.bootstrap.actuate.properties.ServerProperties; +import org.springframework.bootstrap.actuate.properties.ServerProperties.Tomcat; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; import org.springframework.bootstrap.context.embedded.ErrorPage; import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.bootstrap.service.error.ErrorEndpoint; -import org.springframework.bootstrap.service.properties.ServerProperties; -import org.springframework.bootstrap.service.properties.ServerProperties.Tomcat; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ShutdownConfiguration.java similarity index 92% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ShutdownConfiguration.java index a288847bb5..aa46e8146f 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/ShutdownConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ShutdownConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import javax.servlet.Servlet; +import org.springframework.bootstrap.actuate.shutdown.ShutdownEndpoint; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.shutdown.ShutdownEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceConfiguration.java similarity index 88% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceConfiguration.java index 15e225859e..0cb62c15bc 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/TraceConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceConfiguration.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.actuate.security.SecurityFilterPostProcessor; +import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; +import org.springframework.bootstrap.actuate.trace.TraceEndpoint; +import org.springframework.bootstrap.actuate.trace.TraceRepository; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.security.SecurityFilterPostProcessor; -import org.springframework.bootstrap.service.trace.InMemoryTraceRepository; -import org.springframework.bootstrap.service.trace.TraceEndpoint; -import org.springframework.bootstrap.service.trace.TraceRepository; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/VarzConfiguration.java similarity index 84% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/VarzConfiguration.java index 0357fb2bc0..42136e6307 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/autoconfigure/service/VarzConfiguration.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/VarzConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.service; +package org.springframework.bootstrap.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.actuate.metrics.MetricRepository; +import org.springframework.bootstrap.actuate.varz.PublicMetrics; +import org.springframework.bootstrap.actuate.varz.VanillaPublicMetrics; +import org.springframework.bootstrap.actuate.varz.VarzEndpoint; import org.springframework.bootstrap.context.annotation.ConditionalOnClass; import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.service.metrics.MetricRepository; -import org.springframework.bootstrap.service.varz.PublicMetrics; -import org.springframework.bootstrap.service.varz.VanillaPublicMetrics; -import org.springframework.bootstrap.service.varz.VarzEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.DispatcherServlet; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/error/ErrorEndpoint.java similarity index 98% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/error/ErrorEndpoint.java index d57c8bcfc3..8e0723e065 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/error/ErrorEndpoint.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/error/ErrorEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.error; +package org.springframework.bootstrap.actuate.error; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java similarity index 93% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java index 9d5cf8e624..b9824de840 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthIndicator.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.health; +package org.springframework.bootstrap.actuate.health; /** * @author Dave Syer diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthzEndpoint.java similarity index 95% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthzEndpoint.java index 042927ab84..789e6cc02e 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/HealthzEndpoint.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthzEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.health; +package org.springframework.bootstrap.actuate.health; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java similarity index 93% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java index 999c87bc4c..969284baa7 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/health/VanillaHealthIndicator.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.health; +package org.springframework.bootstrap.actuate.health; /** * @author Dave Syer diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/info/InfoEndpoint.java similarity index 96% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/info/InfoEndpoint.java index 7e80af4a85..e4f445f844 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/info/InfoEndpoint.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/info/InfoEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.info; +package org.springframework.bootstrap.actuate.info; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java similarity index 93% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java index aed41336b3..528cdd50a0 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/CounterService.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; public interface CounterService { diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java similarity index 96% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java index 18062d95a4..adc1e20829 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultCounterService.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; import java.util.Date; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java similarity index 95% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java index afc57d4d4d..d5fbd13226 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/DefaultGaugeService.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; import java.util.Date; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java similarity index 92% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java index 9289fc8e58..d8959a91ee 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/GaugeService.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; public interface GaugeService { diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java index e8dd216cd4..3d22e49c68 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/InMemoryMetricRepository.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java index 3a857c75be..0af129a780 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Measurement.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; import java.util.Date; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java index 56b79c309d..48e7dd0106 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/Metric.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; /** * @author Dave Syer diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java similarity index 94% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java index d903582f8a..730e546c95 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/metrics/MetricRepository.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.metrics; +package org.springframework.bootstrap.actuate.metrics; import java.util.Collection; import java.util.Date; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/EndpointsProperties.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/EndpointsProperties.java index 3a4ef83bca..8e16a478b9 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/EndpointsProperties.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/EndpointsProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.properties; +package org.springframework.bootstrap.actuate.properties; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java similarity index 96% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java index c038abb88b..90c49a6d11 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ManagementServerProperties.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.properties; +package org.springframework.bootstrap.actuate.properties; import javax.validation.constraints.NotNull; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java similarity index 94% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java index d50328cac9..1b6df79547 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/SecurityProperties.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.properties; +package org.springframework.bootstrap.actuate.properties; import org.springframework.bootstrap.context.annotation.ConfigurationProperties; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ServerProperties.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ServerProperties.java index f7fb2434eb..9aebb68069 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/properties/ServerProperties.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.properties; +package org.springframework.bootstrap.actuate.properties; import java.io.File; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java similarity index 93% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java index e4b2ced3ee..36c0b618dd 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthenticationAuditListener.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.security; +package org.springframework.bootstrap.actuate.security; import java.util.HashMap; import java.util.Map; -import org.springframework.bootstrap.service.audit.AuditEvent; -import org.springframework.bootstrap.service.audit.listener.AuditApplicationEvent; +import org.springframework.bootstrap.actuate.audit.AuditEvent; +import org.springframework.bootstrap.actuate.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java similarity index 93% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java index 98a627b54b..9511e6385c 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/AuthorizationAuditListener.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.security; +package org.springframework.bootstrap.actuate.security; import java.util.HashMap; import java.util.Map; -import org.springframework.bootstrap.service.audit.AuditEvent; -import org.springframework.bootstrap.service.audit.listener.AuditApplicationEvent; +import org.springframework.bootstrap.actuate.audit.AuditEvent; +import org.springframework.bootstrap.actuate.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/SecurityFilterPostProcessor.java similarity index 97% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/SecurityFilterPostProcessor.java index d849581fd4..a899465ea8 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessor.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/SecurityFilterPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.security; +package org.springframework.bootstrap.actuate.security; import java.io.IOException; import java.util.Collections; @@ -35,8 +35,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.bootstrap.service.trace.InMemoryTraceRepository; -import org.springframework.bootstrap.service.trace.TraceRepository; +import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; +import org.springframework.bootstrap.actuate.trace.TraceRepository; import org.springframework.core.Ordered; import org.springframework.security.web.FilterChainProxy; import org.springframework.security.web.SecurityFilterChain; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/shutdown/ShutdownEndpoint.java similarity index 96% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/shutdown/ShutdownEndpoint.java index 89ba8ee812..ced49c23ac 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/shutdown/ShutdownEndpoint.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/shutdown/ShutdownEndpoint.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.shutdown; +package org.springframework.bootstrap.actuate.shutdown; import java.util.Collections; import java.util.Map; @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.service.properties.ManagementServerProperties; +import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java similarity index 96% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java index ccd72e653e..d18b8f4a05 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepository.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.trace; +package org.springframework.bootstrap.actuate.trace; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/Trace.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java similarity index 95% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/Trace.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java index 98ec693fa8..d4d4321434 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/Trace.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.trace; +package org.springframework.bootstrap.actuate.trace; import java.util.Date; import java.util.Map; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceEndpoint.java similarity index 96% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceEndpoint.java index 2e54d2594e..ae748bc926 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceEndpoint.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.trace; +package org.springframework.bootstrap.actuate.trace; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java similarity index 94% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java index 1a857f0723..0ffd959883 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/trace/TraceRepository.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.trace; +package org.springframework.bootstrap.actuate.trace; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/PublicMetrics.java similarity index 87% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/PublicMetrics.java index fec54daec4..08daa7f31d 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/PublicMetrics.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/PublicMetrics.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.varz; +package org.springframework.bootstrap.actuate.varz; import java.util.Collection; -import org.springframework.bootstrap.service.metrics.Metric; +import org.springframework.bootstrap.actuate.metrics.Metric; /** * @author Dave Syer diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/VanillaPublicMetrics.java similarity index 89% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/VanillaPublicMetrics.java index 8678a74cc6..1f7e76bb14 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VanillaPublicMetrics.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/VanillaPublicMetrics.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.varz; +package org.springframework.bootstrap.actuate.varz; import java.util.Collection; import java.util.LinkedHashSet; -import org.springframework.bootstrap.service.metrics.Metric; -import org.springframework.bootstrap.service.metrics.MetricRepository; +import org.springframework.bootstrap.actuate.metrics.Metric; +import org.springframework.bootstrap.actuate.metrics.MetricRepository; import org.springframework.util.Assert; /** diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/VarzEndpoint.java similarity index 92% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java rename to spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/VarzEndpoint.java index 12df2af23b..cc84e80da7 100644 --- a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/service/varz/VarzEndpoint.java +++ b/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/varz/VarzEndpoint.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.service.varz; +package org.springframework.bootstrap.actuate.varz; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.service.metrics.Metric; +import org.springframework.bootstrap.actuate.metrics.Metric; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories b/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories index f9f4885810..b0f50d552c 100644 --- a/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories +++ b/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.bootstrap.context.annotation.EnableAutoConfiguration=\ -org.springframework.bootstrap.autoconfigure.service.ServiceAutoConfiguration +org.springframework.bootstrap.actuate.autoconfigure.ActuatorAutoConfiguration org.springframework.context.ApplicationContextInitializer=\ org.springframework.bootstrap.logging.LoggingInitializer diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java similarity index 92% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java index 26465ea4a8..49f7761861 100644 --- a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/AuditEventTests.java +++ b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit; +package org.springframework.bootstrap.actuate.audit; import java.util.Collections; import org.junit.Test; +import org.springframework.bootstrap.actuate.audit.AuditEvent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 87% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java index 595f21328d..453ea7a9ee 100644 --- a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.audit; +package org.springframework.bootstrap.actuate.audit; import java.util.Date; import org.junit.Test; +import org.springframework.bootstrap.actuate.audit.AuditEvent; +import org.springframework.bootstrap.actuate.audit.InMemoryAuditEventRepository; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/EndpointsPropertiesTests.java similarity index 94% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/EndpointsPropertiesTests.java index 914c103be2..19ca4fd5df 100644 --- a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/properties/EndpointsPropertiesTests.java +++ b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/EndpointsPropertiesTests.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.properties; +package org.springframework.bootstrap.actuate.properties; import org.junit.Test; +import org.springframework.bootstrap.actuate.properties.EndpointsProperties; import org.springframework.validation.BindException; import org.springframework.validation.Errors; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/SecurityFilterPostProcessorTests.java similarity index 86% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/SecurityFilterPostProcessorTests.java index 71c90179c6..0acb692f7e 100644 --- a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/security/SecurityFilterPostProcessorTests.java +++ b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/SecurityFilterPostProcessorTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.security; +package org.springframework.bootstrap.actuate.security; import java.util.Map; import org.junit.Test; -import org.springframework.bootstrap.service.security.SecurityFilterPostProcessor; -import org.springframework.bootstrap.service.security.SecurityFilterPostProcessor.WebRequestLoggingFilter; -import org.springframework.bootstrap.service.trace.InMemoryTraceRepository; +import org.springframework.bootstrap.actuate.security.SecurityFilterPostProcessor; +import org.springframework.bootstrap.actuate.security.SecurityFilterPostProcessor.WebRequestLoggingFilter; +import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; import org.springframework.mock.web.MockHttpServletRequest; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 87% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java rename to spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java index 79c3ca8728..18b61473ef 100644 --- a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/service/trace/InMemoryTraceRepositoryTests.java +++ b/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.service.trace; +package org.springframework.bootstrap.actuate.trace; import java.util.Collections; import java.util.List; import org.junit.Test; +import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; +import org.springframework.bootstrap.actuate.trace.Trace; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java b/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java index 006b6a2e06..55edfe119c 100644 --- a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java +++ b/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java @@ -120,7 +120,7 @@ public class SampleIntegrationTests { } @Test - public void serviceSample() throws Exception { + public void actuatorSample() throws Exception { start("samples/service.groovy"); String result = FileUtil.readEntirely(new URL("http://localhost:8080") .openStream()); diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java index aabfcdc1a7..6bddff42b1 100644 --- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java +++ b/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/service/EndpointsPropertiesServiceBootstrapApplicationTests.java @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.service.properties.EndpointsProperties; +import org.springframework.bootstrap.actuate.properties.EndpointsProperties; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration;