removed FileLocker from locking package to resolve dependency tangle

spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java

@@ -17,7 +17,6 @@
 package org.springframework.integration.file;
 
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.file.locking.FileLocker;
 
 import java.io.File;
 import java.util.List;

spring-integration-file/src/main/java/org/springframework/integration/file/DirectoryScanner.java

@@ -16,8 +16,6 @@
 
 package org.springframework.integration.file;
 
-import org.springframework.integration.file.locking.FileLocker;
-
 import java.io.File;
 import java.util.List;
 

spring-integration-file/src/main/java/org/springframework/integration/file/FileLocker.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.file.locking;
+package org.springframework.integration.file;
 
 import java.io.File;
 
@@ -25,7 +25,7 @@ import java.io.File;
  * contract, defining these guarantees is up to the implementation.
  *
  * If a filter that respects locks is required extend
- * {@link AbstractFileLockerFilter} instead.
+ * {@link org.springframework.integration.file.locking.AbstractFileLockerFilter} instead.
  * 
  * @author Iwein Fuld
  * @since 2.0

spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java

@@ -22,7 +22,6 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.core.MessagingException;
-import org.springframework.integration.file.locking.FileLocker;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.MessageSource;
 import org.springframework.util.Assert;

spring-integration-file/src/main/java/org/springframework/integration/file/locking/AbstractFileLockerFilter.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.file.locking;
 
 import org.springframework.integration.file.AbstractFileListFilter;
+import org.springframework.integration.file.FileLocker;
 
 import java.io.File;
 

spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java

@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.springframework.integration.core.Message;
-import org.springframework.integration.file.locking.FileLocker;
 
 import java.io.File;
 import java.io.IOException;