Restructure autoconfigure packages

Restructure modules packages so that all auto-configuration is
organized under single top-level autoconfigure package.

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatAccessLogCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import java.util.Collection;
 import java.util.function.Function;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatReactiveManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import org.apache.catalina.startup.Tomcat;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatReactiveManagementContextAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import org.apache.catalina.startup.Tomcat;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatServletManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import org.apache.catalina.startup.Tomcat;
 

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatServletManagementContextAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Auto-configuration for Tomcat actuator metrics.
+ * Auto-configuration for Tomcat actuator web concerns.
  */
-package org.springframework.boot.tomcat.metrics.autoconfigure;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/metrics/TomcatMetricsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.metrics.autoconfigure;
+package org.springframework.boot.tomcat.autoconfigure.metrics;
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.tomcat.TomcatMetrics;

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/metrics/package-info.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Actuator Tomcat web server support.
+ * Auto-configuration for Tomcat metrics.
  */
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.metrics;

spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -1,2 +1,2 @@
-org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatReactiveManagementChildContextConfiguration
-org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementChildContextConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatReactiveManagementChildContextConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementChildContextConfiguration

spring-boot-project/spring-boot-tomcat/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
-org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatReactiveManagementContextAutoConfiguration
-org.springframework.boot.tomcat.actuate.autoconfigure.web.TomcatServletManagementContextAutoConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatReactiveManagementContextAutoConfiguration
+org.springframework.boot.tomcat.autoconfigure.actuate.web.TomcatServletManagementContextAutoConfiguration
+org.springframework.boot.tomcat.autoconfigure.metrics.TomcatMetricsAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.reactive.TomcatReactiveWebServerAutoConfiguration
 org.springframework.boot.tomcat.autoconfigure.servlet.TomcatServletWebServerAutoConfiguration
-org.springframework.boot.tomcat.metrics.autoconfigure.TomcatMetricsAutoConfiguration

spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/actuate/web/TomcatManagementServerPropertiesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.actuate.autoconfigure.web;
+package org.springframework.boot.tomcat.autoconfigure.actuate.web;
 
 import org.junit.jupiter.api.Test;
 

spring-boot-project/spring-boot-tomcat/src/test/java/org/springframework/boot/tomcat/autoconfigure/metrics/TomcatMetricsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.tomcat.metrics.autoconfigure;
+package org.springframework.boot.tomcat.autoconfigure.metrics;
 
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicInteger;