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

org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java

@@ -18,7 +18,7 @@ package org.springframework.integration.file;
 
 import java.io.File;
 
-import org.springframework.integration.message.Message;
+import org.springframework.integration.core.Message;
 import org.springframework.util.StringUtils;
 
 /**

org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java

@@ -16,7 +16,7 @@
 
 package org.springframework.integration.file;
 
-import org.springframework.integration.message.Message;
+import org.springframework.integration.core.Message;
 
 /**
  * Strategy interface for generating a file name from a message.

org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageConsumer.java

@@ -21,7 +21,7 @@ import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.nio.charset.Charset;
 
-import org.springframework.integration.message.Message;
+import org.springframework.integration.core.Message;
 import org.springframework.integration.message.MessageConsumer;
 import org.springframework.integration.message.MessageHandlingException;
 import org.springframework.util.Assert;

org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java

@@ -29,8 +29,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.core.io.Resource;
+import org.springframework.integration.core.Message;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageDeliveryAware;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.integration.message.MessagingException;

org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java

@@ -21,8 +21,8 @@ import java.io.File;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.springframework.integration.core.Message;
 import org.springframework.integration.file.FileNameGenerator;
-import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessagingException;
 import org.springframework.integration.transformer.Transformer;

org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java

@@ -33,7 +33,7 @@ import org.junit.runner.RunWith;
 
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.message.Message;
+import org.springframework.integration.core.Message;
 import org.springframework.test.annotation.Repeat;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java

@@ -25,7 +25,7 @@ import java.io.File;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.core.io.Resource;
-import org.springframework.integration.message.Message;
+import org.springframework.integration.core.Message;
 
 /**
  * @author Iwein Fuld

org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java

@@ -18,8 +18,8 @@ package org.springframework.integration.file.config;
 
 import java.util.Date;
 
+import org.springframework.integration.core.Message;
 import org.springframework.integration.file.FileNameGenerator;
-import org.springframework.integration.message.Message;
 
 /**
  * @author Marius Bogoevici