From 84aefe6766b59840d78e23c5ed857383c7d56421 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@vmware.com>
Date: Wed, 10 Oct 2012 16:22:00 -0400
Subject: [PATCH] INTSAMPLES-94 Monitoring Fixes

- Missing imports
- Remove schema version in config file
- Update to RC1
- Use <context:mbean-server/>
---
 intermediate/monitoring/pom.xml                             | 2 +-
 .../service/impl/DefaultTwitterService.java                 | 2 ++
 .../spring/integration/spring-integration-context.xml       | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml
index ec959d4f..70f12736 100644
--- a/intermediate/monitoring/pom.xml
+++ b/intermediate/monitoring/pom.xml
@@ -16,7 +16,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.integration.version>2.2.0.M3</spring.integration.version>
+        <spring.integration.version>2.2.0.RC1</spring.integration.version>
         <org.springframework-version>3.1.1.RELEASE</org.springframework-version>
 		<log4j.version>1.2.16</log4j.version>
         <junit.version>4.10</junit.version>
diff --git a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java
index 982b3b6a..e9160f25 100644
--- a/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java
+++ b/intermediate/monitoring/src/main/java/org/springintegration/service/impl/DefaultTwitterService.java
@@ -25,11 +25,13 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.model.TwitterMessage;
+import org.springframework.integration.monitor.IntegrationMBeanExporter;
 import org.springframework.integration.service.TwitterService;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.jmx.export.annotation.ManagedMetric;
 import org.springframework.jmx.export.annotation.ManagedResource;
 import org.springframework.jmx.support.MetricType;
+import org.springframework.social.twitter.api.Tweet;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml b/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
index 5378aeed..91ab368c 100644
--- a/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
+++ b/intermediate/monitoring/src/main/resources/META-INF/spring/integration/spring-integration-context.xml
@@ -8,15 +8,15 @@
 	xmlns:int-groovy="http://www.springframework.org/schema/integration/groovy"
 	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/jmx http://www.springframework.org/schema/integration/jmx/spring-integration-jmx.xsd
-		http://www.springframework.org/schema/integration/groovy http://www.springframework.org/schema/integration/groovy/spring-integration-groovy-2.1.xsd
+		http://www.springframework.org/schema/integration/groovy http://www.springframework.org/schema/integration/groovy/spring-integration-groovy.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
-	<bean id="mbeanServer"
-	    class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
+	<context:mbean-server/>
 
 	<int-jmx:mbean-export id="integrationMBeanExporter" default-domain="spring.application"/>
+
 	<context:mbean-export default-domain="spring.application"/>
 
 	<int:message-history/>