Change package to org.springframework.cloud.kubernetes

fixes gh-13
This commit is contained in:
Spencer Gibb
2016-12-16 15:21:51 -07:00
parent f5bf5092e6
commit 8bfd9198ba
53 changed files with 80 additions and 80 deletions

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.archaius;
package org.springframework.cloud.kubernetes.archaius;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.archaius;
package org.springframework.cloud.kubernetes.archaius;
import com.google.common.base.Strings;
import com.netflix.config.WatchedConfigurationSource;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.archaius;
package org.springframework.cloud.kubernetes.archaius;
import com.netflix.config.DynamicWatchedConfiguration;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
@@ -88,4 +88,4 @@ class ArchaiusConfigMapSourceRegistar implements ImportBeanDefinitionRegistrar {
dynamicWatchedConfigBuilder.addConstructorArgReference(configMapSourceConfigName);
registry.registerBeanDefinition(dynamicWatchedConfigName, dynamicWatchedConfigBuilder.getBeanDefinition());
}
}
}

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes;
package org.springframework.cloud.kubernetes;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.ConfigBuilder;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes;
package org.springframework.cloud.kubernetes;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes;
package org.springframework.cloud.kubernetes;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -52,4 +52,4 @@ public class KubernetesHealthIndicator extends AbstractHealthIndicator {
builder.down(e);
}
}
}
}

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes;
package org.springframework.cloud.kubernetes;
import java.util.function.Supplier;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes;
package org.springframework.cloud.kubernetes;
import io.fabric8.kubernetes.api.model.Pod;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes;
package org.springframework.cloud.kubernetes;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.client.Config;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
public abstract class AbstractConfigProperties {

View File

@@ -15,12 +15,12 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.Secret;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.spring.cloud.kubernetes.KubernetesAutoConfiguration;
import org.springframework.cloud.kubernetes.KubernetesAutoConfiguration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import java.io.ByteArrayInputStream;
import java.io.IOException;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
@@ -23,7 +23,7 @@ import org.springframework.core.annotation.Order;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment;
import org.springframework.core.env.MapPropertySource;
import static io.fabric8.spring.cloud.kubernetes.config.ConfigUtils.*;
import static org.springframework.cloud.kubernetes.config.ConfigUtils.*;
@Order(0)
public class ConfigMapPropertySourceLocator implements PropertySourceLocator {

View File

@@ -1,4 +1,4 @@
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
final class Constants {
static final String SPRING_APPLICATION_NAME = "spring.application.name";

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import java.util.HashMap;
import java.util.LinkedList;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import java.io.IOException;
import java.nio.file.Files;
@@ -32,7 +32,7 @@ import org.springframework.core.env.Environment;
import org.springframework.core.env.MapPropertySource;
import org.springframework.util.StringUtils;
import static io.fabric8.spring.cloud.kubernetes.config.ConfigUtils.*;
import static org.springframework.cloud.kubernetes.config.ConfigUtils.*;
public class SecretsPropertySource extends MapPropertySource {
private static final Logger LOGGER = LoggerFactory.getLogger(SecretsPropertySource.class);

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config;
package org.springframework.cloud.kubernetes.config;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;

View File

@@ -14,11 +14,11 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes.profile;
package org.springframework.cloud.kubernetes.profile;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.spring.cloud.kubernetes.PodUtils;
import io.fabric8.spring.cloud.kubernetes.StandardPodUtils;
import org.springframework.cloud.kubernetes.PodUtils;
import org.springframework.cloud.kubernetes.StandardPodUtils;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.Ordered;
@@ -52,4 +52,4 @@ public class KubernetesApplicationContextInitializer implements
public void initialize(ConfigurableApplicationContext applicationContext) {
listener.addKubernetesProfile(applicationContext.getEnvironment());
}
}
}

View File

@@ -14,10 +14,10 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.kubernetes.profile;
package org.springframework.cloud.kubernetes.profile;
import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.spring.cloud.kubernetes.PodUtils;
import org.springframework.cloud.kubernetes.PodUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;

View File

@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.reload;
package org.springframework.cloud.kubernetes.reload;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySourceLocator;
import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.reload;
package org.springframework.cloud.kubernetes.reload;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.reload;
package org.springframework.cloud.kubernetes.reload;
import java.util.LinkedList;
import java.util.List;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.reload;
package org.springframework.cloud.kubernetes.reload;
import java.util.Objects;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.reload;
package org.springframework.cloud.kubernetes.reload;
import java.util.HashMap;
import java.util.Map;
@@ -27,10 +27,10 @@ import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClientException;
import io.fabric8.kubernetes.client.Watch;
import io.fabric8.kubernetes.client.Watcher;
import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySource;
import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySource;
import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySourceLocator;
import org.springframework.cloud.kubernetes.config.ConfigMapPropertySource;
import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
import org.springframework.cloud.kubernetes.config.SecretsPropertySource;
import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator;
import org.springframework.core.env.AbstractEnvironment;
import org.springframework.core.env.MapPropertySource;

View File

@@ -14,15 +14,15 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.reload;
package org.springframework.cloud.kubernetes.reload;
import javax.annotation.PostConstruct;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySource;
import io.fabric8.spring.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySource;
import io.fabric8.spring.cloud.kubernetes.config.SecretsPropertySourceLocator;
import org.springframework.cloud.kubernetes.config.ConfigMapPropertySource;
import org.springframework.cloud.kubernetes.config.ConfigMapPropertySourceLocator;
import org.springframework.cloud.kubernetes.config.SecretsPropertySource;
import org.springframework.cloud.kubernetes.config.SecretsPropertySourceLocator;
import org.springframework.core.env.AbstractEnvironment;
import org.springframework.core.env.MapPropertySource;

View File

@@ -1,9 +1,9 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.fabric8.spring.cloud.kubernetes.KubernetesAutoConfiguration,\
io.fabric8.spring.cloud.kubernetes.reload.ConfigReloadAutoConfiguration
org.springframework.cloud.kubernetes.KubernetesAutoConfiguration,\
org.springframework.cloud.kubernetes.reload.ConfigReloadAutoConfiguration
org.springframework.cloud.bootstrap.BootstrapConfiguration=\
io.fabric8.spring.cloud.kubernetes.config.BootstrapConfiguration
org.springframework.cloud.kubernetes.config.BootstrapConfiguration
org.springframework.context.ApplicationContextInitializer=\
io.fabric8.spring.cloud.kubernetes.profile.KubernetesApplicationContextInitializer
org.springframework.cloud.kubernetes.profile.KubernetesApplicationContextInitializer

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config.test
package org.springframework.cloud.kubernetes.config.test
import io.fabric8.kubernetes.api.model.SecretBuilder
import io.fabric8.kubernetes.api.model.ConfigMapBuilder

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.config.test
package org.springframework.cloud.kubernetes.config.test
import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
@@ -26,4 +26,4 @@ class TestApplication {
def main(String[] args) {
SpringApplication.run(TestApplication.class, args);
}
}
}

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.discovery;
package org.springframework.cloud.kubernetes.discovery;
import io.fabric8.kubernetes.api.model.Endpoints;
import io.fabric8.kubernetes.client.KubernetesClient;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.discovery;
package org.springframework.cloud.kubernetes.discovery;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.discovery;
package org.springframework.cloud.kubernetes.discovery;
import io.fabric8.kubernetes.client.KubernetesClient;
import org.springframework.cloud.client.discovery.AbstractDiscoveryLifecycle;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.discovery;
package org.springframework.cloud.kubernetes.discovery;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package io.fabric8.spring.cloud.discovery;
package org.springframework.cloud.kubernetes.discovery;
import io.fabric8.kubernetes.api.model.EndpointAddress;
import io.fabric8.kubernetes.api.model.EndpointPort;

View File

@@ -1,3 +1,3 @@
# Discovery Client Configuration
org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
io.fabric8.spring.cloud.discovery.KubernetesDiscoveryClientConfiguration
org.springframework.cloud.kubernetes.discovery.KubernetesDiscoveryClientConfiguration

View File

@@ -1,4 +1,4 @@
package io.fabric8.spring.cloud.discovery
package org.springframework.cloud.kubernetes.discovery
import io.fabric8.kubernetes.api.model.EndpointsBuilder
import io.fabric8.kubernetes.client.Config

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.examples;
package org.springframework.cloud.kubernetes.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.examples;
package org.springframework.cloud.kubernetes.examples;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*
*/
package io.fabric8.spring.cloud.kubernetes.examples;
package org.springframework.cloud.kubernetes.examples;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.hystrix;
package org.springframework.cloud.kubernetes.hystrix;
import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.hystrix;
package org.springframework.cloud.kubernetes.hystrix;
import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext;
import org.springframework.web.filter.OncePerRequestFilter;
@@ -38,4 +38,4 @@ public class HystrixRequestContextServletFilter extends OncePerRequestFilter {
}
}
}
}

View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.fabric8.spring.cloud.kubernetes.hystrix.HystrixFilterAutoConfiguration
org.springframework.cloud.kubernetes.hystrix.HystrixFilterAutoConfiguration

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.ribbon;
package org.springframework.cloud.kubernetes.ribbon;
import com.google.common.reflect.TypeToken;
import com.netflix.client.config.IClientConfigKey;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.ribbon;
package org.springframework.cloud.kubernetes.ribbon;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.ribbon;
package org.springframework.cloud.kubernetes.ribbon;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.AbstractServerList;

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.ribbon;
package org.springframework.cloud.kubernetes.ribbon;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.fabric8.spring.cloud.kubernetes.ribbon.RibbonKubernetesAutoConfiguration
org.springframework.cloud.kubernetes.ribbon.RibbonKubernetesAutoConfiguration

View File

@@ -15,13 +15,13 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.ribbon.test
package org.springframework.cloud.kubernetes.ribbon.test
import io.fabric8.kubernetes.api.model.EndpointsBuilder
import io.fabric8.kubernetes.client.Config
import io.fabric8.kubernetes.client.KubernetesClient
import io.fabric8.kubernetes.server.mock.KubernetesMockServer
import io.fabric8.spring.cloud.kubernetes.ribbon.KubernetesRibbonClientConfiguration
import org.springframework.cloud.kubernetes.ribbon.KubernetesRibbonClientConfiguration
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.test.IntegrationTest

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.ribbon.test
package org.springframework.cloud.kubernetes.ribbon.test
import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.cloud.client.loadbalancer.LoadBalanced
@@ -34,4 +34,4 @@ class TestApplication {
def RestTemplate restTemplate() {
return new RestTemplate();
}
}
}

View File

@@ -15,7 +15,7 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.zipkin;
package org.springframework.cloud.kubernetes.zipkin;
import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -15,12 +15,12 @@
*
*/
package io.fabric8.spring.cloud.kubernetes.zipkin;
package org.springframework.cloud.kubernetes.zipkin;
import io.fabric8.kubernetes.api.model.Endpoints;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.utils.Utils;
import io.fabric8.spring.cloud.discovery.KubernetesServiceInstance;
import org.springframework.cloud.kubernetes.discovery.KubernetesServiceInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;

View File

@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.fabric8.spring.cloud.kubernetes.zipkin.ZipkinKubernetesAutoConfiguration
org.springframework.cloud.kubernetes.zipkin.ZipkinKubernetesAutoConfiguration