Rename spring-boot-developer-tools -> devtools
Fixes gh-3099
This commit is contained in:
parent
683c19ee8b
commit
983484f429
2
pom.xml
2
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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -1,21 +0,0 @@
|
|||
/*
|
||||
* 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;
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
# Application Initializers
|
||||
org.springframework.context.ApplicationContextInitializer=\
|
||||
org.springframework.boot.developertools.restart.RestartScopeInitializer
|
||||
|
||||
# Application Listeners
|
||||
org.springframework.context.ApplicationListener=\
|
||||
org.springframework.boot.developertools.restart.RestartApplicationListener
|
||||
|
||||
# Auto Configure
|
||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
||||
org.springframework.boot.developertools.autoconfigure.LocalDeveloperToolsAutoConfiguration,\
|
||||
org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsAutoConfiguration
|
|
@ -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>
|
|
@ -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;
|
||||
|
||||
/**
|
|
@ -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;
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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;
|
|
@ -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
|
|
@ -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
|
|
@ -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")
|
|
@ -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!~";
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* 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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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
|
|
@ -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;
|
||||
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Support for classpath monitoring
|
||||
*/
|
||||
package org.springframework.boot.developertools.classpath;
|
||||
package org.springframework.boot.devtools.classpath;
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.developertools.filewatch;
|
||||
package org.springframework.boot.devtools.filewatch;
|
||||
|
||||
import java.io.File;
|
||||
|
|
@ -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;
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.developertools.filewatch;
|
||||
package org.springframework.boot.devtools.filewatch;
|
||||
|
||||
import java.util.Set;
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.developertools.filewatch;
|
||||
package org.springframework.boot.devtools.filewatch;
|
||||
|
||||
import java.io.File;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
||||
/**
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Class to watch the local filesystem for changes.
|
||||
*/
|
||||
package org.springframework.boot.developertools.filewatch;
|
||||
package org.springframework.boot.devtools.filewatch;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.developertools.livereload;
|
||||
package org.springframework.boot.devtools.livereload;
|
||||
|
||||
import java.io.IOException;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Support for the livereload protocol.
|
||||
*/
|
||||
package org.springframework.boot.developertools.livereload;
|
||||
package org.springframework.boot.devtools.livereload;
|
||||
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Spring Boot developer tools.
|
||||
*/
|
||||
package org.springframework.boot.developertools;
|
||||
package org.springframework.boot.devtools;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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");
|
|
@ -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.
|
|
@ -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();
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -14,7 +14,7 @@
|
|||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.boot.developertools.restart;
|
||||
package org.springframework.boot.devtools.restart;
|
||||
|
||||
import java.net.URL;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Classloaders used for reload support
|
||||
*/
|
||||
package org.springframework.boot.developertools.restart.classloader;
|
||||
package org.springframework.boot.devtools.restart.classloader;
|
||||
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Application restart support
|
||||
*/
|
||||
package org.springframework.boot.developertools.restart;
|
||||
package org.springframework.boot.devtools.restart;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Remote restart server
|
||||
*/
|
||||
package org.springframework.boot.developertools.restart.server;
|
||||
package org.springframework.boot.devtools.restart.server;
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Client side TCP tunnel support.
|
||||
*/
|
||||
package org.springframework.boot.developertools.tunnel.client;
|
||||
package org.springframework.boot.devtools.tunnel.client;
|
||||
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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 {
|
||||
|
|
@ -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;
|
|
@ -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
|
|
@ -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;
|
|
@ -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;
|
|
@ -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;
|
||||
|
|
@ -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;
|
|
@ -17,5 +17,5 @@
|
|||
/**
|
||||
* Server side TCP tunnel support.
|
||||
*/
|
||||
package org.springframework.boot.developertools.tunnel.server;
|
||||
package org.springframework.boot.devtools.tunnel.server;
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
# Application Initializers
|
||||
org.springframework.context.ApplicationContextInitializer=\
|
||||
org.springframework.boot.devtools.restart.RestartScopeInitializer
|
||||
|
||||
# Application Listeners
|
||||
org.springframework.context.ApplicationListener=\
|
||||
org.springframework.boot.devtools.restart.RestartApplicationListener
|
||||
|
||||
# Auto Configure
|
||||
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
|
||||
org.springframework.boot.devtools.autoconfigure.LocalDevToolsAutoConfiguration,\
|
||||
org.springframework.boot.devtools.autoconfigure.RemoteDevToolsAutoConfiguration
|
|
@ -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;
|
||||
|
|
@ -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 {
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue