From cd90f6597970c1902567b98d5d185e787ddd323d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 29 Aug 2014 13:34:35 +0100 Subject: [PATCH] Update package names --- .../platform/bus/BusAutoConfiguration.java | 16 ++++++++-------- .../bus/amqp/AmqpBusAutoConfiguration.java | 4 ++-- .../bus/endpoint/AbstractBusEndpoint.java | 2 +- .../platform/bus/endpoint/BusEndpoint.java | 2 +- .../bus/endpoint/EnvironmentBusEndpoint.java | 4 ++-- .../bus/endpoint/RefreshBusEndpoint.java | 4 ++-- .../bus/event/EnvironmentChangeListener.java | 4 ++-- .../EnvironmentChangeRemoteApplicationEvent.java | 2 +- .../platform/bus/event/RefreshListener.java | 4 ++-- .../bus/event/RefreshRemoteApplicationEvent.java | 2 +- .../bus/event/RemoteApplicationEvent.java | 2 +- src/main/resources/META-INF/spring.factories | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) rename src/main/java/org/springframework/{ => cloud}/platform/bus/BusAutoConfiguration.java (77%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/amqp/AmqpBusAutoConfiguration.java (97%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/endpoint/AbstractBusEndpoint.java (95%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/endpoint/BusEndpoint.java (91%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/endpoint/EnvironmentBusEndpoint.java (85%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/endpoint/RefreshBusEndpoint.java (83%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/event/EnvironmentChangeListener.java (87%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java (92%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/event/RefreshListener.java (85%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/event/RefreshRemoteApplicationEvent.java (85%) rename src/main/java/org/springframework/{ => cloud}/platform/bus/event/RemoteApplicationEvent.java (92%) diff --git a/src/main/java/org/springframework/platform/bus/BusAutoConfiguration.java b/src/main/java/org/springframework/cloud/platform/bus/BusAutoConfiguration.java similarity index 77% rename from src/main/java/org/springframework/platform/bus/BusAutoConfiguration.java rename to src/main/java/org/springframework/cloud/platform/bus/BusAutoConfiguration.java index 334b0a9..d5d2101 100644 --- a/src/main/java/org/springframework/platform/bus/BusAutoConfiguration.java +++ b/src/main/java/org/springframework/cloud/platform/bus/BusAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus; +package org.springframework.cloud.bus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,13 +7,13 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.platform.bus.endpoint.BusEndpoint; -import org.springframework.platform.bus.endpoint.EnvironmentBusEndpoint; -import org.springframework.platform.bus.endpoint.RefreshBusEndpoint; -import org.springframework.platform.bus.event.EnvironmentChangeListener; -import org.springframework.platform.bus.event.RefreshListener; -import org.springframework.platform.config.client.RefreshEndpoint; -import org.springframework.platform.context.environment.EnvironmentManager; +import org.springframework.cloud.bus.endpoint.BusEndpoint; +import org.springframework.cloud.bus.endpoint.EnvironmentBusEndpoint; +import org.springframework.cloud.bus.endpoint.RefreshBusEndpoint; +import org.springframework.cloud.bus.event.EnvironmentChangeListener; +import org.springframework.cloud.bus.event.RefreshListener; +import org.springframework.cloud.config.client.RefreshEndpoint; +import org.springframework.cloud.context.environment.EnvironmentManager; /** * @author Spencer Gibb diff --git a/src/main/java/org/springframework/platform/bus/amqp/AmqpBusAutoConfiguration.java b/src/main/java/org/springframework/cloud/platform/bus/amqp/AmqpBusAutoConfiguration.java similarity index 97% rename from src/main/java/org/springframework/platform/bus/amqp/AmqpBusAutoConfiguration.java rename to src/main/java/org/springframework/cloud/platform/bus/amqp/AmqpBusAutoConfiguration.java index ac34e1b..9da7d8d 100644 --- a/src/main/java/org/springframework/platform/bus/amqp/AmqpBusAutoConfiguration.java +++ b/src/main/java/org/springframework/cloud/platform/bus/amqp/AmqpBusAutoConfiguration.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus.amqp; +package org.springframework.cloud.bus.amqp; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +22,7 @@ import org.springframework.integration.dsl.channel.MessageChannels; import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer; import org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler; import org.springframework.integration.handler.LoggingHandler; -import org.springframework.platform.bus.event.RemoteApplicationEvent; +import org.springframework.cloud.bus.event.RemoteApplicationEvent; /** * @author Spencer Gibb diff --git a/src/main/java/org/springframework/platform/bus/endpoint/AbstractBusEndpoint.java b/src/main/java/org/springframework/cloud/platform/bus/endpoint/AbstractBusEndpoint.java similarity index 95% rename from src/main/java/org/springframework/platform/bus/endpoint/AbstractBusEndpoint.java rename to src/main/java/org/springframework/cloud/platform/bus/endpoint/AbstractBusEndpoint.java index 0c3ae16..a3d0f53 100644 --- a/src/main/java/org/springframework/platform/bus/endpoint/AbstractBusEndpoint.java +++ b/src/main/java/org/springframework/cloud/platform/bus/endpoint/AbstractBusEndpoint.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus.endpoint; +package org.springframework.cloud.bus.endpoint; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.Endpoint; diff --git a/src/main/java/org/springframework/platform/bus/endpoint/BusEndpoint.java b/src/main/java/org/springframework/cloud/platform/bus/endpoint/BusEndpoint.java similarity index 91% rename from src/main/java/org/springframework/platform/bus/endpoint/BusEndpoint.java rename to src/main/java/org/springframework/cloud/platform/bus/endpoint/BusEndpoint.java index 1313a2e..4190f68 100644 --- a/src/main/java/org/springframework/platform/bus/endpoint/BusEndpoint.java +++ b/src/main/java/org/springframework/cloud/platform/bus/endpoint/BusEndpoint.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus.endpoint; +package org.springframework.cloud.bus.endpoint; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/org/springframework/platform/bus/endpoint/EnvironmentBusEndpoint.java b/src/main/java/org/springframework/cloud/platform/bus/endpoint/EnvironmentBusEndpoint.java similarity index 85% rename from src/main/java/org/springframework/platform/bus/endpoint/EnvironmentBusEndpoint.java rename to src/main/java/org/springframework/cloud/platform/bus/endpoint/EnvironmentBusEndpoint.java index c686f10..0871add 100644 --- a/src/main/java/org/springframework/platform/bus/endpoint/EnvironmentBusEndpoint.java +++ b/src/main/java/org/springframework/cloud/platform/bus/endpoint/EnvironmentBusEndpoint.java @@ -1,6 +1,6 @@ -package org.springframework.platform.bus.endpoint; +package org.springframework.cloud.bus.endpoint; -import org.springframework.platform.bus.event.EnvironmentChangeRemoteApplicationEvent; +import org.springframework.cloud.bus.event.EnvironmentChangeRemoteApplicationEvent; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/org/springframework/platform/bus/endpoint/RefreshBusEndpoint.java b/src/main/java/org/springframework/cloud/platform/bus/endpoint/RefreshBusEndpoint.java similarity index 83% rename from src/main/java/org/springframework/platform/bus/endpoint/RefreshBusEndpoint.java rename to src/main/java/org/springframework/cloud/platform/bus/endpoint/RefreshBusEndpoint.java index 53f496c..50a5c40 100644 --- a/src/main/java/org/springframework/platform/bus/endpoint/RefreshBusEndpoint.java +++ b/src/main/java/org/springframework/cloud/platform/bus/endpoint/RefreshBusEndpoint.java @@ -1,6 +1,6 @@ -package org.springframework.platform.bus.endpoint; +package org.springframework.cloud.bus.endpoint; -import org.springframework.platform.bus.event.RefreshRemoteApplicationEvent; +import org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/org/springframework/platform/bus/event/EnvironmentChangeListener.java b/src/main/java/org/springframework/cloud/platform/bus/event/EnvironmentChangeListener.java similarity index 87% rename from src/main/java/org/springframework/platform/bus/event/EnvironmentChangeListener.java rename to src/main/java/org/springframework/cloud/platform/bus/event/EnvironmentChangeListener.java index 98a1ed3..460bc48 100644 --- a/src/main/java/org/springframework/platform/bus/event/EnvironmentChangeListener.java +++ b/src/main/java/org/springframework/cloud/platform/bus/event/EnvironmentChangeListener.java @@ -1,10 +1,10 @@ -package org.springframework.platform.bus.event; +package org.springframework.cloud.bus.event; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; -import org.springframework.platform.context.environment.EnvironmentManager; +import org.springframework.cloud.context.environment.EnvironmentManager; import java.util.Map; diff --git a/src/main/java/org/springframework/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java b/src/main/java/org/springframework/cloud/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java similarity index 92% rename from src/main/java/org/springframework/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java rename to src/main/java/org/springframework/cloud/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java index 5f02f2b..530740a 100644 --- a/src/main/java/org/springframework/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java +++ b/src/main/java/org/springframework/cloud/platform/bus/event/EnvironmentChangeRemoteApplicationEvent.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus.event; +package org.springframework.cloud.bus.event; import lombok.Data; diff --git a/src/main/java/org/springframework/platform/bus/event/RefreshListener.java b/src/main/java/org/springframework/cloud/platform/bus/event/RefreshListener.java similarity index 85% rename from src/main/java/org/springframework/platform/bus/event/RefreshListener.java rename to src/main/java/org/springframework/cloud/platform/bus/event/RefreshListener.java index c179289..b557882 100644 --- a/src/main/java/org/springframework/platform/bus/event/RefreshListener.java +++ b/src/main/java/org/springframework/cloud/platform/bus/event/RefreshListener.java @@ -1,10 +1,10 @@ -package org.springframework.platform.bus.event; +package org.springframework.cloud.bus.event; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; -import org.springframework.platform.config.client.RefreshEndpoint; +import org.springframework.cloud.config.client.RefreshEndpoint; import java.util.Arrays; diff --git a/src/main/java/org/springframework/platform/bus/event/RefreshRemoteApplicationEvent.java b/src/main/java/org/springframework/cloud/platform/bus/event/RefreshRemoteApplicationEvent.java similarity index 85% rename from src/main/java/org/springframework/platform/bus/event/RefreshRemoteApplicationEvent.java rename to src/main/java/org/springframework/cloud/platform/bus/event/RefreshRemoteApplicationEvent.java index 9d47e2e..f7bf6c4 100644 --- a/src/main/java/org/springframework/platform/bus/event/RefreshRemoteApplicationEvent.java +++ b/src/main/java/org/springframework/cloud/platform/bus/event/RefreshRemoteApplicationEvent.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus.event; +package org.springframework.cloud.bus.event; /** * @author Spencer Gibb diff --git a/src/main/java/org/springframework/platform/bus/event/RemoteApplicationEvent.java b/src/main/java/org/springframework/cloud/platform/bus/event/RemoteApplicationEvent.java similarity index 92% rename from src/main/java/org/springframework/platform/bus/event/RemoteApplicationEvent.java rename to src/main/java/org/springframework/cloud/platform/bus/event/RemoteApplicationEvent.java index a6e0d4f..fe96cb8 100644 --- a/src/main/java/org/springframework/platform/bus/event/RemoteApplicationEvent.java +++ b/src/main/java/org/springframework/cloud/platform/bus/event/RemoteApplicationEvent.java @@ -1,4 +1,4 @@ -package org.springframework.platform.bus.event; +package org.springframework.cloud.bus.event; import lombok.Data; import org.springframework.context.ApplicationEvent; diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index dcce0dd..a7f30d5 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.platform.bus.amqp.AmqpBusAutoConfiguration,\ -org.springframework.platform.bus.BusAutoConfiguration +org.springframework.cloud.bus.amqp.AmqpBusAutoConfiguration,\ +org.springframework.cloud.bus.BusAutoConfiguration