INT-2996 Fix Class and Package Cycles

INT-2996 Fix Package Cycle

Move interface ...store.MetadataStore to ...store.metadata.

INT-2996 Fix Class Tangle

TcpConnectionEvent incorrectly referenced the
concrete TcpConnectionSupport instead of TcpConnection.

spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,13 @@ package org.springframework.integration.context;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.integration.MessageChannel;
-import org.springframework.integration.store.MetadataStore;
+import org.springframework.integration.store.metadata.MetadataStore;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.util.Assert;
 
 /**
  * Utility methods for accessing common integration components from the BeanFactory.
- * 
+ *
  * @author Mark Fisher
  * @author Josh Long
  */

spring-integration-core/src/main/java/org/springframework/integration/store/metadata/MetadataStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.store;
+package org.springframework.integration.store.metadata;
 
 /**
  * Strategy interface for storing metadata from certain adapters
  * to avoid duplicate delivery of messages, for example.
- * 
+ *
  * @author Josh Long
  * @author Oleg Zhurakousky
  * @author Mark Fisher

spring-integration-core/src/main/java/org/springframework/integration/store/metadata/PropertiesPersistingMetadataStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.store;
+package org.springframework.integration.store.metadata;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,7 +24,6 @@ import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
@@ -32,10 +31,10 @@ import org.springframework.util.DefaultPropertiesPersister;
 
 /**
  * Properties file-based implementation of {@link MetadataStore}. To avoid conflicts
- * each instance should be constructed with the unique key from which unique file name 
+ * each instance should be constructed with the unique key from which unique file name
  * will be generated. The file name will be 'persistentKey' + ".last.entry".
  * Files will be written to the 'java.io.tmpdir' +  "/spring-integration/".
- * 
+ *
  * @author Oleg Zhurakousky
  * @author Mark Fisher
  * @since 2.0
@@ -68,7 +67,7 @@ public class PropertiesPersistingMetadataStore implements MetadataStore, Initial
 			}
 		}
 		catch (Exception e) {
-			throw new IllegalArgumentException("Failed to create metadata-store file '" 
+			throw new IllegalArgumentException("Failed to create metadata-store file '"
 					+ this.file.getAbsolutePath() + "'", e);
 		}
 		this.loadMetadata();
@@ -91,7 +90,7 @@ public class PropertiesPersistingMetadataStore implements MetadataStore, Initial
 		try {
 			outputStream = new FileOutputStream(this.file);
 			this.persister.store(this.metadata, outputStream, "Last feed entry");
-		} 
+		}
 		catch (IOException e) {
 			// not fatal for the functionality of the component
 			logger.warn("Failed to persist feed entry. This may result in a duplicate "
@@ -102,7 +101,7 @@ public class PropertiesPersistingMetadataStore implements MetadataStore, Initial
 				if (outputStream != null) {
 					outputStream.close();
 				}
-			} 
+			}
 			catch (IOException e) {
 				// not fatal for the functionality of the component
 				logger.warn("Failed to close FileOutputStream to " + this.file.getAbsolutePath(), e);

spring-integration-core/src/main/java/org/springframework/integration/store/metadata/SimpleMetadataStore.java

@@ -1,25 +1,26 @@
 /*
- * Copyright 2002-2010 the original author or authors.
- * 
+ * Copyright 2002-2013 the original author or authors.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
 
-package org.springframework.integration.store;
+package org.springframework.integration.store.metadata;
 
 import java.util.HashMap;
 import java.util.Map;
 
+
 /**
  * Simple implementation of {@link MetadataStore} that uses an in-memory map only.
  * The metadata will not be persisted across application restarts.
- * 
+ *
  * @author Mark Fisher
  * @since 2.0
  */

spring-integration-core/src/main/java/org/springframework/integration/store/metadata/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Provides classes supporting metadata stores.
+ */
+package org.springframework.integration.store.metadata;

spring-integration-core/src/test/java/org/springframework/integration/store/metadata/PropertiesPersistingMetadataStoreTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.store;
+package org.springframework.integration.store.metadata;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,7 +27,7 @@ import org.junit.Test;
 
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
-import org.springframework.integration.store.PropertiesPersistingMetadataStore;
+import org.springframework.integration.store.metadata.PropertiesPersistingMetadataStore;
 
 /**
  * @author Oleg Zhurakousky