New base package: org.springframework.integration

spring-eai-core/ivy.xml

@@ -16,7 +16,7 @@
 
 	<dependencies>
 		<dependency org="org.junit" name="junit" rev="4.4" conf="test->default"/>
-		<dependency org="org.springframework" name="spring-context" rev="2.1-m4" conf="compile"/>
+		<dependency org="org.springframework" name="spring-context" rev="2.5.0" conf="compile->default"/>
 	</dependencies>
 
 </ivy-module>

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.

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.

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.

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

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.

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

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.

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;

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