From 1c328a11ad6b14e26dfbf9281b6971017a7eeb21 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 20 Nov 2007 22:19:46 +0000 Subject: [PATCH] New base package: org.springframework.integration --- spring-eai-core/ivy.xml | 2 +- .../{eai => integration}/MessageDeliveryException.java | 2 +- .../{eai => integration}/MessageHandlingException.java | 2 +- .../{eai => integration}/MessagingException.java | 2 +- .../{eai => integration}/channel/MessageChannel.java | 4 ++-- .../{eai => integration}/channel/PointToPointChannel.java | 4 ++-- .../{eai => integration}/message/DocumentMessage.java | 2 +- .../{eai => integration}/message/Message.java | 2 +- .../{eai => integration}/message/MessageHeader.java | 2 +- .../channel/PointToPointChannelTests.java | 5 +++-- 10 files changed, 14 insertions(+), 13 deletions(-) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/MessageDeliveryException.java (96%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/MessageHandlingException.java (96%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/MessagingException.java (95%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/channel/MessageChannel.java (88%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/channel/PointToPointChannel.java (95%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/message/DocumentMessage.java (95%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/message/Message.java (94%) rename spring-eai-core/src/main/java/org/springframework/{eai => integration}/message/MessageHeader.java (98%) rename spring-eai-core/src/test/java/org/springframework/{eai => integration}/channel/PointToPointChannelTests.java (89%) diff --git a/spring-eai-core/ivy.xml b/spring-eai-core/ivy.xml index 091e1d8f58..2d87c3c6bf 100644 --- a/spring-eai-core/ivy.xml +++ b/spring-eai-core/ivy.xml @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/spring-eai-core/src/main/java/org/springframework/eai/MessageDeliveryException.java b/spring-eai-core/src/main/java/org/springframework/integration/MessageDeliveryException.java similarity index 96% rename from spring-eai-core/src/main/java/org/springframework/eai/MessageDeliveryException.java rename to spring-eai-core/src/main/java/org/springframework/integration/MessageDeliveryException.java index 9bbdb74f25..88175ef687 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/MessageDeliveryException.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/MessageDeliveryException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai; +package org.springframework.integration; /** * Exception that indicates an error during message delivery. diff --git a/spring-eai-core/src/main/java/org/springframework/eai/MessageHandlingException.java b/spring-eai-core/src/main/java/org/springframework/integration/MessageHandlingException.java similarity index 96% rename from spring-eai-core/src/main/java/org/springframework/eai/MessageHandlingException.java rename to spring-eai-core/src/main/java/org/springframework/integration/MessageHandlingException.java index 8f282fb80b..63d40875a2 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/MessageHandlingException.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/MessageHandlingException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai; +package org.springframework.integration; /** * Exception that indicates an error during message handling. diff --git a/spring-eai-core/src/main/java/org/springframework/eai/MessagingException.java b/spring-eai-core/src/main/java/org/springframework/integration/MessagingException.java similarity index 95% rename from spring-eai-core/src/main/java/org/springframework/eai/MessagingException.java rename to spring-eai-core/src/main/java/org/springframework/integration/MessagingException.java index bef8022085..5fc571fe28 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/MessagingException.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/MessagingException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai; +package org.springframework.integration; /** * The base exception for any failures within the messaging system. diff --git a/spring-eai-core/src/main/java/org/springframework/eai/channel/MessageChannel.java b/spring-eai-core/src/main/java/org/springframework/integration/channel/MessageChannel.java similarity index 88% rename from spring-eai-core/src/main/java/org/springframework/eai/channel/MessageChannel.java rename to spring-eai-core/src/main/java/org/springframework/integration/channel/MessageChannel.java index a618824bfd..b77a4bfba9 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/channel/MessageChannel.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/channel/MessageChannel.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.eai.channel; +package org.springframework.integration.channel; -import org.springframework.eai.message.Message; +import org.springframework.integration.message.Message; /** * The base channel interface defining the common behavior diff --git a/spring-eai-core/src/main/java/org/springframework/eai/channel/PointToPointChannel.java b/spring-eai-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java similarity index 95% rename from spring-eai-core/src/main/java/org/springframework/eai/channel/PointToPointChannel.java rename to spring-eai-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java index ada318ee24..bcf0486ceb 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/channel/PointToPointChannel.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/channel/PointToPointChannel.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.eai.channel; +package org.springframework.integration.channel; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.springframework.eai.message.Message; +import org.springframework.integration.message.Message; /** * Simple implementation of a point-to-point message channel. diff --git a/spring-eai-core/src/main/java/org/springframework/eai/message/DocumentMessage.java b/spring-eai-core/src/main/java/org/springframework/integration/message/DocumentMessage.java similarity index 95% rename from spring-eai-core/src/main/java/org/springframework/eai/message/DocumentMessage.java rename to spring-eai-core/src/main/java/org/springframework/integration/message/DocumentMessage.java index c93fe291e6..d7290c82d8 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/message/DocumentMessage.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/message/DocumentMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai.message; +package org.springframework.integration.message; /** * A simple Message implementation that encapsulates diff --git a/spring-eai-core/src/main/java/org/springframework/eai/message/Message.java b/spring-eai-core/src/main/java/org/springframework/integration/message/Message.java similarity index 94% rename from spring-eai-core/src/main/java/org/springframework/eai/message/Message.java rename to spring-eai-core/src/main/java/org/springframework/integration/message/Message.java index 1952057388..a441aa0777 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/message/Message.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/message/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai.message; +package org.springframework.integration.message; /** * The central interface that any Message type must implement. diff --git a/spring-eai-core/src/main/java/org/springframework/eai/message/MessageHeader.java b/spring-eai-core/src/main/java/org/springframework/integration/message/MessageHeader.java similarity index 98% rename from spring-eai-core/src/main/java/org/springframework/eai/message/MessageHeader.java rename to spring-eai-core/src/main/java/org/springframework/integration/message/MessageHeader.java index 8852e58360..66680ea3af 100644 --- a/spring-eai-core/src/main/java/org/springframework/eai/message/MessageHeader.java +++ b/spring-eai-core/src/main/java/org/springframework/integration/message/MessageHeader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai.message; +package org.springframework.integration.message; import java.util.Date; import java.util.Map; diff --git a/spring-eai-core/src/test/java/org/springframework/eai/channel/PointToPointChannelTests.java b/spring-eai-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java similarity index 89% rename from spring-eai-core/src/test/java/org/springframework/eai/channel/PointToPointChannelTests.java rename to spring-eai-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java index f07f56671b..d8c5e005e4 100644 --- a/spring-eai-core/src/test/java/org/springframework/eai/channel/PointToPointChannelTests.java +++ b/spring-eai-core/src/test/java/org/springframework/integration/channel/PointToPointChannelTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.eai.channel; +package org.springframework.integration.channel; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,7 +25,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; -import org.springframework.eai.message.DocumentMessage; +import org.springframework.integration.channel.PointToPointChannel; +import org.springframework.integration.message.DocumentMessage; /** * @author Mark Fisher