Index: pom.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- pom.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ pom.xml	(revision )
@@ -900,55 +900,61 @@
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-core</artifactId>
-			<version>2.1.1.RELEASE</version>
+			<version>4.1.6.RELEASE</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-jms</artifactId>
-			<version>2.1.1.RELEASE</version>
+			<version>4.1.6.RELEASE</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-event</artifactId>
-			<version>2.1.1.RELEASE</version>
+			<version>4.1.6.RELEASE</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-file</artifactId>
-			<version>2.1.1.RELEASE</version>
+			<version>4.1.6.RELEASE</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
 			<artifactId>spring-integration-feed</artifactId>
-			<version>2.1.1.RELEASE</version>
+			<version>4.1.6.RELEASE</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
-			<artifactId>activemq-core</artifactId>
-			<version>5.6.0</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.fusesource.fuse-extra</groupId>
-					<artifactId>fusemq-leveldb</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>activemq-kahadb-store</artifactId>
+			<version>5.12.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
+			<artifactId>activemq-spring</artifactId>
+			<version>5.12.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-pool</artifactId>
-			<version>5.6.0</version>
+			<version>5.12.0</version>
 		</dependency>
 
 		<dependency>
+			<groupId>org.jolokia</groupId>
+			<artifactId>jolokia-spring</artifactId>
+			<version>1.3.1</version>
+		</dependency>
+
+		<dependency>
 			<groupId>org.apache.xbean</groupId>
 			<artifactId>xbean-spring</artifactId>
-			<version>3.11</version>
+			<version>4.3</version>
 		</dependency>
 
 		<!-- Togglz core module (mandatory) -->
Index: src/main/resources/spring/sgf/gateway/profile/esg/integration/jms-context.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/sgf/gateway/profile/esg/integration/jms-context.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/resources/spring/sgf/gateway/profile/esg/integration/jms-context.xml	(revision )
@@ -6,10 +6,13 @@
                            http://activemq.apache.org/schema/core
                            http://activemq.apache.org/schema/core/activemq-core.xsd">
 
-	<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localembeddedbroker" dataDirectory="${gateway.home}/data/active-mq" persistent="true">
+	<broker xmlns="http://activemq.apache.org/schema/core" useJmx="true" brokerName="localembeddedbroker" dataDirectory="${gateway.home}/data/active-mq" persistent="true">
 		<transportConnectors>
 			<transportConnector name="vm" uri="vm://localembeddedbroker"/>
 		</transportConnectors>
+		<managementContext>
+			<managementContext connectorPort="1099" jmxDomainName="localhost"/>
+		</managementContext>
 		<systemUsage>
 			<!-- setting sendFailIfNoSpace false means the broker will block message producers when the message usage limit has been reached
 				 until message consumers have had time to reduce the message volume -->
Index: src/main/resources/spring/sgf/gateway/profile/esg/integration/common-context.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/sgf/gateway/profile/esg/integration/common-context.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/resources/spring/sgf/gateway/profile/esg/integration/common-context.xml	(revision )
@@ -6,9 +6,9 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
                            http://www.springframework.org/schema/integration
-                           http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+                           http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
                            http://www.springframework.org/schema/integration/jms
-                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd">
+                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd">
 
 	<bean id="emailIntegrationExceptionService" class="sgf.gateway.integration.service.impl.EmailIntegrationExceptionServiceImpl">
 		<constructor-arg name="exceptionService" ref="exceptionHandlingService"/>
Index: src/main/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImpl.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImpl.java	(revision )
@@ -1,6 +1,6 @@
 package sgf.gateway.integration.publishing.service.impl;
 
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 import sgf.gateway.publishing.thredds.ThreddsDataServerException;
 import sgf.gateway.publishing.thredds.ThreddsPublishingException;
Index: src/main/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImplLogger.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImplLogger.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImplLogger.java	(revision )
@@ -2,7 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 
 public class ThreddsPublishingFailureIntegrationExceptionServiceImplLogger implements IntegrationExceptionService {
Index: src/main/java/sgf/gateway/integration/service/IntegrationExceptionService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/service/IntegrationExceptionService.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/service/IntegrationExceptionService.java	(revision )
@@ -1,9 +1,8 @@
 package sgf.gateway.integration.service;
 
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.MessagingException;
 
 public interface IntegrationExceptionService {
-	
+
 	void handleException(MessagingException exception);
-	
 }
Index: src/main/java/sgf/gateway/integration/service/impl/PayloadIntegrationExceptionServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/service/impl/PayloadIntegrationExceptionServiceImpl.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/service/impl/PayloadIntegrationExceptionServiceImpl.java	(revision )
@@ -1,7 +1,7 @@
 package sgf.gateway.integration.service.impl;
 
-import org.springframework.integration.Message;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.ErrorLogService;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 
Index: src/main/webapp/WEB-INF/web.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/webapp/WEB-INF/web.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/webapp/WEB-INF/web.xml	(revision )
@@ -148,6 +148,17 @@
 		<url-pattern>/myopenid/*</url-pattern>
 	</servlet-mapping>
 
+	<servlet>
+		<servlet-name>jolokia-agent</servlet-name>
+		<servlet-class>org.jolokia.http.AgentServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>jolokia-agent</servlet-name>
+		<url-pattern>/jolokia/*</url-pattern>
+	</servlet-mapping>
+
 	<!-- View for web application root URL -->
 	<welcome-file-list>
 		<welcome-file>index.jsp</welcome-file>
Index: src/main/resources/spring/sgf/gateway/profile/esg/integration/metrics/gridftp-context.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/sgf/gateway/profile/esg/integration/metrics/gridftp-context.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/resources/spring/sgf/gateway/profile/esg/integration/metrics/gridftp-context.xml	(revision )
@@ -7,11 +7,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
                            http://www.springframework.org/schema/integration
-                           http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+                           http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
                            http://www.springframework.org/schema/integration/file
                            http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
                            http://www.springframework.org/schema/integration/jms
-                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd">
+                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd">
 
 	<bean id="gridFTPMetricsLogFileQueue" class="org.apache.activemq.command.ActiveMQQueue">
 		<constructor-arg value="queue.metrics.gridftp.logfile"/>
Index: src/main/java/sgf/gateway/integration/service/FileLineReaderService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/service/FileLineReaderService.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/service/FileLineReaderService.java	(revision )
@@ -1,8 +1,8 @@
 package sgf.gateway.integration.service;
 
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageChannel;
-import org.springframework.integration.MessageHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHeaders;
 import org.springframework.integration.support.MessageBuilder;
 
 import java.io.BufferedReader;
Index: src/main/java/sgf/gateway/integration/message/SprIntDeadLetterLogger.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/message/SprIntDeadLetterLogger.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/message/SprIntDeadLetterLogger.java	(revision )
@@ -2,7 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.integration.Message;
+import org.springframework.messaging.Message;
 
 public class SprIntDeadLetterLogger implements DeadLetterHandler {
 
Index: src/main/java/sgf/gateway/integration/service/impl/ChainIntegrationExceptionServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/service/impl/ChainIntegrationExceptionServiceImpl.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/service/impl/ChainIntegrationExceptionServiceImpl.java	(revision )
@@ -1,7 +1,7 @@
 package sgf.gateway.integration.service.impl;
 
-import org.springframework.integration.Message;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 
 public class ChainIntegrationExceptionServiceImpl implements IntegrationExceptionService {
\ No newline at end of file
Index: src/main/java/sgf/gateway/integration/service/impl/EmailIntegrationExceptionServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/service/impl/EmailIntegrationExceptionServiceImpl.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/service/impl/EmailIntegrationExceptionServiceImpl.java	(revision )
@@ -1,7 +1,7 @@
 package sgf.gateway.integration.service.impl;
 
-import org.springframework.integration.Message;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 import sgf.gateway.service.messaging.ExceptionHandlingService;
 import sgf.gateway.service.messaging.UnhandledException;
Index: src/main/java/sgf/gateway/integration/metrics/service/impl/LogEntryIntegrationExceptionServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/metrics/service/impl/LogEntryIntegrationExceptionServiceImpl.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/metrics/service/impl/LogEntryIntegrationExceptionServiceImpl.java	(revision )
@@ -1,28 +1,28 @@
 package sgf.gateway.integration.metrics.service.impl;
 
-import org.springframework.integration.Message;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.metrics.FileDownloadPayload;
 import sgf.gateway.integration.service.ErrorLogService;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 
 public class LogEntryIntegrationExceptionServiceImpl implements IntegrationExceptionService {
-	
+
 	private final ErrorLogService errorLogService;
-	
+
 	public LogEntryIntegrationExceptionServiceImpl(ErrorLogService errorLogService) {
 		super();
 		this.errorLogService = errorLogService;
 	}
-	
+
 	@Override
 	public void handleException(MessagingException exception) {
-		
+
 		Message<?> failedMessage = exception.getFailedMessage();
 		Object payload = failedMessage.getPayload();
-		
+
 		String logEntry = ((FileDownloadPayload)payload).getLogEntry();
 
-        errorLogService.error(logEntry);
+		errorLogService.error(logEntry);
 	}
 }
Index: src/test/java/sgf/gateway/integration/message/ChainDeadLetterHandlerTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/test/java/sgf/gateway/integration/message/ChainDeadLetterHandlerTest.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/test/java/sgf/gateway/integration/message/ChainDeadLetterHandlerTest.java	(revision )
@@ -2,8 +2,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
Index: src/main/resources/spring/sgf/gateway/profile/esg/integration/publishing/publishing-context.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/sgf/gateway/profile/esg/integration/publishing/publishing-context.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/resources/spring/sgf/gateway/profile/esg/integration/publishing/publishing-context.xml	(revision )
@@ -7,11 +7,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
                            http://www.springframework.org/schema/integration
-                           http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+                           http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
                            http://www.springframework.org/schema/integration/event
                            http://www.springframework.org/schema/integration/event/spring-integration-event-2.1.xsd
                            http://www.springframework.org/schema/integration/jms
-                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd">
+                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd">
 
 	<bean id="threddsPublishingErrorHandler" class="sgf.gateway.integration.message.JMSChannelMessagingErrorHandler">
 		<constructor-arg name="exceptionService">
Index: src/main/java/sgf/gateway/integration/message/ChainDeadLetterHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/message/ChainDeadLetterHandler.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/message/ChainDeadLetterHandler.java	(revision )
@@ -1,6 +1,6 @@
 package sgf.gateway.integration.message;
 
-import org.springframework.integration.Message;
+import org.springframework.messaging.Message;
 
 public abstract class ChainDeadLetterHandler implements DeadLetterHandler {
 
Index: src/test/java/sgf/gateway/integration/publishing/ThreddsPublishingFailureDeadLetterHandlerTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/test/java/sgf/gateway/integration/publishing/ThreddsPublishingFailureDeadLetterHandlerTest.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/test/java/sgf/gateway/integration/publishing/ThreddsPublishingFailureDeadLetterHandlerTest.java	(revision )
@@ -3,8 +3,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.safehaus.uuid.UUID;
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageHeaders;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
 import sgf.gateway.integration.message.DeadLetterHandler;
 import sgf.gateway.publishing.thredds.ThreddsDataServer;
 import sgf.gateway.publishing.thredds.ThreddsDataServerException;
Index: src/main/resources/spring/sgf/gateway/profile/esg/integration/metrics/tds-context.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/sgf/gateway/profile/esg/integration/metrics/tds-context.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/resources/spring/sgf/gateway/profile/esg/integration/metrics/tds-context.xml	(revision )
@@ -7,11 +7,11 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
                            http://www.springframework.org/schema/integration
-                           http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+                           http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
                            http://www.springframework.org/schema/integration/file
                            http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
                            http://www.springframework.org/schema/integration/jms
-                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd">
+                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd">
 
 	<bean id="tdsMetricsLogFileQueue" class="org.apache.activemq.command.ActiveMQQueue">
 		<constructor-arg value="queue.metrics.tds.logfile"/>
Index: src/main/java/sgf/gateway/integration/message/DeadLetterHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/message/DeadLetterHandler.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/message/DeadLetterHandler.java	(revision )
@@ -1,6 +1,6 @@
 package sgf.gateway.integration.message;
 
-import org.springframework.integration.Message;
+import org.springframework.messaging.Message;
 
 public interface DeadLetterHandler {
 	public void handle(Message message);
Index: src/main/java/sgf/gateway/integration/message/JMSChannelMessagingErrorHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/message/JMSChannelMessagingErrorHandler.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/message/JMSChannelMessagingErrorHandler.java	(revision )
@@ -2,7 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.MessagingException;
 import org.springframework.util.ErrorHandler;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 
Index: src/main/java/sgf/gateway/integration/service/impl/AggregateIntegrationExceptionServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/service/impl/AggregateIntegrationExceptionServiceImpl.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/service/impl/AggregateIntegrationExceptionServiceImpl.java	(revision )
@@ -1,6 +1,6 @@
 package sgf.gateway.integration.service.impl;
 
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 
 import java.util.List;
Index: src/main/java/sgf/gateway/integration/publishing/ThreddsPublishingFailureDeadLetterHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/sgf/gateway/integration/publishing/ThreddsPublishingFailureDeadLetterHandler.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/java/sgf/gateway/integration/publishing/ThreddsPublishingFailureDeadLetterHandler.java	(revision )
@@ -1,6 +1,6 @@
 package sgf.gateway.integration.publishing;
 
-import org.springframework.integration.Message;
+import org.springframework.messaging.Message;
 import sgf.gateway.integration.message.ChainDeadLetterHandler;
 import sgf.gateway.integration.message.DeadLetterHandler;
 import sgf.gateway.publishing.thredds.ThreddsDataServer;
Index: src/test/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImplTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/test/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImplTest.java	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/test/java/sgf/gateway/integration/publishing/service/impl/ThreddsPublishingFailureIntegrationExceptionServiceImplTest.java	(revision )
@@ -2,9 +2,9 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.integration.Message;
-import org.springframework.integration.MessageHeaders;
-import org.springframework.integration.MessagingException;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.MessagingException;
 import sgf.gateway.integration.service.IntegrationExceptionService;
 import sgf.gateway.integration.thredds.ThreddsDatasetPayload;
 import sgf.gateway.publishing.thredds.ThreddsDataServerException;
Index: src/main/resources/spring/sgf/gateway/profile/cadis/integration/common-context.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/resources/spring/sgf/gateway/profile/cadis/integration/common-context.xml	(revision e15a51ca63b9898211cbe990fba163ba09efbf3e)
+++ src/main/resources/spring/sgf/gateway/profile/cadis/integration/common-context.xml	(revision )
@@ -6,9 +6,9 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
                            http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
                            http://www.springframework.org/schema/integration
-                           http://www.springframework.org/schema/integration/spring-integration-2.1.xsd
+                           http://www.springframework.org/schema/integration/spring-integration-4.1.xsd
                            http://www.springframework.org/schema/integration/jms
-                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd">
+                           http://www.springframework.org/schema/integration/jms/spring-integration-jms-4.1.xsd">
 
 	<bean id="datasetLoadService" class="sgf.gateway.integration.service.DatasetLoadService">
 		<constructor-arg name="datasetService" ref="cadisDatasetService"/>