Rename spring-boot-developer-tools -> devtools

Fixes gh-3099

pom.xml

@@ -84,7 +84,7 @@
 				<module>spring-boot</module>
 				<module>spring-boot-autoconfigure</module>
 				<module>spring-boot-actuator</module>
-				<module>spring-boot-developer-tools</module>
+				<module>spring-boot-devtools</module>
 				<module>spring-boot-docs</module>
 				<module>spring-boot-starters</module>
 				<module>spring-boot-cli</module>

spring-boot-dependencies/pom.xml

@@ -186,7 +186,7 @@
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-developer-tools</artifactId>
+				<artifactId>spring-boot-devtools</artifactId>
 				<version>1.3.0.BUILD-SNAPSHOT</version>
 			</dependency>
 			<dependency>

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/package-info.java

-/*
- * Copyright 2012-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Auto-configuration for {@code spring-boot-developer-tools}.
- */
-package org.springframework.boot.developertools.autoconfigure;
-

spring-boot-developer-tools/pom.xml → spring-boot-devtools/pom.xml

@@ -8,7 +8,7 @@
 		<version>1.3.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
-	<artifactId>spring-boot-developer-tools</artifactId>
+	<artifactId>spring-boot-devtools</artifactId>
 	<name>Spring Boot Developer Tools</name>
 	<description>Spring Boot Developer Tools</description>
 	<url>http://projects.spring.io/spring-boot/</url>
@@ -74,17 +74,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>animal-sniffer-maven-plugin</artifactId>
-				<configuration>
-					<ignores>
-						<ignore>org.springframework.boot.developertools.tunnel.server.RemoteDebugPortProvider</ignore>
-					</ignores>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
 </project>

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteSpringApplication.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools;
+package org.springframework.boot.devtools;
 
 import org.springframework.boot.Banner;
 import org.springframework.boot.ResourceBanner;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.developertools.remote.client.RemoteClientConfiguration;
-import org.springframework.boot.developertools.restart.RestartInitializer;
-import org.springframework.boot.developertools.restart.Restarter;
+import org.springframework.boot.devtools.remote.client.RemoteClientConfiguration;
+import org.springframework.boot.devtools.restart.RestartInitializer;
+import org.springframework.boot.devtools.restart.Restarter;
 import org.springframework.core.io.ClassPathResource;
 
 /**

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractor.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools;
+package org.springframework.boot.devtools;
 
 import java.net.URI;
 import java.net.URISyntaxException;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/DeveloperToolsProperties.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -24,8 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
  * @author Phillip Webb
  * @since 1.3.0
  */
-@ConfigurationProperties(prefix = "spring.developertools")
-public class DeveloperToolsProperties {
+@ConfigurationProperties(prefix = "spring.devtools")
+public class DevToolsProperties {
 
 	private static final String DEFAULT_RESTART_EXCLUDES = "META-INF/resources/**,resource/**,static/**,public/**,templates/**";
 
@@ -33,7 +33,7 @@ public class DeveloperToolsProperties {
 
 	private Livereload livereload = new Livereload();
 
-	private RemoteDeveloperToolsProperties remote = new RemoteDeveloperToolsProperties();
+	private RemoteDevToolsProperties remote = new RemoteDevToolsProperties();
 
 	public Restart getRestart() {
 		return this.restart;
@@ -43,7 +43,7 @@ public class DeveloperToolsProperties {
 		return this.livereload;
 	}
 
-	public RemoteDeveloperToolsProperties getRemote() {
+	public RemoteDevToolsProperties getRemote() {
 		return this.remote;
 	}
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperPropertyDefaultsPostProcessor.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertyDefaultsPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -30,12 +30,12 @@ import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 
 /**
- * {@link BeanFactoryPostProcessor} to add properties that make sense when working
- * locally.
+ * {@link BeanFactoryPostProcessor} to add properties that make sense when working at
+ * development time.
  *
  * @author Phillip Webb
  */
-class LocalDeveloperPropertyDefaultsPostProcessor implements BeanFactoryPostProcessor,
+class DevToolsPropertyDefaultsPostProcessor implements BeanFactoryPostProcessor,
 		EnvironmentAware {
 
 	private static final Map<String, Object> PROPERTIES;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfiguration.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import java.net.URL;
 
@@ -23,14 +23,14 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.developertools.classpath.ClassPathChangedEvent;
-import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher;
-import org.springframework.boot.developertools.classpath.ClassPathRestartStrategy;
-import org.springframework.boot.developertools.classpath.PatternClassPathRestartStrategy;
-import org.springframework.boot.developertools.livereload.LiveReloadServer;
-import org.springframework.boot.developertools.restart.ConditionalOnInitializedRestarter;
-import org.springframework.boot.developertools.restart.RestartScope;
-import org.springframework.boot.developertools.restart.Restarter;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
+import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy;
+import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
+import org.springframework.boot.devtools.restart.ConditionalOnInitializedRestarter;
+import org.springframework.boot.devtools.restart.RestartScope;
+import org.springframework.boot.devtools.restart.Restarter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -44,25 +44,25 @@ import org.springframework.context.event.EventListener;
  */
 @Configuration
 @ConditionalOnInitializedRestarter
-@EnableConfigurationProperties(DeveloperToolsProperties.class)
-public class LocalDeveloperToolsAutoConfiguration {
+@EnableConfigurationProperties(DevToolsProperties.class)
+public class LocalDevToolsAutoConfiguration {
 
 	@Autowired
-	private DeveloperToolsProperties properties;
+	private DevToolsProperties properties;
 
 	@Bean
-	public static LocalDeveloperPropertyDefaultsPostProcessor localDeveloperPropertyDefaultsPostProcessor() {
-		return new LocalDeveloperPropertyDefaultsPostProcessor();
+	public static DevToolsPropertyDefaultsPostProcessor devToolsPropertyDefaultsPostProcessor() {
+		return new DevToolsPropertyDefaultsPostProcessor();
 	}
 
 	/**
 	 * Local LiveReload configuration.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.livereload", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
 	static class LiveReloadConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Autowired(required = false)
 		private LiveReloadServer liveReloadServer;
@@ -97,11 +97,11 @@ public class LocalDeveloperToolsAutoConfiguration {
 	/**
 	 * Local Restart Configuration.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.restart", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
 	static class RestartConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Bean
 		@ConditionalOnMissingBean

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import javax.annotation.PostConstruct;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.livereload.LiveReloadServer;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
 
 /**
  * Manages an optional {@link LiveReloadServer}. The {@link LiveReloadServer} may

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfiguration.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import java.util.Collection;
 
@@ -29,22 +29,22 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.developertools.remote.server.AccessManager;
-import org.springframework.boot.developertools.remote.server.Dispatcher;
-import org.springframework.boot.developertools.remote.server.DispatcherFilter;
-import org.springframework.boot.developertools.remote.server.Handler;
-import org.springframework.boot.developertools.remote.server.HandlerMapper;
-import org.springframework.boot.developertools.remote.server.HttpHeaderAccessManager;
-import org.springframework.boot.developertools.remote.server.HttpStatusHandler;
-import org.springframework.boot.developertools.remote.server.UrlHandlerMapper;
-import org.springframework.boot.developertools.restart.server.DefaultSourceFolderUrlFilter;
-import org.springframework.boot.developertools.restart.server.HttpRestartServer;
-import org.springframework.boot.developertools.restart.server.HttpRestartServerHandler;
-import org.springframework.boot.developertools.restart.server.SourceFolderUrlFilter;
-import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer;
-import org.springframework.boot.developertools.tunnel.server.HttpTunnelServerHandler;
-import org.springframework.boot.developertools.tunnel.server.RemoteDebugPortProvider;
-import org.springframework.boot.developertools.tunnel.server.SocketTargetServerConnection;
+import org.springframework.boot.devtools.remote.server.AccessManager;
+import org.springframework.boot.devtools.remote.server.Dispatcher;
+import org.springframework.boot.devtools.remote.server.DispatcherFilter;
+import org.springframework.boot.devtools.remote.server.Handler;
+import org.springframework.boot.devtools.remote.server.HandlerMapper;
+import org.springframework.boot.devtools.remote.server.HttpHeaderAccessManager;
+import org.springframework.boot.devtools.remote.server.HttpStatusHandler;
+import org.springframework.boot.devtools.remote.server.UrlHandlerMapper;
+import org.springframework.boot.devtools.restart.server.DefaultSourceFolderUrlFilter;
+import org.springframework.boot.devtools.restart.server.HttpRestartServer;
+import org.springframework.boot.devtools.restart.server.HttpRestartServerHandler;
+import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServerHandler;
+import org.springframework.boot.devtools.tunnel.server.RemoteDebugPortProvider;
+import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.server.ServerHttpRequest;
@@ -57,35 +57,35 @@ import org.springframework.http.server.ServerHttpRequest;
  * @since 1.3.0
  */
 @Configuration
-@ConditionalOnProperty(prefix = "spring.developertools.remote", name = "secret")
+@ConditionalOnProperty(prefix = "spring.devtools.remote", name = "secret")
 @ConditionalOnClass({ Filter.class, ServerHttpRequest.class })
-@EnableConfigurationProperties(DeveloperToolsProperties.class)
-public class RemoteDeveloperToolsAutoConfiguration {
+@EnableConfigurationProperties(DevToolsProperties.class)
+public class RemoteDevToolsAutoConfiguration {
 
 	private static final Log logger = LogFactory
-			.getLog(RemoteDeveloperToolsAutoConfiguration.class);
+			.getLog(RemoteDevToolsAutoConfiguration.class);
 
 	@Autowired
-	private DeveloperToolsProperties properties;
+	private DevToolsProperties properties;
 
 	@Bean
 	@ConditionalOnMissingBean
-	public AccessManager remoteDeveloperToolsAccessManager() {
-		RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote();
+	public AccessManager remoteDevToolsAccessManager() {
+		RemoteDevToolsProperties remoteProperties = this.properties.getRemote();
 		return new HttpHeaderAccessManager(remoteProperties.getSecretHeaderName(),
 				remoteProperties.getSecret());
 	}
 
 	@Bean
-	public HandlerMapper remoteDeveloperToolsHealthCheckHandlerMapper() {
+	public HandlerMapper remoteDevToolsHealthCheckHandlerMapper() {
 		Handler handler = new HttpStatusHandler();
 		return new UrlHandlerMapper(this.properties.getRemote().getContextPath(), handler);
 	}
 
 	@Bean
 	@ConditionalOnMissingBean
-	public DispatcherFilter remoteDeveloperToolsDispatcherFilter(
-			AccessManager accessManager, Collection<HandlerMapper> mappers) {
+	public DispatcherFilter remoteDevToolsDispatcherFilter(AccessManager accessManager,
+			Collection<HandlerMapper> mappers) {
 		Dispatcher dispatcher = new Dispatcher(accessManager, mappers);
 		return new DispatcherFilter(dispatcher);
 	}
@@ -93,11 +93,11 @@ public class RemoteDeveloperToolsAutoConfiguration {
 	/**
 	 * Configuration for remote update and restarts.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.remote.restart", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
 	static class RemoteRestartConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Bean
 		@ConditionalOnMissingBean
@@ -126,11 +126,11 @@ public class RemoteDeveloperToolsAutoConfiguration {
 	/**
 	 * Configuration for remote debug HTTP tunneling.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.remote.debug", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.remote.debug", name = "enabled", matchIfMissing = true)
 	static class RemoteDebugTunnelConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Bean
 		@ConditionalOnMissingBean(name = "remoteDebugHanderMapper")

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsProperties.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 /**
  * Configuration properties for remote Spring Boot applications.
@@ -22,9 +22,9 @@ package org.springframework.boot.developertools.autoconfigure;
  * @author Phillip Webb
  * @author Rob Winch
  * @since 1.3.0
- * @see DeveloperToolsProperties
+ * @see DevToolsProperties
  */
-public class RemoteDeveloperToolsProperties {
+public class RemoteDevToolsProperties {
 
 	public static final String DEFAULT_CONTEXT_PATH = "/.~~spring-boot!~";
 

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/package-info.java

+/*
+ * Copyright 2012-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Auto-configuration for {@code spring-boot-devtools}.
+ */
+package org.springframework.boot.devtools.autoconfigure;
+

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathChangedEvent.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathChangedEvent.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.util.Set;
 
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.util.Assert;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListener.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListener.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.util.Set;
 
-import org.springframework.boot.developertools.filewatch.ChangedFile;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
-import org.springframework.boot.developertools.filewatch.FileChangeListener;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.filewatch.FileChangeListener;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.util.Assert;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcher.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.net.URL;
 
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.developertools.filewatch.FileSystemWatcher;
+import org.springframework.boot.devtools.filewatch.FileSystemWatcher;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathRestartStrategy.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
-import org.springframework.boot.developertools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
 
 /**
  * Strategy interface used to determine when a changed classpath file should trigger a

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategy.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategy.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
-import org.springframework.boot.developertools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.StringUtils;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Support for classpath monitoring
  */
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFile.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFiles.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 import java.util.Collections;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileChangeListener.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileChangeListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.util.Set;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSnapshot.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSystemWatcher.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 import java.util.ArrayList;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FolderSnapshot.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 import java.util.Arrays;
@@ -26,7 +26,7 @@ import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.boot.developertools.filewatch.ChangedFile.Type;
+import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
 import org.springframework.util.Assert;
 
 /**

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Class to watch the local filesystem for changes.
  */
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Base64Encoder.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Base64Encoder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.nio.charset.Charset;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Connection.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionClosedException.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionClosedException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.IOException;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionInputStream.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.FilterInputStream;
 import java.io.IOException;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionOutputStream.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionOutputStream.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Frame.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.IOException;
 import java.io.OutputStream;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/LiveReloadServer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.IOException;
 import java.io.InputStream;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Support for the livereload protocol.
  */
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Spring Boot developer tools.
  */
-package org.springframework.boot.developertools;
+package org.springframework.boot.devtools;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploader.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -29,12 +29,12 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.classpath.ClassPathChangedEvent;
-import org.springframework.boot.developertools.filewatch.ChangedFile;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
 import org.springframework.context.ApplicationListener;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTrigger.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -22,7 +22,7 @@ import java.net.URISyntaxException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer;
+import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpRequest;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptor.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.IOException;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableCondition.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import javax.net.ServerSocketFactory;
 
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
 import org.springframework.boot.bind.RelaxedPropertyResolver;
-import org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsProperties;
+import org.springframework.boot.devtools.autoconfigure.RemoteDevToolsProperties;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
@@ -34,10 +34,10 @@ class LocalDebugPortAvailableCondition extends SpringBootCondition {
 	public ConditionOutcome getMatchOutcome(ConditionContext context,
 			AnnotatedTypeMetadata metadata) {
 		RelaxedPropertyResolver resolver = new RelaxedPropertyResolver(
-				context.getEnvironment(), "spring.developertools.remote.debug.");
+				context.getEnvironment(), "spring.devtools.remote.debug.");
 		Integer port = resolver.getProperty("local-port", Integer.class);
 		if (port == null) {
-			port = RemoteDeveloperToolsProperties.Debug.DEFAULT_LOCAL_PORT;
+			port = RemoteDevToolsProperties.Debug.DEFAULT_LOCAL_PORT;
 		}
 		if (isPortAvailable(port)) {
 			return ConditionOutcome.match("Local debug port availble");

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LoggingTunnelClientListener.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LoggingTunnelClientListener.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.nio.channels.SocketChannel;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.tunnel.client.TunnelClientListener;
+import org.springframework.boot.devtools.tunnel.client.TunnelClientListener;
 
 /**
  * {@link TunnelClientListener} to log open/close events.

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/RemoteClientConfiguration.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.net.URL;
 import java.util.Arrays;
@@ -33,20 +33,20 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.developertools.autoconfigure.DeveloperToolsProperties;
-import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer;
-import org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsProperties;
-import org.springframework.boot.developertools.classpath.ClassPathChangedEvent;
-import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher;
-import org.springframework.boot.developertools.classpath.ClassPathRestartStrategy;
-import org.springframework.boot.developertools.classpath.PatternClassPathRestartStrategy;
-import org.springframework.boot.developertools.livereload.LiveReloadServer;
-import org.springframework.boot.developertools.restart.DefaultRestartInitializer;
-import org.springframework.boot.developertools.restart.RestartScope;
-import org.springframework.boot.developertools.restart.Restarter;
-import org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection;
-import org.springframework.boot.developertools.tunnel.client.TunnelClient;
-import org.springframework.boot.developertools.tunnel.client.TunnelConnection;
+import org.springframework.boot.devtools.autoconfigure.DevToolsProperties;
+import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer;
+import org.springframework.boot.devtools.autoconfigure.RemoteDevToolsProperties;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
+import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy;
+import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
+import org.springframework.boot.devtools.restart.DefaultRestartInitializer;
+import org.springframework.boot.devtools.restart.RestartScope;
+import org.springframework.boot.devtools.restart.Restarter;
+import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection;
+import org.springframework.boot.devtools.tunnel.client.TunnelClient;
+import org.springframework.boot.devtools.tunnel.client.TunnelConnection;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
@@ -63,16 +63,16 @@ import org.springframework.util.Assert;
  *
  * @author Phillip Webb
  * @since 1.3.0
- * @see org.springframework.boot.developertools.RemoteSpringApplication
+ * @see org.springframework.boot.devtools.RemoteSpringApplication
  */
 @Configuration
-@EnableConfigurationProperties(DeveloperToolsProperties.class)
+@EnableConfigurationProperties(DevToolsProperties.class)
 public class RemoteClientConfiguration {
 
 	private static final Log logger = LogFactory.getLog(RemoteClientConfiguration.class);
 
 	@Autowired
-	private DeveloperToolsProperties properties;
+	private DevToolsProperties properties;
 
 	@Value("${remoteUrl}")
 	private String remoteUrl;
@@ -91,18 +91,18 @@ public class RemoteClientConfiguration {
 	}
 
 	private ClientHttpRequestInterceptor getSecurityInterceptor() {
-		RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote();
+		RemoteDevToolsProperties remoteProperties = this.properties.getRemote();
 		String secretHeaderName = remoteProperties.getSecretHeaderName();
 		String secret = remoteProperties.getSecret();
 		Assert.state(secret != null,
-				"The environment value 'spring.developertools.remote.secret' "
+				"The environment value 'spring.devtools.remote.secret' "
 						+ "is required to secure your connection.");
 		return new HttpHeaderInterceptor(secretHeaderName, secret);
 	}
 
 	@PostConstruct
 	private void logWarnings() {
-		RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote();
+		RemoteDevToolsProperties remoteProperties = this.properties.getRemote();
 		if (!remoteProperties.getDebug().isEnabled()
 				&& !remoteProperties.getRestart().isEnabled()) {
 			logger.warn("Remote restart and debug are both disabled.");
@@ -116,11 +116,11 @@ public class RemoteClientConfiguration {
 	/**
 	 * LiveReload configuration.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.livereload", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
 	static class LiveReloadConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Autowired(required = false)
 		private LiveReloadServer liveReloadServer;
@@ -162,11 +162,11 @@ public class RemoteClientConfiguration {
 	/**
 	 * Client configuration for remote update and restarts.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.remote.restart", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
 	static class RemoteRestartClientConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Value("${remoteUrl}")
 		private String remoteUrl;
@@ -200,13 +200,13 @@ public class RemoteClientConfiguration {
 	/**
 	 * Client configuration for remote debug HTTP tunneling.
 	 */
-	@ConditionalOnProperty(prefix = "spring.developertools.remote.debug", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.remote.debug", name = "enabled", matchIfMissing = true)
 	@ConditionalOnClass(Filter.class)
 	@Conditional(LocalDebugPortAvailableCondition.class)
 	static class RemoteDebugTunnelClientConfiguration {
 
 		@Autowired
-		private DeveloperToolsProperties properties;
+		private DevToolsProperties properties;
 
 		@Value("${remoteUrl}")
 		private String remoteUrl;
@@ -214,7 +214,7 @@ public class RemoteClientConfiguration {
 		@Bean
 		public TunnelClient remoteDebugTunnelClient(
 				ClientHttpRequestFactory requestFactory) {
-			RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote();
+			RemoteDevToolsProperties remoteProperties = this.properties.getRemote();
 			String url = this.remoteUrl + remoteProperties.getContextPath() + "/debug";
 			TunnelConnection connection = new HttpTunnelConnection(url, requestFactory);
 			int localPort = remoteProperties.getDebug().getLocalPort();

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Client support for a remotely running Spring Boot application.
  */
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/AccessManager.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import org.springframework.http.server.ServerHttpRequest;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Dispatcher.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import java.io.IOException;
 import java.util.ArrayList;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/DispatcherFilter.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import java.io.IOException;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Handler.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Handler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import java.io.IOException;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HandlerMapper.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HandlerMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import org.springframework.http.server.ServerHttpRequest;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManager.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.util.Assert;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpStatusHandler.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import java.io.IOException;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapper.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.util.Assert;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Server support for a remotely running Spring Boot application.
  */
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ChangeableUrls.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
 class ChangeableUrls implements Iterable<URL> {
 
 	private static final String[] SKIPPED_PROJECTS = { "spring-boot",
-			"spring-boot-developer-tools", "spring-boot-autoconfigure",
+			"spring-boot-devtools", "spring-boot-autoconfigure",
 			"spring-boot-actuator", "spring-boot-starter" };
 
 	private static final Pattern STARTER_PATTERN = Pattern

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ConditionalOnInitializedRestarter.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ConditionalOnInitializedRestarter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/DefaultRestartInitializer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 import java.net.URLClassLoader;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/MainMethod.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/MainMethod.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/OnInitializedRestarterCondition.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/OnInitializedRestarterCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.SpringBootCondition;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartApplicationListener.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartApplicationListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import org.springframework.boot.context.event.ApplicationFailedEvent;
 import org.springframework.boot.context.event.ApplicationReadyEvent;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartInitializer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartLauncher.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartLauncher.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.lang.reflect.Method;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScope.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScope.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScopeInitializer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.Scope;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/Restarter.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.beans.Introspector;
 import java.lang.Thread.UncaughtExceptionHandler;
@@ -43,8 +43,8 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.CachedIntrospectionResults;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
-import org.springframework.boot.developertools.restart.classloader.RestartClassLoader;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.RestartClassLoader;
 import org.springframework.boot.logging.DeferredLog;
 import org.springframework.cglib.core.ClassNameReader;
 import org.springframework.core.ResolvableType;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandler.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFile.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import java.io.Serializable;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileRepository.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 /**
  * A container for files that may be served from a {@link ClassLoader}. Can be used to

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileURLStreamHandler.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFiles.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import java.io.Serializable;
 import java.util.Collection;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoader.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -26,7 +26,7 @@ import java.util.Enumeration;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
 import org.springframework.core.SmartClassLoader;
 import org.springframework.util.Assert;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Classloaders used for reload support
  */
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Application restart support
  */
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilter.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.net.URL;
 import java.util.regex.Matcher;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandler.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandler.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.io.IOException;
 
-import org.springframework.boot.developertools.remote.server.Handler;
+import org.springframework.boot.devtools.remote.server.Handler;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.util.Assert;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/RestartServer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,11 +26,11 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.restart.Restarter;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles.SourceFolder;
+import org.springframework.boot.devtools.restart.Restarter;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles.SourceFolder;
 import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.ResourceUtils;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/SourceFolderUrlFilter.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/SourceFolderUrlFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.net.URL;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Remote restart server
  */
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnection.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -31,8 +31,8 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayload;
-import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayloadForwarder;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayloadForwarder;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpRequest;
@@ -47,7 +47,7 @@ import org.springframework.util.Assert;
  * @author Rob Winch
  * @since 1.3.0
  * @see TunnelClient
- * @see org.springframework.boot.developertools.tunnel.server.HttpTunnelServer
+ * @see org.springframework.boot.devtools.tunnel.server.HttpTunnelServer
  */
 public class HttpTunnelConnection implements TunnelConnection {
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClient.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.io.Closeable;
 import java.io.IOException;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListener.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.nio.channels.SocketChannel;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListeners.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.nio.channels.SocketChannel;
 import java.util.ArrayList;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelConnection.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.io.Closeable;
 import java.nio.channels.WritableByteChannel;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Client side TCP tunnel support.
  */
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/package-info.java

@@ -19,5 +19,5 @@
  * for the Java Debug Wire Protocol (JDWP) and as such only expects a single connection
  * and isn't particularly worried about resource usage.
  */
-package org.springframework.boot.developertools.tunnel;
+package org.springframework.boot.devtools.tunnel;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayload.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.payload;
+package org.springframework.boot.devtools.tunnel.payload;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarder.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.payload;
+package org.springframework.boot.devtools.tunnel.payload;
 
 import java.io.IOException;
 import java.nio.channels.WritableByteChannel;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Classes to deal with payloads sent over a HTTP tunnel.
  */
-package org.springframework.boot.developertools.tunnel.payload;
+package org.springframework.boot.devtools.tunnel.payload;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServer.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayload;
-import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayloadForwarder;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayloadForwarder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.server.ServerHttpAsyncRequestControl;
@@ -96,7 +96,7 @@ import org.springframework.util.Assert;
  *
  * @author Phillip Webb
  * @since 1.3.0
- * @see org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection
+ * @see org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection
  */
 public class HttpTunnelServer {
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandler.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandler.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import java.io.IOException;
 
-import org.springframework.boot.developertools.remote.server.Handler;
+import org.springframework.boot.devtools.remote.server.Handler;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.util.Assert;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/PortProvider.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/PortProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 /**
  * Strategy interface to provide access to a port (which may change if an existing

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/RemoteDebugPortProvider.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/RemoteDebugPortProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnection.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/StaticPortProvider.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/StaticPortProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import org.springframework.util.Assert;
 

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/TargetServerConnection.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/TargetServerConnection.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import java.io.IOException;
 import java.nio.channels.ByteChannel;

spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/package-info.java → spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/package-info.java

@@ -17,5 +17,5 @@
 /**
  * Server side TCP tunnel support.
  */
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 

spring-boot-developer-tools/src/main/resources/META-INF/spring.factories → spring-boot-devtools/src/main/resources/META-INF/spring.factories

 # Application Initializers
 org.springframework.context.ApplicationContextInitializer=\
-org.springframework.boot.developertools.restart.RestartScopeInitializer
+org.springframework.boot.devtools.restart.RestartScopeInitializer
 
 # Application Listeners
 org.springframework.context.ApplicationListener=\
-org.springframework.boot.developertools.restart.RestartApplicationListener
+org.springframework.boot.devtools.restart.RestartApplicationListener
 
 # Auto Configure
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.boot.developertools.autoconfigure.LocalDeveloperToolsAutoConfiguration,\
-org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsAutoConfiguration
+org.springframework.boot.devtools.autoconfigure.LocalDevToolsAutoConfiguration,\
+org.springframework.boot.devtools.autoconfigure.RemoteDevToolsAutoConfiguration

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractorTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools;
+package org.springframework.boot.devtools;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.developertools.RemoteUrlPropertyExtractor;
+import org.springframework.boot.devtools.RemoteUrlPropertyExtractor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfigurationTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -27,13 +27,13 @@ import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
-import org.springframework.boot.developertools.classpath.ClassPathChangedEvent;
-import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
-import org.springframework.boot.developertools.livereload.LiveReloadServer;
-import org.springframework.boot.developertools.restart.MockRestartInitializer;
-import org.springframework.boot.developertools.restart.MockRestarter;
-import org.springframework.boot.developertools.restart.Restarter;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
+import org.springframework.boot.devtools.restart.MockRestartInitializer;
+import org.springframework.boot.devtools.restart.MockRestarter;
+import org.springframework.boot.devtools.restart.Restarter;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,11 +51,11 @@ import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 
 /**
- * Tests for {@link LocalDeveloperToolsAutoConfiguration}.
+ * Tests for {@link LocalDevToolsAutoConfiguration}.
  *
  * @author Phillip Webb
  */
-public class LocalDeveloperToolsAutoConfigurationTests {
+public class LocalDevToolsAutoConfigurationTests {
 
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
@@ -123,7 +123,7 @@ public class LocalDeveloperToolsAutoConfigurationTests {
 	@Test
 	public void liveReloadDisabled() throws Exception {
 		Map<String, Object> properties = new HashMap<String, Object>();
-		properties.put("spring.developertools.livereload.enabled", false);
+		properties.put("spring.devtools.livereload.enabled", false);
 		this.context = initializeAndRun(Config.class, properties);
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean(OptionalLiveReloadServer.class);
@@ -158,7 +158,7 @@ public class LocalDeveloperToolsAutoConfigurationTests {
 	@Test
 	public void restartDisabled() throws Exception {
 		Map<String, Object> properties = new HashMap<String, Object>();
-		properties.put("spring.developertools.restart.enabled", false);
+		properties.put("spring.devtools.restart.enabled", false);
 		this.context = initializeAndRun(Config.class, properties);
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean(ClassPathFileSystemWatcher.class);
@@ -182,20 +182,20 @@ public class LocalDeveloperToolsAutoConfigurationTests {
 			Map<String, Object> specifiedProperties) {
 		Map<String, Object> properties = new HashMap<String, Object>();
 		properties.put("spring.thymeleaf.check-template-location", false);
-		properties.put("spring.developertools.livereload.port", this.liveReloadPort);
+		properties.put("spring.devtools.livereload.port", this.liveReloadPort);
 		properties.putAll(specifiedProperties);
 		return properties;
 	}
 
 	@Configuration
-	@Import({ LocalDeveloperToolsAutoConfiguration.class,
+	@Import({ LocalDevToolsAutoConfiguration.class,
 			ThymeleafAutoConfiguration.class })
 	public static class Config {
 
 	}
 
 	@Configuration
-	@Import({ LocalDeveloperToolsAutoConfiguration.class,
+	@Import({ LocalDevToolsAutoConfiguration.class,
 			ThymeleafAutoConfiguration.class })
 	public static class ConfigWithMockLiveReload {
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServerTests.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import org.junit.Test;
-import org.springframework.boot.developertools.livereload.LiveReloadServer;
+import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
 
 import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.mock;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfigurationTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.autoconfigure;
+package org.springframework.boot.devtools.autoconfigure;
 
 import java.io.IOException;
 
@@ -26,14 +26,14 @@ import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration;
-import org.springframework.boot.developertools.remote.server.DispatcherFilter;
-import org.springframework.boot.developertools.restart.MockRestarter;
-import org.springframework.boot.developertools.restart.server.HttpRestartServer;
-import org.springframework.boot.developertools.restart.server.SourceFolderUrlFilter;
-import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer;
-import org.springframework.boot.developertools.tunnel.server.RemoteDebugPortProvider;
-import org.springframework.boot.developertools.tunnel.server.SocketTargetServerConnection;
-import org.springframework.boot.developertools.tunnel.server.TargetServerConnection;
+import org.springframework.boot.devtools.remote.server.DispatcherFilter;
+import org.springframework.boot.devtools.restart.MockRestarter;
+import org.springframework.boot.devtools.restart.server.HttpRestartServer;
+import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer;
+import org.springframework.boot.devtools.tunnel.server.RemoteDebugPortProvider;
+import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection;
+import org.springframework.boot.devtools.tunnel.server.TargetServerConnection;
 import org.springframework.boot.test.EnvironmentTestUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -51,16 +51,16 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * Tests for {@link RemoteDeveloperToolsAutoConfiguration}.
+ * Tests for {@link RemoteDevToolsAutoConfiguration}.
  *
  * @author Rob Winch
  * @author Phillip Webb
  */
-public class RemoteDeveloperToolsAutoConfigurationTests {
+public class RemoteDevToolsAutoConfigurationTests {
 
-	private static final String DEFAULT_CONTEXT_PATH = RemoteDeveloperToolsProperties.DEFAULT_CONTEXT_PATH;
+	private static final String DEFAULT_CONTEXT_PATH = RemoteDevToolsProperties.DEFAULT_CONTEXT_PATH;
 
-	private static final String DEFAULT_SECRET_HEADER_NAME = RemoteDeveloperToolsProperties.DEFAULT_SECRET_HEADER_NAME;
+	private static final String DEFAULT_SECRET_HEADER_NAME = RemoteDevToolsProperties.DEFAULT_SECRET_HEADER_NAME;
 
 	@Rule
 	public MockRestarter mockRestarter = new MockRestarter();
@@ -99,7 +99,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void ignoresUnmappedUrl() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret");
+		loadContext("spring.devtools.remote.secret:supersecret");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI("/restart");
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret");
@@ -109,7 +109,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void ignoresIfMissingSecretFromRequest() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret");
+		loadContext("spring.devtools.remote.secret:supersecret");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/restart");
 		filter.doFilter(this.request, this.response, this.chain);
@@ -118,7 +118,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void ignoresInvalidSecretInRequest() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret");
+		loadContext("spring.devtools.remote.secret:supersecret");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/restart");
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "invalid");
@@ -128,7 +128,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void invokeRestartWithDefaultSetup() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret");
+		loadContext("spring.devtools.remote.secret:supersecret");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/restart");
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret");
@@ -138,15 +138,15 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void disableRestart() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret",
-				"spring.developertools.remote.restart.enabled:false");
+		loadContext("spring.devtools.remote.secret:supersecret",
+				"spring.devtools.remote.restart.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean("remoteRestartHanderMapper");
 	}
 
 	@Test
 	public void invokeTunnelWithDefaultSetup() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret");
+		loadContext("spring.devtools.remote.secret:supersecret");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/debug");
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret");
@@ -156,8 +156,8 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void invokeTunnelWithCustomHeaderName() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret",
-				"spring.developertools.remote.secretHeaderName:customheader");
+		loadContext("spring.devtools.remote.secret:supersecret",
+				"spring.devtools.remote.secretHeaderName:customheader");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/debug");
 		this.request.addHeader("customheader", "supersecret");
@@ -167,15 +167,15 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 
 	@Test
 	public void disableRemoteDebug() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret",
-				"spring.developertools.remote.debug.enabled:false");
+		loadContext("spring.devtools.remote.secret:supersecret",
+				"spring.devtools.remote.debug.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean("remoteDebugHanderMapper");
 	}
 
 	@Test
-	public void developerToolsHealthReturns200() throws Exception {
-		loadContext("spring.developertools.remote.secret:supersecret");
+	public void devToolsHealthReturns200() throws Exception {
+		loadContext("spring.devtools.remote.secret:supersecret");
 		DispatcherFilter filter = this.context.getBean(DispatcherFilter.class);
 		this.request.setRequestURI(DEFAULT_CONTEXT_PATH);
 		this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret");
@@ -204,7 +204,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests {
 	}
 
 	@Configuration
-	@Import(RemoteDeveloperToolsAutoConfiguration.class)
+	@Import(RemoteDevToolsAutoConfiguration.class)
 	static class Config {
 
 		@Bean

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathChangedEventTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -22,7 +22,8 @@ import java.util.Set;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.sameInstance;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListenerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.io.File;
 import java.util.Collections;
@@ -28,8 +28,11 @@ import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.developertools.filewatch.ChangedFile;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.classpath.ClassPathFileChangeListener;
+import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcherTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.io.File;
 import java.net.URL;
@@ -28,8 +28,11 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.developertools.filewatch.ChangedFile;
-import org.springframework.boot.developertools.filewatch.FileSystemWatcher;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
+import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.FileSystemWatcher;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategyTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategyTests.java

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.classpath;
+package org.springframework.boot.devtools.classpath;
 
 import java.io.File;
 
 import org.junit.Test;
-import org.springframework.boot.developertools.filewatch.ChangedFile;
-import org.springframework.boot.developertools.filewatch.ChangedFile.Type;
+import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy;
+import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/ChangedFileTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/ChangedFileTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 
@@ -22,7 +22,8 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.developertools.filewatch.ChangedFile.Type;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSnapshotTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSnapshotTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,6 +25,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
+import org.springframework.boot.devtools.filewatch.FileSnapshot;
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.Matchers.equalTo;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSystemWatcherTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -32,7 +32,11 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.developertools.filewatch.ChangedFile.Type;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.filewatch.FileChangeListener;
+import org.springframework.boot.devtools.filewatch.FileSystemWatcher;
+import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.Matchers.contains;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FolderSnapshotTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FolderSnapshotTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.filewatch;
+package org.springframework.boot.devtools.filewatch;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,7 +24,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.developertools.filewatch.ChangedFile.Type;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.filewatch.FolderSnapshot;
+import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.Matchers.equalTo;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/integrationtest/HttpTunnelIntegrationTest.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.integrationtest;
+package org.springframework.boot.devtools.integrationtest;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -24,20 +24,20 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
-import org.springframework.boot.developertools.remote.server.AccessManager;
-import org.springframework.boot.developertools.remote.server.Dispatcher;
-import org.springframework.boot.developertools.remote.server.DispatcherFilter;
-import org.springframework.boot.developertools.remote.server.HandlerMapper;
-import org.springframework.boot.developertools.remote.server.UrlHandlerMapper;
-import org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection;
-import org.springframework.boot.developertools.tunnel.client.TunnelClient;
-import org.springframework.boot.developertools.tunnel.client.TunnelConnection;
-import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer;
-import org.springframework.boot.developertools.tunnel.server.HttpTunnelServerHandler;
-import org.springframework.boot.developertools.tunnel.server.PortProvider;
-import org.springframework.boot.developertools.tunnel.server.SocketTargetServerConnection;
-import org.springframework.boot.developertools.tunnel.server.StaticPortProvider;
-import org.springframework.boot.developertools.tunnel.server.TargetServerConnection;
+import org.springframework.boot.devtools.remote.server.AccessManager;
+import org.springframework.boot.devtools.remote.server.Dispatcher;
+import org.springframework.boot.devtools.remote.server.DispatcherFilter;
+import org.springframework.boot.devtools.remote.server.HandlerMapper;
+import org.springframework.boot.devtools.remote.server.UrlHandlerMapper;
+import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection;
+import org.springframework.boot.devtools.tunnel.client.TunnelClient;
+import org.springframework.boot.devtools.tunnel.client.TunnelConnection;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServerHandler;
+import org.springframework.boot.devtools.tunnel.server.PortProvider;
+import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection;
+import org.springframework.boot.devtools.tunnel.server.StaticPortProvider;
+import org.springframework.boot.devtools.tunnel.server.TargetServerConnection;
 import org.springframework.boot.test.SpringApplicationConfiguration;
 import org.springframework.boot.test.TestRestTemplate;
 import org.springframework.boot.test.WebIntegrationTest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/Base64EncoderTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/Base64EncoderTests.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import org.junit.Test;
+import org.springframework.boot.devtools.livereload.Base64Encoder;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionInputStreamTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionInputStreamTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
@@ -24,6 +24,7 @@ import java.io.InputStream;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.livereload.ConnectionInputStream;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionOutputStreamTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionOutputStreamTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 
 import org.junit.Test;
+import org.springframework.boot.devtools.livereload.ConnectionOutputStream;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/FrameTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/FrameTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -23,6 +23,8 @@ import java.util.Arrays;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.livereload.ConnectionInputStream;
+import org.springframework.boot.devtools.livereload.Frame;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/LiveReloadServerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.livereload;
+package org.springframework.boot.devtools.livereload;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,6 +36,9 @@ import org.eclipse.jetty.websocket.common.events.JettyListenerEventDriver;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.devtools.livereload.Connection;
+import org.springframework.boot.devtools.livereload.ConnectionClosedException;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
 import org.springframework.util.SocketUtils;
 import org.springframework.web.client.RestTemplate;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploaderTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -30,15 +30,16 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.developertools.classpath.ClassPathChangedEvent;
-import org.springframework.boot.developertools.filewatch.ChangedFile;
-import org.springframework.boot.developertools.filewatch.ChangedFile.Type;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles.SourceFolder;
-import org.springframework.boot.developertools.test.MockClientHttpRequestFactory;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.filewatch.ChangedFile;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.filewatch.ChangedFile.Type;
+import org.springframework.boot.devtools.remote.client.ClassPathChangeUploader;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles.SourceFolder;
+import org.springframework.boot.devtools.test.MockClientHttpRequestFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.mock.http.client.MockClientHttpRequest;
 import org.springframework.util.FileCopyUtils;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTriggerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTriggerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -25,7 +25,8 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer;
+import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer;
+import org.springframework.boot.devtools.remote.client.DelayedLiveReloadTrigger;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.ClientHttpRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptorTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptorTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.IOException;
 
@@ -25,6 +25,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.boot.devtools.remote.client.HttpHeaderInterceptor;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpResponse;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableConditionTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.net.ServerSocket;
 
@@ -63,7 +63,7 @@ public class LocalDebugPortAvailableConditionTests {
 	private ConditionOutcome getOutcome() {
 		MockEnvironment environment = new MockEnvironment();
 		EnvironmentTestUtils.addEnvironment(environment,
-				"spring.developertools.remote.debug.local-port:" + this.port);
+				"spring.devtools.remote.debug.local-port:" + this.port);
 		ConditionContext context = mock(ConditionContext.class);
 		given(context.getEnvironment()).willReturn(environment);
 		ConditionOutcome outcome = this.condition.getMatchOutcome(context, null);

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/RemoteClientConfigurationTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.client;
+package org.springframework.boot.devtools.remote.client;
 
 import java.io.IOException;
 import java.util.HashSet;
@@ -29,17 +29,17 @@ import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
-import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer;
-import org.springframework.boot.developertools.classpath.ClassPathChangedEvent;
-import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher;
-import org.springframework.boot.developertools.filewatch.ChangedFiles;
-import org.springframework.boot.developertools.livereload.LiveReloadServer;
-import org.springframework.boot.developertools.remote.client.RemoteClientConfiguration.LiveReloadConfiguration;
-import org.springframework.boot.developertools.remote.server.Dispatcher;
-import org.springframework.boot.developertools.remote.server.DispatcherFilter;
-import org.springframework.boot.developertools.restart.MockRestarter;
-import org.springframework.boot.developertools.restart.RestartScopeInitializer;
-import org.springframework.boot.developertools.tunnel.client.TunnelClient;
+import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer;
+import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
+import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher;
+import org.springframework.boot.devtools.filewatch.ChangedFiles;
+import org.springframework.boot.devtools.livereload.LiveReloadServer;
+import org.springframework.boot.devtools.remote.client.RemoteClientConfiguration.LiveReloadConfiguration;
+import org.springframework.boot.devtools.remote.server.Dispatcher;
+import org.springframework.boot.devtools.remote.server.DispatcherFilter;
+import org.springframework.boot.devtools.restart.MockRestarter;
+import org.springframework.boot.devtools.restart.RestartScopeInitializer;
+import org.springframework.boot.devtools.tunnel.client.TunnelClient;
 import org.springframework.boot.test.EnvironmentTestUtils;
 import org.springframework.boot.test.OutputCapture;
 import org.springframework.context.annotation.Bean;
@@ -85,8 +85,8 @@ public class RemoteClientConfigurationTests {
 
 	@Test
 	public void warnIfDebugAndRestartDisabled() throws Exception {
-		configure("spring.developertools.remote.debug.enabled:false",
-				"spring.developertools.remote.restart.enabled:false");
+		configure("spring.devtools.remote.debug.enabled:false",
+				"spring.devtools.remote.restart.enabled:false");
 		assertThat(this.output.toString(),
 				containsString("Remote restart and debug are both disabled"));
 	}
@@ -126,21 +126,21 @@ public class RemoteClientConfigurationTests {
 
 	@Test
 	public void liveReloadDisabled() throws Exception {
-		configure("spring.developertools.livereload.enabled:false");
+		configure("spring.devtools.livereload.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean(OptionalLiveReloadServer.class);
 	}
 
 	@Test
 	public void remoteRestartDisabled() throws Exception {
-		configure("spring.developertools.remote.restart.enabled:false");
+		configure("spring.devtools.remote.restart.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean(ClassPathFileSystemWatcher.class);
 	}
 
 	@Test
 	public void remoteDebugDisabled() throws Exception {
-		configure("spring.developertools.remote.debug.enabled:false");
+		configure("spring.devtools.remote.debug.enabled:false");
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
 		this.context.getBean(TunnelClient.class);
 	}
@@ -159,7 +159,7 @@ public class RemoteClientConfigurationTests {
 		EnvironmentTestUtils.addEnvironment(this.context, pairs);
 		if (setSecret) {
 			EnvironmentTestUtils.addEnvironment(this.context,
-					"spring.developertools.remote.secret:secret");
+					"spring.devtools.remote.secret:secret");
 		}
 		this.context.refresh();
 	}

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherFilterTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherFilterTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletRequest;
@@ -30,6 +30,8 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.springframework.boot.devtools.remote.server.Dispatcher;
+import org.springframework.boot.devtools.remote.server.DispatcherFilter;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -27,6 +27,10 @@ import org.junit.rules.ExpectedException;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.springframework.boot.devtools.remote.server.AccessManager;
+import org.springframework.boot.devtools.remote.server.Dispatcher;
+import org.springframework.boot.devtools.remote.server.Handler;
+import org.springframework.boot.devtools.remote.server.HandlerMapper;
 import org.springframework.core.Ordered;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManagerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManagerTests.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.remote.server.HttpHeaderAccessManager;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.mock.web.MockHttpServletRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpStatusHandlerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpStatusHandlerTests.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.remote.server.HttpStatusHandler;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapperTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapperTests.java

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.remote.server;
+package org.springframework.boot.devtools.remote.server;
 
 import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.remote.server.Handler;
+import org.springframework.boot.devtools.remote.server.UrlHandlerMapper;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.mock.web.MockHttpServletRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/ChangeableUrlsTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,6 +23,7 @@ import java.net.URL;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.springframework.boot.devtools.restart.ChangeableUrls;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/DefaultRestartInitializerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/DefaultRestartInitializerTests.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 
 import org.junit.Test;
+import org.springframework.boot.devtools.restart.DefaultRestartInitializer;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MainMethodTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.lang.reflect.Method;
 
@@ -22,6 +22,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.restart.MainMethod;
 import org.springframework.util.ReflectionUtils;
 
 import static org.hamcrest.Matchers.equalTo;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestartInitializer.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestartInitializer.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 
-import org.springframework.boot.developertools.restart.RestartInitializer;
+import org.springframework.boot.devtools.restart.RestartInitializer;
 
 /**
  * Simple mock {@link RestartInitializer} that returns an empty array of URLs.

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestarter.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -27,6 +27,7 @@ import org.junit.runners.model.Statement;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.boot.devtools.restart.Restarter;
 
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Matchers.any;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/OnInitializedRestarterConditionTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java

@@ -14,13 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.devtools.restart.ConditionalOnInitializedRestarter;
+import org.springframework.boot.devtools.restart.OnInitializedRestarterCondition;
+import org.springframework.boot.devtools.restart.RestartInitializer;
+import org.springframework.boot.devtools.restart.Restarter;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartApplicationListenerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import org.junit.After;
 import org.junit.Before;
@@ -23,6 +23,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.context.event.ApplicationFailedEvent;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.event.ApplicationStartedEvent;
+import org.springframework.boot.devtools.restart.RestartApplicationListener;
+import org.springframework.boot.devtools.restart.Restarter;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.Ordered;
 import org.springframework.test.util.ReflectionTestUtils;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartScopeInitializerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.devtools.restart.RestartScope;
+import org.springframework.boot.devtools.restart.RestartScopeInitializer;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestarterTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -29,9 +29,11 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.RestartInitializer;
+import org.springframework.boot.devtools.restart.Restarter;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
 import org.springframework.boot.test.OutputCapture;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandlerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart;
+package org.springframework.boot.devtools.restart;
 
 import org.junit.Test;
+import org.springframework.boot.devtools.restart.SilentExitExceptionHandler;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFilesTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFilesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,8 +27,10 @@ import java.util.Iterator;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles.SourceFolder;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles.SourceFolder;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.notNullValue;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoaderTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -34,7 +34,10 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.RestartClassLoader;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StreamUtils;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/Sample.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/Sample.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 /**
  * A sample class used to test reloading.

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/SampleParent.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/SampleParent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.classloader;
+package org.springframework.boot.devtools.restart.classloader;
 
 /**
  * A sample class used to test reloading.

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilterTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -23,6 +23,7 @@ import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
+import org.springframework.boot.devtools.restart.server.DefaultSourceFolderUrlFilter;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandlerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandlerTests.java

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.restart.server.HttpRestartServer;
+import org.springframework.boot.devtools.restart.server.HttpRestartServerHandler;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -28,9 +28,12 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.server.HttpRestartServer;
+import org.springframework.boot.devtools.restart.server.RestartServer;
+import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter;
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.http.server.ServletServerHttpResponse;
 import org.springframework.mock.web.MockHttpServletRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/RestartServerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.restart.server;
+package org.springframework.boot.devtools.restart.server;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -28,9 +28,12 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind;
-import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles;
+import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind;
+import org.springframework.boot.devtools.restart.server.DefaultSourceFolderUrlFilter;
+import org.springframework.boot.devtools.restart.server.RestartServer;
+import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter;
 import org.springframework.util.FileCopyUtils;
 
 import static org.hamcrest.Matchers.equalTo;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/test/MockClientHttpRequestFactory.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.test;
+package org.springframework.boot.devtools.test;
 
 import java.io.IOException;
 import java.net.URI;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnectionTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnectionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -30,8 +30,9 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.springframework.boot.developertools.test.MockClientHttpRequestFactory;
-import org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection.TunnelChannel;
+import org.springframework.boot.devtools.test.MockClientHttpRequestFactory;
+import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection;
+import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection.TunnelChannel;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.SocketUtils;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/TunnelClientTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.client;
+package org.springframework.boot.devtools.tunnel.client;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -28,6 +28,9 @@ import java.nio.channels.WritableByteChannel;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.tunnel.client.TunnelClient;
+import org.springframework.boot.devtools.tunnel.client.TunnelClientListener;
+import org.springframework.boot.devtools.tunnel.client.TunnelConnection;
 import org.springframework.util.SocketUtils;
 
 import static org.hamcrest.Matchers.equalTo;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarderTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.payload;
+package org.springframework.boot.devtools.tunnel.payload;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
@@ -24,6 +24,8 @@ import java.nio.channels.WritableByteChannel;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayloadForwarder;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.payload;
+package org.springframework.boot.devtools.tunnel.payload;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -28,6 +28,7 @@ import java.nio.channels.WritableByteChannel;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload;
 import org.springframework.http.HttpInputMessage;
 import org.springframework.http.HttpOutputMessage;
 import org.springframework.http.server.ServletServerHttpRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandlerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandlerTests.java

@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServerHandler;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -35,8 +35,10 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayload;
-import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer.HttpConnection;
+import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer;
+import org.springframework.boot.devtools.tunnel.server.TargetServerConnection;
+import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer.HttpConnection;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.server.ServerHttpAsyncRequestControl;
 import org.springframework.http.server.ServerHttpRequest;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnectionTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -26,6 +26,8 @@ import java.nio.channels.SocketChannel;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection;
+import org.springframework.boot.devtools.tunnel.server.StaticPortProvider;
 import org.springframework.util.SocketUtils;
 
 import static org.hamcrest.Matchers.equalTo;

spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/StaticPortProviderTests.java → spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/StaticPortProviderTests.java

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.developertools.tunnel.server;
+package org.springframework.boot.devtools.tunnel.server;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.springframework.boot.devtools.tunnel.server.StaticPortProvider;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-boot-full-build/pom.xml

@@ -51,7 +51,7 @@
 		<module>../spring-boot</module>
 		<module>../spring-boot-autoconfigure</module>
 		<module>../spring-boot-actuator</module>
-		<module>../spring-boot-developer-tools</module>
+		<module>../spring-boot-devtools</module>
 		<module>../spring-boot-starters</module>
 		<module>../spring-boot-cli</module>
 		<module>../spring-boot-samples</module>

spring-boot-samples/pom.xml

@@ -38,7 +38,7 @@
 		<module>spring-boot-sample-data-redis</module>
 		<module>spring-boot-sample-data-rest</module>
 		<module>spring-boot-sample-data-solr</module>
-		<module>spring-boot-sample-developer-tools</module>
+		<module>spring-boot-sample-devtools</module>
 		<module>spring-boot-sample-flyway</module>
 		<module>spring-boot-sample-hateoas</module>
 		<module>spring-boot-sample-hornetq</module>

spring-boot-samples/spring-boot-sample-developer-tools/pom.xml → spring-boot-samples/spring-boot-sample-devtools/pom.xml

@@ -8,7 +8,7 @@
 		<artifactId>spring-boot-samples</artifactId>
 		<version>1.3.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-boot-sample-developer-tools</artifactId>
+	<artifactId>spring-boot-sample-devtools</artifactId>
 	<name>Spring Boot Developer Tools Sample</name>
 	<description>Spring Boot Developer Tools Sample</description>
 	<url>http://projects.spring.io/spring-boot/</url>
@@ -30,7 +30,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-developer-tools</artifactId>
+			<artifactId>spring-boot-devtools</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/SampleDeveloperToolsApplication.java → spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java

@@ -21,10 +21,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration.WebMvcAutoConfigurationAdapter;
 
 @SpringBootApplication
-public class SampleDeveloperToolsApplication extends WebMvcAutoConfigurationAdapter {
+public class SampleDevToolsApplication extends WebMvcAutoConfigurationAdapter {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SampleDeveloperToolsApplication.class, args);
+		SpringApplication.run(SampleDevToolsApplication.class, args);
 	}
 
 }