From 105612d30e65b8d3a34d2f0d37fee86de4487975 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 25 Feb 2015 17:12:49 +0000 Subject: [PATCH] Config package name change to avoid conflict with connectors Fixes gh-91 --- .../autoconfigure/ConfigClientAutoConfiguration.java | 6 +++--- .../LifecycleMvcEndpointAutoConfiguration.java | 2 +- .../cloud/autoconfigure/RefreshAutoConfiguration.java | 2 +- .../config/PropertySourceBootstrapConfiguration.java | 6 +++--- .../encrypt/EncryptionBootstrapConfiguration.java | 2 +- .../cloud/{config => configure}/Environment.java | 2 +- .../cloud/{config => configure}/PropertySource.java | 2 +- .../client/ConfigClientProperties.java | 2 +- .../client/ConfigServerHealthIndicator.java | 2 +- .../client/ConfigServicePropertySourceLocator.java | 6 +++--- .../client/PropertySourceLocator.java | 2 +- .../{config => configure}/client/RefreshEndpoint.java | 2 +- .../encrypt/EncryptorFactory.java | 2 +- .../encrypt/KeyFormatException.java | 2 +- .../ConfigClientAutoConfigurationTests.java | 4 ++-- .../bootstrap/config/BootstrapConfigurationTests.java | 4 ++-- .../client/ConfigClientPropertiesTests.java | 3 ++- .../ConfigServicePropertySourceLocatorTests.java | 6 ++++-- .../src/test/java/sample/ApplicationTests.java | 4 ++-- .../java/sample/ServerNativeApplicationTests.java | 4 ++-- .../server/AbstractSCMEnvironmentRepository.java | 6 +++--- .../server/ConfigServerApplication.java | 2 +- .../server/ConfigServerBootstrapConfiguration.java | 4 ++-- .../server/ConfigServerConfiguration.java | 2 +- .../server/ConfigServerMvcConfiguration.java | 2 +- .../server/ConfigServerProperties.java | 2 +- .../server/ConfigServerTestUtils.java | 2 +- .../server/EnableConfigServer.java | 2 +- .../server/EncryptionController.java | 10 +++++----- .../server/EnvironmentController.java | 6 +++--- .../server/EnvironmentRepository.java | 4 ++-- .../EnvironmentRepositoryPropertySourceLocator.java | 6 +++--- .../server/JGitEnvironmentRepository.java | 4 ++-- .../server/MultipleJGitEnvironmentRepository.java | 4 ++-- .../server/NativeEnvironmentRepository.java | 6 +++--- .../server/SVNKitEnvironmentRepository.java | 4 ++-- .../server/SerializableMapPropertySource.java | 2 +- .../SpringApplicationEnvironmentRepository.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- .../server/BootstrapConfigServerIntegrationTests.java | 6 ++++-- .../server/EncryptionControllerTests.java | 11 +++++++---- .../server/EnvironmentControllerTests.java | 9 ++++++--- .../JGitEnvironmentRepositoryIntegrationTests.java | 7 +++++-- .../server/JGitEnvironmentRepositoryTests.java | 6 ++++-- ...ipleJGitEnvironmentRepositoryIntegrationTests.java | 7 +++++-- .../MultipleJGitEnvironmentRepositoryTests.java | 8 +++++--- .../server/NativeConfigServerIntegrationTests.java | 6 ++++-- .../SVNKitEnvironmentRepositoryIntegrationTests.java | 7 +++++-- .../server/SVNKitEnvironmentRepositoryTests.java | 7 ++++--- .../SpringApplicationEnvironmentRepositoryTests.java | 5 +++-- .../SubversionConfigServerIntegrationTests.java | 6 ++++-- .../server/VanillaConfigServerIntegrationTests.java | 6 ++++-- 52 files changed, 131 insertions(+), 99 deletions(-) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/Environment.java (97%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/PropertySource.java (96%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/client/ConfigClientProperties.java (99%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/client/ConfigServerHealthIndicator.java (96%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/client/ConfigServicePropertySourceLocator.java (96%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/client/PropertySourceLocator.java (95%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/client/RefreshEndpoint.java (99%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/encrypt/EncryptorFactory.java (96%) rename spring-cloud-config-client/src/main/java/org/springframework/cloud/{config => configure}/encrypt/KeyFormatException.java (93%) rename spring-cloud-config-client/src/test/java/org/springframework/cloud/{config => configure}/client/ConfigClientPropertiesTests.java (94%) rename spring-cloud-config-client/src/test/java/org/springframework/cloud/{config => configure}/client/ConfigServicePropertySourceLocatorTests.java (93%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/AbstractSCMEnvironmentRepository.java (92%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/ConfigServerApplication.java (90%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/ConfigServerBootstrapConfiguration.java (93%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/ConfigServerConfiguration.java (94%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/ConfigServerMvcConfiguration.java (97%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/ConfigServerProperties.java (97%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/ConfigServerTestUtils.java (98%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/EnableConfigServer.java (95%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/EncryptionController.java (96%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/EnvironmentController.java (97%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/EnvironmentRepository.java (87%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/EnvironmentRepositoryPropertySourceLocator.java (91%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/JGitEnvironmentRepository.java (98%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/MultipleJGitEnvironmentRepository.java (97%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/NativeEnvironmentRepository.java (93%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/SVNKitEnvironmentRepository.java (94%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/SerializableMapPropertySource.java (94%) rename spring-cloud-config-server/src/main/java/org/springframework/cloud/{config => configure}/server/SpringApplicationEnvironmentRepository.java (97%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/BootstrapConfigServerIntegrationTests.java (86%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/EncryptionControllerTests.java (88%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/EnvironmentControllerTests.java (93%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/JGitEnvironmentRepositoryIntegrationTests.java (92%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/JGitEnvironmentRepositoryTests.java (93%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java (92%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/MultipleJGitEnvironmentRepositoryTests.java (92%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/NativeConfigServerIntegrationTests.java (89%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/SVNKitEnvironmentRepositoryIntegrationTests.java (92%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/SVNKitEnvironmentRepositoryTests.java (91%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/SpringApplicationEnvironmentRepositoryTests.java (91%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/SubversionConfigServerIntegrationTests.java (86%) rename spring-cloud-config-server/src/test/java/org/springframework/cloud/{config => configure}/server/VanillaConfigServerIntegrationTests.java (86%) diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java index af9b97a5..e5063f68 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfiguration.java @@ -20,9 +20,9 @@ import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.config.client.ConfigClientProperties; -import org.springframework.cloud.config.client.ConfigServerHealthIndicator; -import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; +import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.configure.client.ConfigServerHealthIndicator; +import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java index ead3ab5d..569c94bb 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/LifecycleMvcEndpointAutoConfiguration.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.cloud.config.client.RefreshEndpoint; +import org.springframework.cloud.configure.client.RefreshEndpoint; import org.springframework.cloud.context.environment.EnvironmentManager; import org.springframework.cloud.context.environment.EnvironmentManagerMvcEndpoint; import org.springframework.cloud.context.restart.RestartEndpoint; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java index b783898f..7bcb4185 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/autoconfigure/RefreshAutoConfiguration.java @@ -35,7 +35,7 @@ import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaD import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationPropertiesBindingPostProcessor; import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration; -import org.springframework.cloud.config.client.RefreshEndpoint; +import org.springframework.cloud.configure.client.RefreshEndpoint; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.cloud.context.environment.EnvironmentManager; import org.springframework.cloud.context.properties.ConfigurationPropertiesRebinder; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java index 18fac7b7..8bd249b3 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/config/PropertySourceBootstrapConfiguration.java @@ -29,9 +29,9 @@ import org.springframework.boot.bind.PropertySourcesPropertyValues; import org.springframework.boot.bind.RelaxedDataBinder; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.bootstrap.BootstrapApplicationListener; -import org.springframework.cloud.config.client.ConfigClientProperties; -import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; -import org.springframework.cloud.config.client.PropertySourceLocator; +import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator; +import org.springframework.cloud.configure.client.PropertySourceLocator; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.cloud.logging.LoggingRebinder; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java index 4751d2d3..7d72c527 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/bootstrap/encrypt/EncryptionBootstrapConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClas import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.cloud.bootstrap.encrypt.KeyProperties.KeyStore; -import org.springframework.cloud.config.encrypt.EncryptorFactory; +import org.springframework.cloud.configure.encrypt.EncryptorFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ConditionContext; import org.springframework.context.annotation.Conditional; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/Environment.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/Environment.java similarity index 97% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/Environment.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/Environment.java index 56af50c7..f10b51d5 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/Environment.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/Environment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config; +package org.springframework.cloud.configure; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/PropertySource.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/PropertySource.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/PropertySource.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/PropertySource.java index 4d1d0c7e..4c2ebc3d 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/PropertySource.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/PropertySource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config; +package org.springframework.cloud.configure; import java.util.Map; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigClientProperties.java similarity index 99% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigClientProperties.java index 5994fc04..d80065b0 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigClientProperties.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigClientProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import java.net.MalformedURLException; import java.net.URL; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServerHealthIndicator.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServerHealthIndicator.java index 5fa005d8..cf2e7271 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServerHealthIndicator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServerHealthIndicator.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import java.util.ArrayList; import java.util.List; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocator.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocator.java index 0f1b9684..09f4ca3b 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import java.io.IOException; import java.util.Arrays; @@ -22,8 +22,8 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; import org.springframework.core.annotation.Order; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/PropertySourceLocator.java similarity index 95% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/PropertySourceLocator.java index a04be177..16d06d46 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/PropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/PropertySourceLocator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/RefreshEndpoint.java similarity index 99% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/RefreshEndpoint.java index 9a44c781..ec9f7aa7 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/RefreshEndpoint.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/client/RefreshEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import java.util.Arrays; import java.util.Collection; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/EncryptorFactory.java similarity index 96% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/EncryptorFactory.java index cf35be66..481e45c4 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/EncryptorFactory.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/EncryptorFactory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.encrypt; +package org.springframework.cloud.configure.encrypt; import org.springframework.security.crypto.encrypt.Encryptors; import org.springframework.security.crypto.encrypt.TextEncryptor; diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/KeyFormatException.java similarity index 93% rename from spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java rename to spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/KeyFormatException.java index d1f0c557..b724914e 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/encrypt/KeyFormatException.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/configure/encrypt/KeyFormatException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.encrypt; +package org.springframework.cloud.configure.encrypt; @SuppressWarnings("serial") public class KeyFormatException extends RuntimeException { diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java index a6129a17..60dbeda1 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/autoconfigure/ConfigClientAutoConfigurationTests.java @@ -6,8 +6,8 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.bootstrap.config.PropertySourceBootstrapConfiguration; -import org.springframework.cloud.config.client.ConfigClientProperties; -import org.springframework.cloud.config.client.ConfigServerHealthIndicator; +import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.configure.client.ConfigServerHealthIndicator; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java index 49e86987..36148982 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/bootstrap/config/BootstrapConfigurationTests.java @@ -34,8 +34,8 @@ import org.junit.rules.ExpectedException; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.config.client.ConfigClientProperties; -import org.springframework.cloud.config.client.PropertySourceLocator; +import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.configure.client.PropertySourceLocator; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigClientPropertiesTests.java similarity index 94% rename from spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigClientPropertiesTests.java index fea4e3d2..30983401 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigClientPropertiesTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigClientPropertiesTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.boot.test.EnvironmentTestUtils; +import org.springframework.cloud.configure.client.ConfigClientProperties; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocatorTests.java similarity index 93% rename from spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java rename to spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocatorTests.java index d77530c9..1053fed8 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/configure/client/ConfigServicePropertySourceLocatorTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.client; +package org.springframework.cloud.configure.client; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -12,7 +12,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Matchers; import org.mockito.Mockito; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.client.ConfigClientProperties; +import org.springframework.cloud.configure.client.ConfigServicePropertySourceLocator; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; import org.springframework.http.HttpEntity; diff --git a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java index 0820e8d6..50a545a7 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ApplicationTests.java @@ -10,7 +10,7 @@ import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; -import org.springframework.cloud.config.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; @@ -37,7 +37,7 @@ public class ApplicationTests { String baseDir = ConfigServerTestUtils.getBaseDirectory("spring-cloud-config-sample"); String repo = ConfigServerTestUtils.prepareLocalRepo(baseDir, "target/repos", "config-repo", "target/config"); server = SpringApplication.run( - org.springframework.cloud.config.server.ConfigServerApplication.class, + org.springframework.cloud.configure.server.ConfigServerApplication.class, "--server.port=" + configPort, "--spring.config.name=server", "--spring.cloud.config.server.git.uri=" + repo); configPort = ((EmbeddedWebApplicationContext) server) diff --git a/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java b/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java index 507fee6c..a23bf501 100644 --- a/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java +++ b/spring-cloud-config-sample/src/test/java/sample/ServerNativeApplicationTests.java @@ -15,7 +15,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.cloud.config.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -41,7 +41,7 @@ public class ServerNativeApplicationTests { public static void startConfigServer() throws IOException { String repo = ConfigServerTestUtils.prepareLocalRepo(); server = SpringApplication.run( - org.springframework.cloud.config.server.ConfigServerApplication.class, + org.springframework.cloud.configure.server.ConfigServerApplication.class, "--server.port=" + configPort, "--spring.config.name=server", "--spring.cloud.config.server.git.uri=" + repo, "--spring.profiles.active=native"); configPort = ((EmbeddedWebApplicationContext) server) diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/AbstractSCMEnvironmentRepository.java similarity index 92% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/AbstractSCMEnvironmentRepository.java index 11355c0c..88526b53 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/AbstractSCMEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/AbstractSCMEnvironmentRepository.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.File; import java.io.IOException; @@ -25,8 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jgit.util.FileUtils; import org.springframework.beans.factory.InitializingBean; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.io.UrlResource; import org.springframework.util.StringUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerApplication.java similarity index 90% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerApplication.java index 9fc9e486..e036b9e2 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerApplication.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerApplication.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerBootstrapConfiguration.java similarity index 93% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerBootstrapConfiguration.java index a1ce1fbf..fe26311f 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerBootstrapConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerBootstrapConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.config.client.ConfigClientProperties; +import org.springframework.cloud.configure.client.ConfigClientProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerConfiguration.java similarity index 94% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerConfiguration.java index a7f14baf..700effad 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerMvcConfiguration.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerMvcConfiguration.java index 8f5db3d5..2033e34a 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerMvcConfiguration.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerMvcConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerProperties.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerProperties.java index c1db1de1..403cdbf9 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerProperties.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerTestUtils.java similarity index 98% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerTestUtils.java index 9b5e5228..46214538 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ConfigServerTestUtils.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/ConfigServerTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import org.eclipse.jgit.util.FileUtils; import org.springframework.util.FileSystemUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnableConfigServer.java similarity index 95% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnableConfigServer.java index 47c147e8..577ee609 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnableConfigServer.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnableConfigServer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EncryptionController.java similarity index 96% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EncryptionController.java index 7a53c509..0f8ff4b3 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EncryptionController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EncryptionController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -28,10 +28,10 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; -import org.springframework.cloud.config.encrypt.EncryptorFactory; -import org.springframework.cloud.config.encrypt.KeyFormatException; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.configure.encrypt.EncryptorFactory; +import org.springframework.cloud.configure.encrypt.KeyFormatException; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentController.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentController.java index 062bb3f3..1b94e412 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentController.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentController.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.IOException; import java.util.ArrayList; @@ -14,8 +14,8 @@ import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.bind.PropertiesConfigurationFactory; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepository.java similarity index 87% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepository.java index a60b0984..57055aca 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepository.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; /** diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepositoryPropertySourceLocator.java similarity index 91% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepositoryPropertySourceLocator.java index 7727cecc..706efaf8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/EnvironmentRepositoryPropertySourceLocator.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/EnvironmentRepositoryPropertySourceLocator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.util.Map; -import org.springframework.cloud.config.PropertySource; -import org.springframework.cloud.config.client.PropertySourceLocator; +import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.configure.client.PropertySourceLocator; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.Environment; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/JGitEnvironmentRepository.java similarity index 98% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/JGitEnvironmentRepository.java index 0c9e0750..7ac8ccd6 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/JGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/JGitEnvironmentRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.File; import java.io.IOException; @@ -40,7 +40,7 @@ import org.eclipse.jgit.transport.OpenSshConfig.Host; import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider; import org.eclipse.jgit.util.FileUtils; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.io.UrlResource; import org.springframework.util.Assert; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepository.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepository.java index f60d22ac..3ca336cf 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepository.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.util.LinkedHashMap; import java.util.Map; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.PatternMatchUtils; import org.springframework.util.StringUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/NativeEnvironmentRepository.java similarity index 93% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/NativeEnvironmentRepository.java index 29d2750f..c47b3788 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/NativeEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/NativeEnvironmentRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.util.Arrays; import java.util.HashSet; @@ -24,8 +24,8 @@ import java.util.Set; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.StandardEnvironment; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; import org.springframework.web.context.support.StandardServletEnvironment; /** diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepository.java similarity index 94% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepository.java index 00d40444..f9b0fcb8 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepository.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.File; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SerializableMapPropertySource.java similarity index 94% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SerializableMapPropertySource.java index b244fed4..26d0afc1 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SerializableMapPropertySource.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SerializableMapPropertySource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.util.Map; diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepository.java similarity index 97% rename from spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java rename to spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepository.java index 21146a92..6950ec96 100644 --- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepository.java +++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.util.ArrayList; import java.util.Collections; @@ -24,7 +24,7 @@ import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfigurati import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.config.ConfigFileApplicationListener; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MapPropertySource; diff --git a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories index 5b4ba62c..96709c5f 100644 --- a/spring-cloud-config-server/src/main/resources/META-INF/spring.factories +++ b/spring-cloud-config-server/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ # Bootstrap components org.springframework.cloud.bootstrap.BootstrapConfiguration=\ -org.springframework.cloud.config.server.ConfigServerBootstrapConfiguration \ No newline at end of file +org.springframework.cloud.configure.server.ConfigServerBootstrapConfiguration \ No newline at end of file diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/BootstrapConfigServerIntegrationTests.java similarity index 86% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/BootstrapConfigServerIntegrationTests.java index 60fb5159..c65430d8 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/BootstrapConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/BootstrapConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,7 +12,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerApplication; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EncryptionControllerTests.java similarity index 88% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EncryptionControllerTests.java index 383a5f89..01531cba 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EncryptionControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EncryptionControllerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -22,9 +22,12 @@ import static org.junit.Assert.assertTrue; import java.util.Collections; import org.junit.Test; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; -import org.springframework.cloud.config.encrypt.KeyFormatException; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.configure.encrypt.KeyFormatException; +import org.springframework.cloud.configure.server.EncryptionController; +import org.springframework.cloud.configure.server.InvalidCipherException; +import org.springframework.cloud.configure.server.KeyNotInstalledException; import org.springframework.http.MediaType; import org.springframework.security.rsa.crypto.RsaSecretEncryptor; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java similarity index 93% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java index a8d80268..9f5f6b12 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/EnvironmentControllerTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/EnvironmentControllerTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; @@ -26,8 +26,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.PropertySource; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.PropertySource; +import org.springframework.cloud.configure.server.EncryptionController; +import org.springframework.cloud.configure.server.EnvironmentController; +import org.springframework.cloud.configure.server.EnvironmentRepository; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryIntegrationTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryIntegrationTests.java index 4fe89c21..fcb8396d 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; @@ -30,7 +30,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerConfiguration; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.EnvironmentRepository; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryTests.java similarity index 93% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryTests.java index 2e2b527f..6593d3ff 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/JGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/JGitEnvironmentRepositoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,7 +25,9 @@ import java.io.IOException; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.JGitEnvironmentRepository; import org.springframework.core.env.StandardEnvironment; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java index bd4c62a8..09f182a0 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; @@ -29,7 +29,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerConfiguration; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.EnvironmentRepository; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryTests.java index 278ed602..aef655a8 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/MultipleJGitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/MultipleJGitEnvironmentRepositoryTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; @@ -23,8 +23,10 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.config.Environment; -import org.springframework.cloud.config.server.MultipleJGitEnvironmentRepository.PatternMatchingJGitEnvironmentRepository; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.MultipleJGitEnvironmentRepository; +import org.springframework.cloud.configure.server.MultipleJGitEnvironmentRepository.PatternMatchingJGitEnvironmentRepository; import org.springframework.core.env.StandardEnvironment; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/NativeConfigServerIntegrationTests.java similarity index 89% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/NativeConfigServerIntegrationTests.java index b1682b3b..b8e6cba1 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/NativeConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/NativeConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerApplication; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ActiveProfiles; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryIntegrationTests.java similarity index 92% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryIntegrationTests.java index b908d58b..297816c5 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.File; import java.io.FileNotFoundException; @@ -27,7 +27,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerConfiguration; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.EnvironmentRepository; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryTests.java similarity index 91% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryTests.java index 6c02aaba..f9acb308 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SVNKitEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SVNKitEnvironmentRepositoryTests.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import java.io.File; import org.eclipse.jgit.util.FileUtils; import org.junit.Before; import org.junit.Test; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; +import org.springframework.cloud.configure.server.SVNKitEnvironmentRepository; import org.springframework.core.env.StandardEnvironment; import static org.junit.Assert.assertTrue; - import static org.junit.Assert.assertEquals; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepositoryTests.java similarity index 91% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepositoryTests.java index f46a5a31..8f2fb22d 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SpringApplicationEnvironmentRepositoryTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SpringApplicationEnvironmentRepositoryTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.*; import org.junit.Test; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.SpringApplicationEnvironmentRepository; /** diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SubversionConfigServerIntegrationTests.java similarity index 86% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SubversionConfigServerIntegrationTests.java index 8dcb4e23..f0f84265 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/SubversionConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/SubversionConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import org.junit.BeforeClass; import org.junit.Test; @@ -7,7 +7,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerApplication; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/VanillaConfigServerIntegrationTests.java similarity index 86% rename from spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java rename to spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/VanillaConfigServerIntegrationTests.java index b9c3e09c..0eef684c 100644 --- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/VanillaConfigServerIntegrationTests.java +++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/configure/server/VanillaConfigServerIntegrationTests.java @@ -1,4 +1,4 @@ -package org.springframework.cloud.config.server; +package org.springframework.cloud.configure.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,7 +12,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; -import org.springframework.cloud.config.Environment; +import org.springframework.cloud.configure.Environment; +import org.springframework.cloud.configure.server.ConfigServerApplication; +import org.springframework.cloud.configure.server.ConfigServerTestUtils; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration;