INT-3360 Fix Package Tangle

JIRA: https://jira.spring.io/browse/INT-3360

Move LockRegistry from util to support.

spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java

@@ -45,8 +45,8 @@ import org.springframework.integration.store.MessageGroupStore.MessageGroupCallb
 import org.springframework.integration.store.MessageStore;
 import org.springframework.integration.store.SimpleMessageGroup;
 import org.springframework.integration.store.SimpleMessageStore;
-import org.springframework.integration.util.DefaultLockRegistry;
-import org.springframework.integration.util.LockRegistry;
+import org.springframework.integration.support.locks.DefaultLockRegistry;
+import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.integration.util.UUIDConverter;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;

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

@@ -32,8 +32,8 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.integration.util.DefaultLockRegistry;
-import org.springframework.integration.util.LockRegistry;
+import org.springframework.integration.support.locks.DefaultLockRegistry;
+import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.util.Assert;
 import org.springframework.util.DefaultPropertiesPersister;
 

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

@@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.Lock;
 
-import org.springframework.integration.util.DefaultLockRegistry;
-import org.springframework.integration.util.LockRegistry;
+import org.springframework.integration.support.locks.DefaultLockRegistry;
+import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.integration.util.UpperBound;
 import org.springframework.jmx.export.annotation.ManagedAttribute;
 import org.springframework.jmx.export.annotation.ManagedResource;

spring-integration-core/src/main/java/org/springframework/integration/support/locks/DefaultLockRegistry.java

@@ -10,7 +10,7 @@
  * 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.util;
+package org.springframework.integration.support.locks;
 
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;

spring-integration-core/src/main/java/org/springframework/integration/support/locks/LockRegistry.java

@@ -10,7 +10,7 @@
  * 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.util;
+package org.springframework.integration.support.locks;
 
 import java.util.concurrent.locks.Lock;
 

spring-integration-core/src/main/java/org/springframework/integration/support/locks/PassThruLockRegistry.java

@@ -10,11 +10,12 @@
  * 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.util;
+package org.springframework.integration.support.locks;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
+
 /**
  * The {@link LockRegistry} implementation which has no effect. Mainly used in cases where locking itself must be conditional
  * but an extra IF statement would clutter the code.

spring-integration-core/src/main/java/org/springframework/integration/support/locks/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Provides classes related to locking resources.
+ */
+package org.springframework.integration.support.locks;

spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java

@@ -18,6 +18,7 @@ package org.springframework.integration.util;
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
 
+import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.messaging.MessagingException;
 
 /**

spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-4.0.xsd

@@ -3483,11 +3483,11 @@
 					<xsd:annotation>
 						<xsd:appinfo>
 							<tool:annotation kind="ref">
-								<tool:expected-type type="org.springframework.integration.util.LockRegistry" />
+								<tool:expected-type type="org.springframework.integration.support.locks.LockRegistry" />
 							</tool:annotation>
 						</xsd:appinfo>
 						<xsd:documentation>
-							A reference to a 'org.springframework.integration.util.LockRegistry' bean
+							A reference to a 'org.springframework.integration.support.locks.LockRegistry' bean
 							to obtain 'java.util.concurrent.locks.Lock' by 'groupId'. Used for concurrent operations on
 							MessageGroups. By default an internal 'DefaultLockRegistry' is used.
 						</xsd:documentation>

spring-integration-core/src/test/java/org/springframework/integration/support/locks/DefaultLockRegistryTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.util;
+package org.springframework.integration.support.locks;
 
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;

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

@@ -37,9 +37,9 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.integration.expression.ExpressionUtils;
 import org.springframework.integration.file.support.FileExistsMode;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.util.DefaultLockRegistry;
-import org.springframework.integration.util.LockRegistry;
-import org.springframework.integration.util.PassThruLockRegistry;
+import org.springframework.integration.support.locks.DefaultLockRegistry;
+import org.springframework.integration.support.locks.LockRegistry;
+import org.springframework.integration.support.locks.PassThruLockRegistry;
 import org.springframework.integration.util.WhileLockedProcessor;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;

spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java

@@ -42,8 +42,8 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.integration.util.DefaultLockRegistry;
-import org.springframework.integration.util.LockRegistry;
+import org.springframework.integration.support.locks.DefaultLockRegistry;
+import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.util.Assert;
 
 /**