Moved MessageHeaders into the new 'org.springframework.integration.core' package.

org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java

@@ -19,7 +19,7 @@ package org.springframework.integration.aggregator;
 import java.util.List;
 
 import org.springframework.integration.core.Message;
-import org.springframework.integration.message.MessageHeaders;
+import org.springframework.integration.core.MessageHeaders;
 
 /**
  * An {@link AbstractMessageBarrierConsumer} that waits for a group of

org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java

@@ -16,8 +16,6 @@
 
 package org.springframework.integration.core;
 
-import org.springframework.integration.message.MessageHeaders;
-
 /**
  * The central interface that any Message type must implement.
  * 

org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.message;
+package org.springframework.integration.core;
 
 import java.io.Serializable;
 import java.util.Collection;
@@ -24,7 +24,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-import org.springframework.integration.core.Message;
+import org.springframework.integration.message.MessagePriority;
 
 /**
  * The headers for a {@link Message}.

org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java

@@ -23,9 +23,9 @@ import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.MessageChannelTemplate;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageHeaders;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageHandlingException;
-import org.springframework.integration.message.MessageHeaders;
 import org.springframework.integration.message.MessageProducer;
 import org.springframework.integration.message.MessageRejectedException;
 import org.springframework.integration.message.MessagingException;

org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java

@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageHeaders;
 import org.springframework.util.Assert;
 
 /**

org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java

@@ -23,6 +23,7 @@ import java.util.Set;
 
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageHeaders;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 

org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java

@@ -29,6 +29,7 @@ import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.integration.annotation.Header;
 import org.springframework.integration.annotation.Headers;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageHeaders;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;

org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java

@@ -12,8 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
+import org.springframework.integration.core.MessageHeaders;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.message.MessageHeaders;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 

org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java

@@ -35,8 +35,8 @@ import org.springframework.integration.bus.MessageBus;
 import org.springframework.integration.channel.MessageChannel;
 import org.springframework.integration.channel.PollableChannel;
 import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageHeaders;
 import org.springframework.integration.message.MessageDeliveryException;
-import org.springframework.integration.message.MessageHeaders;
 
 /**
  * @author Iwein Fuld

org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java

@@ -23,6 +23,8 @@ import java.util.Map;
 
 import org.junit.Test;
 
+import org.springframework.integration.core.MessageHeaders;
+
 /**
  * @author Mark Fisher
  */

org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java

@@ -24,6 +24,7 @@ import java.util.Date;
 import org.junit.Test;
 
 import org.springframework.integration.core.Message;
+import org.springframework.integration.core.MessageHeaders;
 
 /**
  * @author Mark Fisher

org.springframework.integration/src/test/java/org/springframework/integration/message/MessageHeadersTests.java

@@ -27,6 +27,8 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import org.springframework.integration.core.MessageHeaders;
+
 /**
  * @author Mark Fisher
  */