initial commit of my work to make building filesystem based adapters more consistent, cleaner.

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

@@ -1,52 +1,52 @@
-/*
- * Copyright 2002-2010 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.aggregator;
-
-import org.springframework.integration.store.MessageGroup;
-
-/**
- * A {@link ReleaseStrategy} that releases only the first <code>n</code> messages, where <code>n</code> is a threshold.
- * 
- * @author Dave Syer
- * 
- */
-public class MessageCountReleaseStrategy implements ReleaseStrategy {
-
-	private final int threshold;
-
-	/**
-	 * @param threshold the number of messages to accept before releasing
-	 */
-	public MessageCountReleaseStrategy(int threshold) {
-		super();
-		this.threshold = threshold;
-	}
-
-	/**
-	 * Convenient constructor is only one message is required (threshold=1).
-	 */
-	public MessageCountReleaseStrategy() {
-		this(1);
-	}
-
-	/**
-	 * Release the group if it has more messages than the threshold and has not previously been released. Previous
-	 * releases leave an imprint on the group in the form of marked messages. It is possible that more messages than the
-	 * threshold could be released, but only if multiple consumers receive messages from the same group concurrently.
-	 */
-	public boolean canRelease(MessageGroup group) {
-		return group.size() >= threshold && group.getMarked().size() == 0;
-	}
-
-}
+/*
+ * Copyright 2002-2010 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.aggregator;
+
+import org.springframework.integration.store.MessageGroup;
+
+/**
+ * A {@link ReleaseStrategy} that releases only the first <code>n</code> messages, where <code>n</code> is a threshold.
+ * 
+ * @author Dave Syer
+ * 
+ */
+public class MessageCountReleaseStrategy implements ReleaseStrategy {
+
+	private final int threshold;
+
+	/**
+	 * @param threshold the number of messages to accept before releasing
+	 */
+	public MessageCountReleaseStrategy(int threshold) {
+		super();
+		this.threshold = threshold;
+	}
+
+	/**
+	 * Convenient constructor is only one message is required (threshold=1).
+	 */
+	public MessageCountReleaseStrategy() {
+		this(1);
+	}
+
+	/**
+	 * Release the group if it has more messages than the threshold and has not previously been released. Previous
+	 * releases leave an imprint on the group in the form of marked messages. It is possible that more messages than the
+	 * threshold could be released, but only if multiple consumers receive messages from the same group concurrently.
+	 */
+	public boolean canRelease(MessageGroup group) {
+		return group.size() >= threshold && group.getMarked().size() == 0;
+	}
+
+}

spring-integration-core/src/main/java/org/springframework/integration/dispatcher/OrderedAwareLinkedHashSet.java

@@ -1,192 +1,192 @@
-/*
- * Copyright 2002-2009 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.dispatcher;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import org.springframework.core.OrderComparator;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * Special Set that maintains the following semantics:
- * All elements that are un-ordered (do not implement {@link Ordered} interface or annotated
- * {@link Order} annotation) will be stored in the order in which they were added, maintaining the
- * semantics of the {@link LinkedHashSet}. However, for all {@link Ordered} elements a
- * {@link Comparator} (instantiated by default) for this implementation of {@link Set}, will be
- * used. Those elements will have precedence over un-ordered elements. If elements have the same
- * order but themselves do not equal to one another the more recent addition will be placed to the
- * right of (appended next to) the existing element with the same order, thus preserving the order
- * of the insertion  and maintaining {@link LinkedHashSet} semantics for the un-ordered elements.
- * <p>
- * The class is package-protected and only intended for use by the AbstractDispatcher. It
- * <emphasis>must</emphasis> enforce safe concurrent access for all usage by the dispatcher.
- * 
- * @author Oleg Zhurakousky
- * @author Mark Fisher
- * @since 1.0.3
- */
-@SuppressWarnings({"unchecked", "serial"})
-class OrderedAwareLinkedHashSet<E> extends LinkedHashSet<E> {
-
-	private final OrderComparator comparator = new OrderComparator();
-
-	private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
-
-	private final ReadLock readLock = rwl.readLock();
-
-	private final WriteLock writeLock = rwl.writeLock();
-
-
-	/**
-	 * Every time an Ordered element is added via this method this
-	 * Set will be re-sorted, otherwise the element is simply added
-	 * to the end. Added element must not be null.
-	 */
-	public boolean add(E o) {
-		Assert.notNull(o,"Can not add NULL object");
-		writeLock.lock();
-		try {			
-			boolean present = false;
-			if (o instanceof Ordered){
-				present = this.addOrderedElement((Ordered) o);
-			}
-			else {
-				present = super.add(o);
-			}
-			return present;
-		}
-		finally {
-			writeLock.unlock();
-		}	
-	}
-
-	/**
-	 * Adds all elements in this Collection.
-	 */
-	public boolean addAll(Collection<? extends E> c) {
-		Assert.notNull(c,"Can not merge with NULL set");
-		writeLock.lock();
-		try {
-			for (E object : c) {		
-				this.add(object);
-			}		
-			return true;
-		}
-		finally {
-			writeLock.unlock();
-		}
-	}
-
-	/**
-	 * {@inheritDoc} 
-	 */
-	public boolean remove(Object o) {
-		writeLock.lock();
-		try {
-			return super.remove(o);
-		}
-		finally {
-			writeLock.unlock();
-		}
-	}
-
-	/**
-	 * {@inheritDoc} 
-	 */
-	public boolean removeAll(Collection<?> c){
-		if (CollectionUtils.isEmpty(c)){
-			return false;
-		}
-		writeLock.lock();
-		try {
-			return super.removeAll(c);
-		}
-		finally {
-			writeLock.unlock();
-		}
-	}
-
-	@Override
-	public <T> T[] toArray(T[] a) {
-		readLock.lock();
-		try {
-			return super.toArray(a);
-		}
-		finally {
-			readLock.unlock();
-		}
-	}
-
-	@Override
-	public String toString() {
-		readLock.lock();
-		try {
-			return StringUtils.collectionToCommaDelimitedString(this);
-		}
-		finally {
-			readLock.unlock();
-		}
-	}
-
-	private boolean addOrderedElement(Ordered adding) {	
-		boolean added = false;
-		E[] tempUnorderedElements = (E[]) this.toArray();
-		if (super.contains(adding)) {
-			return false;
-		}
-		super.clear();
-
-		if (tempUnorderedElements.length == 0) {
-			added = super.add((E) adding);
-		}
-		else {
-			Set tempSet = new LinkedHashSet();
-			for (E current : tempUnorderedElements) {
-				if (current instanceof Ordered) {
-					if (this.comparator.compare(adding, current) < 0) {
-						added = super.add((E) adding);
-						super.add(current);
-					}
-					else {
-						super.add(current);
-					}
-				}
-				else {
-					tempSet.add(current);
-				}
-			}
-			if (!added) {
-				added = super.add((E) adding);
-			}
-			for (Object object : tempSet) {
-				super.add((E) object);
-			}
-		}
-		return added;
-	}
-
-}
+/*
+ * Copyright 2002-2009 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.dispatcher;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import org.springframework.core.OrderComparator;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Special Set that maintains the following semantics:
+ * All elements that are un-ordered (do not implement {@link Ordered} interface or annotated
+ * {@link Order} annotation) will be stored in the order in which they were added, maintaining the
+ * semantics of the {@link LinkedHashSet}. However, for all {@link Ordered} elements a
+ * {@link Comparator} (instantiated by default) for this implementation of {@link Set}, will be
+ * used. Those elements will have precedence over un-ordered elements. If elements have the same
+ * order but themselves do not equal to one another the more recent addition will be placed to the
+ * right of (appended next to) the existing element with the same order, thus preserving the order
+ * of the insertion  and maintaining {@link LinkedHashSet} semantics for the un-ordered elements.
+ * <p>
+ * The class is package-protected and only intended for use by the AbstractDispatcher. It
+ * <emphasis>must</emphasis> enforce safe concurrent access for all usage by the dispatcher.
+ * 
+ * @author Oleg Zhurakousky
+ * @author Mark Fisher
+ * @since 1.0.3
+ */
+@SuppressWarnings({"unchecked", "serial"})
+class OrderedAwareLinkedHashSet<E> extends LinkedHashSet<E> {
+
+	private final OrderComparator comparator = new OrderComparator();
+
+	private final ReentrantReadWriteLock rwl = new ReentrantReadWriteLock();
+
+	private final ReadLock readLock = rwl.readLock();
+
+	private final WriteLock writeLock = rwl.writeLock();
+
+
+	/**
+	 * Every time an Ordered element is added via this method this
+	 * Set will be re-sorted, otherwise the element is simply added
+	 * to the end. Added element must not be null.
+	 */
+	public boolean add(E o) {
+		Assert.notNull(o,"Can not add NULL object");
+		writeLock.lock();
+		try {			
+			boolean present = false;
+			if (o instanceof Ordered){
+				present = this.addOrderedElement((Ordered) o);
+			}
+			else {
+				present = super.add(o);
+			}
+			return present;
+		}
+		finally {
+			writeLock.unlock();
+		}	
+	}
+
+	/**
+	 * Adds all elements in this Collection.
+	 */
+	public boolean addAll(Collection<? extends E> c) {
+		Assert.notNull(c,"Can not merge with NULL set");
+		writeLock.lock();
+		try {
+			for (E object : c) {		
+				this.add(object);
+			}		
+			return true;
+		}
+		finally {
+			writeLock.unlock();
+		}
+	}
+
+	/**
+	 * {@inheritDoc} 
+	 */
+	public boolean remove(Object o) {
+		writeLock.lock();
+		try {
+			return super.remove(o);
+		}
+		finally {
+			writeLock.unlock();
+		}
+	}
+
+	/**
+	 * {@inheritDoc} 
+	 */
+	public boolean removeAll(Collection<?> c){
+		if (CollectionUtils.isEmpty(c)){
+			return false;
+		}
+		writeLock.lock();
+		try {
+			return super.removeAll(c);
+		}
+		finally {
+			writeLock.unlock();
+		}
+	}
+
+	@Override
+	public <T> T[] toArray(T[] a) {
+		readLock.lock();
+		try {
+			return super.toArray(a);
+		}
+		finally {
+			readLock.unlock();
+		}
+	}
+
+	@Override
+	public String toString() {
+		readLock.lock();
+		try {
+			return StringUtils.collectionToCommaDelimitedString(this);
+		}
+		finally {
+			readLock.unlock();
+		}
+	}
+
+	private boolean addOrderedElement(Ordered adding) {	
+		boolean added = false;
+		E[] tempUnorderedElements = (E[]) this.toArray();
+		if (super.contains(adding)) {
+			return false;
+		}
+		super.clear();
+
+		if (tempUnorderedElements.length == 0) {
+			added = super.add((E) adding);
+		}
+		else {
+			Set tempSet = new LinkedHashSet();
+			for (E current : tempUnorderedElements) {
+				if (current instanceof Ordered) {
+					if (this.comparator.compare(adding, current) < 0) {
+						added = super.add((E) adding);
+						super.add(current);
+					}
+					else {
+						super.add(current);
+					}
+				}
+				else {
+					tempSet.add(current);
+				}
+			}
+			if (!added) {
+				added = super.add((E) adding);
+			}
+			for (Object object : tempSet) {
+				super.add((E) object);
+			}
+		}
+		return added;
+	}
+
+}

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

@@ -1,93 +1,93 @@
-/*
- * Copyright 2002-2010 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;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * @author Dave Syer
- * 
- * @since 2.0
- *
- */
-public abstract class AbstractMessageGroupStore implements MessageGroupStore, Iterable<MessageGroup> {
-
-	protected final Log logger = LogFactory.getLog(getClass());
-
-	private Collection<MessageGroupCallback> expiryCallbacks = new LinkedHashSet<MessageGroupCallback>();
-
-	/**
-	 * 
-	 */
-	public AbstractMessageGroupStore() {
-		super();
-	}
-
-	/**
-	 * Convenient injection point for expiry callbacks in the message store. Each of the callbacks provided will simply
-	 * be registered with the store using {@link #registerMessageGroupExpiryCallback(MessageGroupCallback)}.
-	 * 
-	 * @param expiryCallbacks the expiry callbacks to add
-	 */
-	public void setExpiryCallbacks(Collection<MessageGroupCallback> expiryCallbacks) {
-		for (MessageGroupCallback callback : expiryCallbacks) {
-			registerMessageGroupExpiryCallback(callback);
-		}
-	}
-
-	public void registerMessageGroupExpiryCallback(MessageGroupCallback callback) {
-		expiryCallbacks.add(callback);
-	}
-
-	public int expireMessageGroups(long timeout) {
-		int count = 0;
-		long threshold = System.currentTimeMillis() - timeout;
-		for (MessageGroup group : this) {
-			if (group.getTimestamp() < threshold) {
-				count++;
-				expire(group);
-			}
-		}
-		return count;
-	}
-	
-	public abstract Iterator<MessageGroup> iterator();
-
-	private void expire(MessageGroup group) {
-	
-		RuntimeException exception = null;
-	
-		for (MessageGroupCallback callback : expiryCallbacks) {
-			try {
-				callback.execute(this, group);
-			} catch (RuntimeException e) {
-				if (exception == null) {
-					exception = e;
-				}
-				logger.error("Exception in expiry callback", e);
-			}
-		}
-	
-		if (exception != null) {
-			throw exception;
-		}
-	
-	}
-
+/*
+ * Copyright 2002-2010 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;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @author Dave Syer
+ * 
+ * @since 2.0
+ *
+ */
+public abstract class AbstractMessageGroupStore implements MessageGroupStore, Iterable<MessageGroup> {
+
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private Collection<MessageGroupCallback> expiryCallbacks = new LinkedHashSet<MessageGroupCallback>();
+
+	/**
+	 * 
+	 */
+	public AbstractMessageGroupStore() {
+		super();
+	}
+
+	/**
+	 * Convenient injection point for expiry callbacks in the message store. Each of the callbacks provided will simply
+	 * be registered with the store using {@link #registerMessageGroupExpiryCallback(MessageGroupCallback)}.
+	 * 
+	 * @param expiryCallbacks the expiry callbacks to add
+	 */
+	public void setExpiryCallbacks(Collection<MessageGroupCallback> expiryCallbacks) {
+		for (MessageGroupCallback callback : expiryCallbacks) {
+			registerMessageGroupExpiryCallback(callback);
+		}
+	}
+
+	public void registerMessageGroupExpiryCallback(MessageGroupCallback callback) {
+		expiryCallbacks.add(callback);
+	}
+
+	public int expireMessageGroups(long timeout) {
+		int count = 0;
+		long threshold = System.currentTimeMillis() - timeout;
+		for (MessageGroup group : this) {
+			if (group.getTimestamp() < threshold) {
+				count++;
+				expire(group);
+			}
+		}
+		return count;
+	}
+	
+	public abstract Iterator<MessageGroup> iterator();
+
+	private void expire(MessageGroup group) {
+	
+		RuntimeException exception = null;
+	
+		for (MessageGroupCallback callback : expiryCallbacks) {
+			try {
+				callback.execute(this, group);
+			} catch (RuntimeException e) {
+				if (exception == null) {
+					exception = e;
+				}
+				logger.error("Exception in expiry callback", e);
+			}
+		}
+	
+		if (exception != null) {
+			throw exception;
+		}
+	
+	}
+
 }

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

@@ -1,26 +1,26 @@
-/*
- * Copyright 2002-2010 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;
-
-/**
- * @author Dave Syer
- * 
- * @since 2.0
- *
- */
-public interface MessageGroupCallback {
-	
-	void execute(MessageGroupStore messageGroupStore, MessageGroup group);
-
-}
+/*
+ * Copyright 2002-2010 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;
+
+/**
+ * @author Dave Syer
+ * 
+ * @since 2.0
+ *
+ */
+public interface MessageGroupCallback {
+	
+	void execute(MessageGroupStore messageGroupStore, MessageGroup group);
+
+}

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

@@ -1,100 +1,100 @@
-/*
- * Copyright 2002-2010 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;
-
-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.context.ApplicationContext;
-import org.springframework.util.Assert;
-
-/**
- * Convenient configurable component to allow explicit timed expiry of {@link MessageGroup} instances in a
- * {@link MessageGroupStore}. This component provides a no-args {@link #run()} method that is useful for remote or timed
- * execution and a {@link #destroy()} method that can optionally be called on shutdown.
- * 
- * @author Dave Syer
- * 
- */
-public class MessageGroupStoreReaper implements Runnable, DisposableBean, InitializingBean {
-
-	private static Log logger = LogFactory.getLog(MessageGroupStoreReaper.class);
-
-	private MessageGroupStore messageGroupStore;
-	private boolean expireOnDestroy = false;
-	private long timeout = -1;
-
-	public MessageGroupStoreReaper(MessageGroupStore messageGroupStore) {
-		this.messageGroupStore = messageGroupStore;
-	}
-
-	public MessageGroupStoreReaper() {
-	}
-
-	/**
-	 * Flag to indicate that the stores should be expired when this component is destroyed (i.e. usuually when its
-	 * enclosing {@link ApplicationContext} is closed).
-	 * 
-	 * @param expireOnDestroy the flag value to set
-	 */
-	public void setExpireOnDestroy(boolean expireOnDestroy) {
-		this.expireOnDestroy = expireOnDestroy;
-	}
-
-	/**
-	 * Timeout in milliseconds (default -1). If negative then no groups ever time out. If greater than zero then all
-	 * groups older than that value are expired when this component is {@link #run()}.
-	 * 
-	 * @param timeout the timeout to set
-	 */
-	public void setTimeout(long timeout) {
-		this.timeout = timeout;
-	}
-
-	/**
-	 * A message group store to expire according the the other configurations.
-	 * 
-	 * @param messageGroupStore the {@link MessageGroupStore} to set
-	 */
-	public void setMessageGroupStore(MessageGroupStore messageGroupStore) {
-		this.messageGroupStore = messageGroupStore;
-	}
-
-	public void afterPropertiesSet() throws Exception {
-		Assert.state(messageGroupStore != null, "A MessageGroupStore must be provided");
-	}
-
-	public void destroy() throws Exception {
-		if (expireOnDestroy) {
-			logger.info("Expiring all messages from message group store: " + messageGroupStore);
-			messageGroupStore.expireMessageGroups(0);
-		}
-	}
-
-	/**
-	 * Expire all message groups older than the {@link #setTimeout(long) timeout} provided. Normally this method would
-	 * be executed by a scheduled task.
-	 */
-	public void run() {
-		if (timeout >= 0) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Expiring all messages older than timeout=" + timeout + " from message group store: "
-						+ messageGroupStore);
-			}
-			messageGroupStore.expireMessageGroups(timeout);
-		}
-	}
-
-}
+/*
+ * Copyright 2002-2010 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;
+
+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.context.ApplicationContext;
+import org.springframework.util.Assert;
+
+/**
+ * Convenient configurable component to allow explicit timed expiry of {@link MessageGroup} instances in a
+ * {@link MessageGroupStore}. This component provides a no-args {@link #run()} method that is useful for remote or timed
+ * execution and a {@link #destroy()} method that can optionally be called on shutdown.
+ * 
+ * @author Dave Syer
+ * 
+ */
+public class MessageGroupStoreReaper implements Runnable, DisposableBean, InitializingBean {
+
+	private static Log logger = LogFactory.getLog(MessageGroupStoreReaper.class);
+
+	private MessageGroupStore messageGroupStore;
+	private boolean expireOnDestroy = false;
+	private long timeout = -1;
+
+	public MessageGroupStoreReaper(MessageGroupStore messageGroupStore) {
+		this.messageGroupStore = messageGroupStore;
+	}
+
+	public MessageGroupStoreReaper() {
+	}
+
+	/**
+	 * Flag to indicate that the stores should be expired when this component is destroyed (i.e. usuually when its
+	 * enclosing {@link ApplicationContext} is closed).
+	 * 
+	 * @param expireOnDestroy the flag value to set
+	 */
+	public void setExpireOnDestroy(boolean expireOnDestroy) {
+		this.expireOnDestroy = expireOnDestroy;
+	}
+
+	/**
+	 * Timeout in milliseconds (default -1). If negative then no groups ever time out. If greater than zero then all
+	 * groups older than that value are expired when this component is {@link #run()}.
+	 * 
+	 * @param timeout the timeout to set
+	 */
+	public void setTimeout(long timeout) {
+		this.timeout = timeout;
+	}
+
+	/**
+	 * A message group store to expire according the the other configurations.
+	 * 
+	 * @param messageGroupStore the {@link MessageGroupStore} to set
+	 */
+	public void setMessageGroupStore(MessageGroupStore messageGroupStore) {
+		this.messageGroupStore = messageGroupStore;
+	}
+
+	public void afterPropertiesSet() throws Exception {
+		Assert.state(messageGroupStore != null, "A MessageGroupStore must be provided");
+	}
+
+	public void destroy() throws Exception {
+		if (expireOnDestroy) {
+			logger.info("Expiring all messages from message group store: " + messageGroupStore);
+			messageGroupStore.expireMessageGroups(0);
+		}
+	}
+
+	/**
+	 * Expire all message groups older than the {@link #setTimeout(long) timeout} provided. Normally this method would
+	 * be executed by a scheduled task.
+	 */
+	public void run() {
+		if (timeout >= 0) {
+			if (logger.isDebugEnabled()) {
+				logger.debug("Expiring all messages older than timeout=" + timeout + " from message group store: "
+						+ messageGroupStore);
+			}
+			messageGroupStore.expireMessageGroups(timeout);
+		}
+	}
+
+}

spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java

@@ -1,80 +1,80 @@
-/*
- * Copyright 2002-2010 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.aggregator.integration;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.Message;
-import org.springframework.integration.annotation.Aggregator;
-import org.springframework.integration.annotation.CorrelationStrategy;
-import org.springframework.integration.annotation.ReleaseStrategy;
-import org.springframework.integration.channel.DirectChannel;
-import org.springframework.integration.core.MessageBuilder;
-import org.springframework.integration.core.PollableChannel;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author Mark Fisher
- */
-@ContextConfiguration
-@RunWith(SpringJUnit4ClassRunner.class)
-public class AnnotationAggregatorTests {
-
-	@Autowired
-	DirectChannel input;
-
-	@Autowired
-	PollableChannel output;
-
-
-	@Test
-	public void testAggregationWithAnnotationStrategies() {
-		input.send(MessageBuilder.withPayload("a").build());
-		input.send(MessageBuilder.withPayload("b").build());
-		@SuppressWarnings("unchecked")
-		Message<String> result = (Message<String>) output.receive();
-		String payload = result.getPayload();
-		assertTrue("Wrong payload: "+payload, payload.contains("Payload=a"));
-		assertTrue("Wrong payload: "+payload, payload.contains("Payload=b"));
-	}
-
-	@SuppressWarnings("unused")
-	private static class TestAggregator {
-
-		@Aggregator
-		public Message<?> aggregate(final List<Message<?>> messages) {
-			return MessageBuilder.withPayload(messages.toString()).build();
-		}
-		
-		@ReleaseStrategy
-		public boolean release(final List<Message<?>> messages) {
-			return messages.size()>1;
-		}
-		
-		@CorrelationStrategy
-		public Object getKey(Message<?> message) {
-			return "1";
-		}
-	}
-
-}
+/*
+ * Copyright 2002-2010 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.aggregator.integration;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.Message;
+import org.springframework.integration.annotation.Aggregator;
+import org.springframework.integration.annotation.CorrelationStrategy;
+import org.springframework.integration.annotation.ReleaseStrategy;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.core.MessageBuilder;
+import org.springframework.integration.core.PollableChannel;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mark Fisher
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class AnnotationAggregatorTests {
+
+	@Autowired
+	DirectChannel input;
+
+	@Autowired
+	PollableChannel output;
+
+
+	@Test
+	public void testAggregationWithAnnotationStrategies() {
+		input.send(MessageBuilder.withPayload("a").build());
+		input.send(MessageBuilder.withPayload("b").build());
+		@SuppressWarnings("unchecked")
+		Message<String> result = (Message<String>) output.receive();
+		String payload = result.getPayload();
+		assertTrue("Wrong payload: "+payload, payload.contains("Payload=a"));
+		assertTrue("Wrong payload: "+payload, payload.contains("Payload=b"));
+	}
+
+	@SuppressWarnings("unused")
+	private static class TestAggregator {
+
+		@Aggregator
+		public Message<?> aggregate(final List<Message<?>> messages) {
+			return MessageBuilder.withPayload(messages.toString()).build();
+		}
+		
+		@ReleaseStrategy
+		public boolean release(final List<Message<?>> messages) {
+			return messages.size()>1;
+		}
+		
+		@CorrelationStrategy
+		public Object getKey(Message<?> message) {
+			return "1";
+		}
+	}
+
+}

spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
-	<channel id="pojoOutput">
-		<queue/>
-	</channel>
-
-	<channel id="defaultOutput">
-		<queue/>
-	</channel>
-
-	<splitter input-channel="pojoInput" output-channel="pojoAggregator"/>
-
-	<aggregator input-channel="pojoAggregator" output-channel="pojoOutput" method="aggregate">
-		<beans:bean class="org.springframework.integration.aggregator.integration.MethodInvokingAggregatorReturningMessageTests$TestAggregator"/>
-	</aggregator>
-
-	<splitter input-channel="defaultInput" output-channel="defaultAggregator"/>
-
-	<aggregator input-channel="defaultAggregator" output-channel="defaultOutput"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<channel id="pojoOutput">
+		<queue/>
+	</channel>
+
+	<channel id="defaultOutput">
+		<queue/>
+	</channel>
+
+	<splitter input-channel="pojoInput" output-channel="pojoAggregator"/>
+
+	<aggregator input-channel="pojoAggregator" output-channel="pojoOutput" method="aggregate">
+		<beans:bean class="org.springframework.integration.aggregator.integration.MethodInvokingAggregatorReturningMessageTests$TestAggregator"/>
+	</aggregator>
+
+	<splitter input-channel="defaultInput" output-channel="defaultAggregator"/>
+
+	<aggregator input-channel="defaultAggregator" output-channel="defaultOutput"/>
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/channel/config/AutoGeneratedChannelTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<transformer id="transformer"
 			input-channel="input"

spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests-context.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/context
 			http://www.springframework.org/schema/context/spring-context.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<context:property-placeholder
 		location="/org/springframework/integration/channel/config/ChannelCapacityPlaceholderTests.properties"/>

spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests-context.xml

@@ -7,7 +7,7 @@
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="dispatcherAttribute" dispatcher="failover"/>
-
+
 	<channel id="taskExecutorOnly">
 		<dispatcher task-executor="taskExecutor"/>
 	</channel>

spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelInterceptorParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channelWithInterceptorRef">
 		<queue capacity="5"/>
@@ -26,5 +26,5 @@
 	</channel>
 
 	<beans:bean id="interceptor" class="org.springframework.integration.config.TestChannelInterceptor"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelParserTests.xml

@@ -11,7 +11,7 @@
 	</channel>
 
 	<channel id="defaultChannel" />
-	
+	
 	<channel id="channelWithFailoverAttribute" dispatcher="failover"/>
 
 	<channel id="channelWithCustomQueue">

spring-integration-core/src/test/java/org/springframework/integration/channel/config/channelWithoutId.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:channel/>
 

spring-integration-core/src/test/java/org/springframework/integration/channel/config/priorityChannelParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="priorityChannelWithDefaultComparator">
 		<priority-queue capacity="10"/>
@@ -21,5 +21,5 @@
 
 	<beans:bean id="payloadComparator"
 			class="org.springframework.integration.channel.MessagePayloadTestComparator"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/channel/config/rendezvousChannelParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel">
 		<rendezvous-queue/>

spring-integration-core/src/test/java/org/springframework/integration/channel/directChannelParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="channel"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests-context.xml

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
-	<channel id="output">
-		<queue capacity="5" />
-	</channel>
-
-	<channel id="input" />
-
-	<aggregator id="aggregator" ref="aggregatorBean"
-		input-channel="input" output-channel="output" message-store="messageStore" send-partial-result-on-expiry="true"/>
-		
-	<beans:bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore"/>
-
-	<beans:bean id="aggregatorBean"
-		class="org.springframework.integration.config.TestAggregatorBean" />
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<channel id="output">
+		<queue capacity="5" />
+	</channel>
+
+	<channel id="input" />
+
+	<aggregator id="aggregator" ref="aggregatorBean"
+		input-channel="input" output-channel="output" message-store="messageStore" send-partial-result-on-expiry="true"/>
+		
+	<beans:bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore"/>
+
+	<beans:bean id="aggregatorBean"
+		class="org.springframework.integration.config.TestAggregatorBean" />
+
+</beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests-context.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
+
 	<channel id="queueChannel">
 		<queue capacity="1"/>
 	</channel>
@@ -24,5 +24,5 @@
 	<beans:bean id="consumer" class="org.springframework.integration.config.TestConsumer"/>
 
 	<beans:bean id="testBean" class="org.springframework.integration.config.TestBean"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests-context.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration

spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration

spring-integration-core/src/test/java/org/springframework/integration/config/TopLevelSelectorParserTests-context.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration

spring-integration-core/src/test/java/org/springframework/integration/config/aggregatorParserTests.xml

@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
-	<channel id="outputChannel">
-		<queue capacity="5"/>
-	</channel>
-	<channel id="discardChannel">
-		<queue capacity="5"/>
-	</channel>
-
-	<channel id="aggregatorWithReferenceInput"/>
-	<aggregator id="aggregatorWithReference" ref="aggregatorBean"
-              input-channel="aggregatorWithReferenceInput" output-channel="outputChannel"/>
-
-	<channel id="completelyDefinedAggregatorInput"/>
-	<aggregator id="completelyDefinedAggregator"
-		input-channel="completelyDefinedAggregatorInput"
-		output-channel="outputChannel"
-		discard-channel="discardChannel"
-		ref="aggregatorBean" 
-		release-strategy="releaseStrategy"
-        correlation-strategy="correlationStrategy"
-		send-timeout="86420000"
-		send-partial-result-on-expiry="true"/>
-
-	<channel id="aggregatorWithExpressionsInput"/>
-	<channel id="aggregatorWithExpressionsOutput"/>
-	<aggregator id="aggregatorWithExpressions"
-		input-channel="aggregatorWithExpressionsInput"
-		output-channel="aggregatorWithExpressionsOutput"
-		expression="?[payload.startsWith('1')].![payload]"
-		release-strategy-expression="#root.size()>2"
-        correlation-strategy-expression="headers['foo']"/>
-
-	<channel id="aggregatorWithReferenceAndMethodInput"/>
-	<aggregator id="aggregatorWithReferenceAndMethod"
-		ref="adderBean"
-		method="add"
-		input-channel="aggregatorWithReferenceAndMethodInput"
-		output-channel="outputChannel"/>
-
-	<channel id="aggregatorWithPojoReleaseStrategyInput"/>
-	<aggregator id="aggregatorWithPojoReleaseStrategy"
-		input-channel="aggregatorWithPojoReleaseStrategyInput"
-		output-channel="outputChannel"
-		ref="adderBean"
-		method="add"
-		release-strategy="pojoReleaseStrategy"
-		release-strategy-method="checkCompleteness"/>
-
-	<beans:bean id="aggregatorBean"
-		class="org.springframework.integration.config.TestAggregatorBean" />
-
-	<beans:bean id="adderBean"
-		class="org.springframework.integration.config.Adder" />
-
-	<beans:bean id="releaseStrategy"
-		class="org.springframework.integration.config.TestReleaseStrategy" />
-
-    <beans:bean id="correlationStrategy" class="org.springframework.integration.config.TestCorrelationStrategy"/>
-
-	<beans:bean id="pojoReleaseStrategy"
-		class="org.springframework.integration.config.MaxValueReleaseStrategy">
-		<beans:constructor-arg value="10" />
-	</beans:bean>
-
-</beans:beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:beans="http://www.springframework.org/schema/beans"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
+
+	<channel id="outputChannel">
+		<queue capacity="5"/>
+	</channel>
+	<channel id="discardChannel">
+		<queue capacity="5"/>
+	</channel>
+
+	<channel id="aggregatorWithReferenceInput"/>
+	<aggregator id="aggregatorWithReference" ref="aggregatorBean"
+              input-channel="aggregatorWithReferenceInput" output-channel="outputChannel"/>
+
+	<channel id="completelyDefinedAggregatorInput"/>
+	<aggregator id="completelyDefinedAggregator"
+		input-channel="completelyDefinedAggregatorInput"
+		output-channel="outputChannel"
+		discard-channel="discardChannel"
+		ref="aggregatorBean" 
+		release-strategy="releaseStrategy"
+        correlation-strategy="correlationStrategy"
+		send-timeout="86420000"
+		send-partial-result-on-expiry="true"/>
+
+	<channel id="aggregatorWithExpressionsInput"/>
+	<channel id="aggregatorWithExpressionsOutput"/>
+	<aggregator id="aggregatorWithExpressions"
+		input-channel="aggregatorWithExpressionsInput"
+		output-channel="aggregatorWithExpressionsOutput"
+		expression="?[payload.startsWith('1')].![payload]"
+		release-strategy-expression="#root.size()>2"
+        correlation-strategy-expression="headers['foo']"/>
+
+	<channel id="aggregatorWithReferenceAndMethodInput"/>
+	<aggregator id="aggregatorWithReferenceAndMethod"
+		ref="adderBean"
+		method="add"
+		input-channel="aggregatorWithReferenceAndMethodInput"
+		output-channel="outputChannel"/>
+
+	<channel id="aggregatorWithPojoReleaseStrategyInput"/>
+	<aggregator id="aggregatorWithPojoReleaseStrategy"
+		input-channel="aggregatorWithPojoReleaseStrategyInput"
+		output-channel="outputChannel"
+		ref="adderBean"
+		method="add"
+		release-strategy="pojoReleaseStrategy"
+		release-strategy-method="checkCompleteness"/>
+
+	<beans:bean id="aggregatorBean"
+		class="org.springframework.integration.config.TestAggregatorBean" />
+
+	<beans:bean id="adderBean"
+		class="org.springframework.integration.config.Adder" />
+
+	<beans:bean id="releaseStrategy"
+		class="org.springframework.integration.config.TestReleaseStrategy" />
+
+    <beans:bean id="correlationStrategy" class="org.springframework.integration.config.TestCorrelationStrategy"/>
+
+	<beans:bean id="pojoReleaseStrategy"
+		class="org.springframework.integration.config.MaxValueReleaseStrategy">
+		<beans:constructor-arg value="10" />
+	</beans:bean>
+
+</beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/annotation/messageParameterAnnotatedEndpointTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/annotation/serviceActivatorAnnotationPostProcessorTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<annotation-config/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/annotation/simpleAnnotatedEndpointTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/annotation/typeConvertingEndpointTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:integration="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<integration:annotation-config/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithAsyncEventMulticaster.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<application-event-multicaster/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithDefaults.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithErrorChannel.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="errorChannel"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithTaskScheduler.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="test"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/messageBusWithoutAsyncEventMulticaster.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration

spring-integration-core/src/test/java/org/springframework/integration/config/simpleEndpointTests.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
+
 	<channel id="testChannel">
 		<queue capacity="50"/>
 	</channel>
@@ -20,5 +20,5 @@
 	<beans:bean id="testHandler" class="org.springframework.integration.config.TestHandler">
 		<beans:constructor-arg value="1"/>
 	</beans:bean>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<header-enricher input-channel="input" ref="testBean" method="enrich"> 
 		<header name="other" value="zzz"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<header-filter input-channel="input" header-names="a,d, c"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<beans:bean id="abstractParent" class="org.springframework.integration.config.xml.NestedChainParserTests$ParentTestBean" abstract="true">
 		<beans:property name="chain">

spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="directInput"/>
 

spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithId.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="defaultPollerWithId" default="true">
 		<interval-trigger interval="5000"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/defaultPollerWithoutId.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller default="true">
 		<interval-trigger interval="5000"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel">
 		<queue capacity="100"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/multipleDefaultPollers.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="defaultPoller1" default="true">
 		<interval-trigger interval="3000"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithAdviceChain.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="poller">
 		<interval-trigger interval="5000"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/pollerWithReceiveTimeout.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<poller id="poller" receive-timeout="1234">
 		<interval-trigger interval="5" time-unit="SECONDS"/>

spring-integration-core/src/test/java/org/springframework/integration/config/xml/topLevelPollerWithoutId.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationMandatoryTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
@@ -33,5 +33,5 @@
 	<beans:bean id="testBean" class="org.springframework.integration.dispatcher.TestBean"/>
 
 	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationNotSupportedTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
@@ -29,5 +29,5 @@
 	<beans:bean id="testBean" class="org.springframework.integration.dispatcher.TestBean"/>
 
 	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiredTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
@@ -28,6 +28,6 @@
 
 	<beans:bean id="testBean" class="org.springframework.integration.dispatcher.TestBean"/>
 
-	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
+	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
 
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationRequiresNewTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
@@ -29,5 +29,5 @@
 	<beans:bean id="testBean" class="org.springframework.integration.dispatcher.TestBean"/>
 
 	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/propagationSupportsTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input">
 		<queue capacity="1"/>
@@ -29,5 +29,5 @@
 	<beans:bean id="testBean" class="org.springframework.integration.dispatcher.TestBean"/>
 
 	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/transactionTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="badInput">
 		<queue capacity="1"/>
@@ -42,5 +42,5 @@
 	<beans:bean id="testBean" class="org.springframework.integration.dispatcher.TestBean"/>
 
 	<beans:bean id="txManager" class="org.springframework.integration.util.TestTransactionManager"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml

@@ -5,7 +5,7 @@
 	xmlns:task="http://www.springframework.org/schema/task"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task.xsd">
 
 	<si:channel id="errorChannel">
 		<si:queue capacity="10"/>
@@ -15,6 +15,6 @@
 		<property name="taskExecutor" ref="taskExecutor"/>
 	</bean>
 
-	<task:executor id="taskExecutor" pool-size="1" rejection-policy="CALLER_RUNS"/>
+	<task:executor id="taskExecutor" pool-size="1" rejection-policy="CALLER_RUNS"/>
 
 </beans>

spring-integration-core/src/test/java/org/springframework/integration/endpoint/returnAddressTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:si="http://www.springframework.org/schema/integration"
+	xmlns:si="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<si:poller id="poller" default="true">
 		<si:interval-trigger interval="50"/>
@@ -30,5 +30,5 @@
 	<si:service-activator input-channel="channel4" ref="testBean" method="duplicate" output-channel="replyChannel"/>
 
 	<bean id="testBean" class="org.springframework.integration.endpoint.TestBean"/>
-
+
 </beans>

spring-integration-core/src/test/java/org/springframework/integration/filter/filterContextTests.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
+
 	<channel id="input"/>
 
 	<channel id="output">
@@ -19,5 +19,5 @@
 			output-channel="output"/>
 
 	<beans:bean id="testBean" class="org.springframework.integration.filter.TestBean"/>
-
+
 </beans:beans>

spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayAutowiring.xml

@@ -7,7 +7,7 @@
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-	<context:annotation-config/>
+	<context:annotation-config/>
 
 	<beans:bean id="testClient" class="org.springframework.integration.gateway.GatewayProxyFactoryBeanTests$TestClient"/>
 

spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayWithRendezvousChannel.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel"/>
 

spring-integration-core/src/test/java/org/springframework/integration/gateway/gatewayWithResponseCorrelator.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="requestChannel"/>
 

spring-integration-core/src/test/java/org/springframework/integration/router/config/routerParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="input"/>
 

spring-integration-core/src/test/java/org/springframework/integration/router/config/splitterAggregatorTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="numbers"/>
 	<channel id="splits"/>

spring-integration-core/src/test/java/org/springframework/integration/router/config/splitterParserTests.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
-			http://www.springframework.org/schema/integration/spring-integration.xsd">
+			http://www.springframework.org/schema/integration/spring-integration.xsd">
 
 	<channel id="output">
 		<queue capacity="10"/>

spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreReaperTests-context.xml

@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:task="http://www.springframework.org/schema/task"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
-
-
-	<bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore">
-		<property name="expiryCallbacks">
-			<bean class="org.springframework.integration.store.MessageStoreReaperTests$ExpiryCallback"/>
-		</property>
-	</bean>
-	
-	<bean id="reaper" class="org.springframework.integration.store.MessageGroupStoreReaper">
-		<property name="messageGroupStore" ref="messageStore"/>
-		<property name="timeout" value="10"/>
-	</bean>
-	
-	<task:scheduled-tasks scheduler="scheduler">	
-		<task:scheduled ref="reaper" method="run" fixed-rate="100"/>
-	</task:scheduled-tasks>
-	
-	<task:scheduler id="scheduler"/>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:task="http://www.springframework.org/schema/task"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+	http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd">
+
+
+	<bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore">
+		<property name="expiryCallbacks">
+			<bean class="org.springframework.integration.store.MessageStoreReaperTests$ExpiryCallback"/>
+		</property>
+	</bean>
+	
+	<bean id="reaper" class="org.springframework.integration.store.MessageGroupStoreReaper">
+		<property name="messageGroupStore" ref="messageStore"/>
+		<property name="timeout" value="10"/>
+	</bean>
+	
+	<task:scheduled-tasks scheduler="scheduler">	
+		<task:scheduled ref="reaper" method="run" fixed-rate="100"/>
+	</task:scheduled-tasks>
+	
+	<task:scheduler id="scheduler"/>
+
+</beans>

spring-integration-core/src/test/java/org/springframework/integration/transformer/transformerContextTests.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:beans="http://www.springframework.org/schema/beans"
+	xmlns:beans="http://www.springframework.org/schema/beans"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd">
-
+
 	<channel id="input"/>
 
 	<channel id="output">
@@ -16,5 +16,5 @@
 	<transformer input-channel="input" ref="testBean" method="upperCase" output-channel="output"/>
 
 	<beans:bean id="testBean" class="org.springframework.integration.transformer.TestBean"/>
-
+
 </beans:beans>