[bs-85] Move round and rename some actuator packages

[#49047535]

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;

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;

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;

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;
 
 /**

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;
 
 /**

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<HttpMessageConverter<?>> converters) {

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;
 

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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

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;

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

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;

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 {
 

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;
 

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;
 

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 {
 

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;

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;
 

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

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;

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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

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;
 
 /**

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;

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

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;

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;
 

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;

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;

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;
 

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());

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;