reconciled some conflicts, changed the code to reflect the new APIs.

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/SimpleTwitterTestClient-context.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 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.
+  -->
+
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:twitter="http://www.springframework.org/schema/integration/twitter"
+		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-1.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
+
+	<context:component-scan
+			base-package="org.springframework.integration.twitter"/>
+
+	<context:property-placeholder
+			location="file://${user.home}/Desktop/twitter.properties"
+			ignore-unresolvable="true"/>
+
+
+	<twitter:twitter-connection
+			id="tc"
+			access-token="${twitter.oauth.accessToken}"
+			access-token-secret="${twitter.oauth.accessTokenSecret}"
+			consumer-key="${twitter.oauth.consumerKey}"
+			consumer-secret="${twitter.oauth.consumerSecret}"
+			/>
+
+	<beans:bean class="org.springframework.integration.twitter.SimpleTwitterTestClient"/>
+
+
+</beans:beans>
+
+

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/SimpleTwitterTestClient.java

@@ -18,7 +18,7 @@ import java.util.Collection;
  *
  * @author Josh Long
  */
-@ContextConfiguration(locations = "org/springframework/integration/twitter/twitter_connection_using_ns.xml")
+@ContextConfiguration
 public class SimpleTwitterTestClient {
 	private Twitter twitter;
 	@Autowired

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestRecievingUsingNamespace-context.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 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.
+  -->
+
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:twitter="http://www.springframework.org/schema/integration/twitter"
+		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-2.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
+	
+	<message-history/>
+	
+	<context:component-scan
+			base-package="org.springframework.integration.twitter"/>
+
+	<context:property-placeholder
+			location="classpath:twitter.properties"
+			ignore-unresolvable="true"/>
+
+	<channel id="inbound_dm"/>
+
+	<twitter:inbound-dm-channel-adapter id="twitterInbound"
+										channel="inbound_dm" 
+										twitter-connection="tc"/>
+
+	<twitter:twitter-connection id="tc"
+			access-token="${twitter.oauth.accessToken}"
+			access-token-secret="${twitter.oauth.accessTokenSecret}"
+			consumer-key="${twitter.oauth.consumerKey}"
+			consumer-secret="${twitter.oauth.consumerSecret}"/>
+
+	<service-activator id="twitterService"
+					   input-channel="inbound_dm"
+					   ref="twitterAnnouncer"
+					   method="dm"/>
+
+
+</beans:beans>
+
+

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestRecievingUsingNamespace.java

@@ -25,9 +25,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 /**
  * @author Josh Long
  */
-@ContextConfiguration(locations = {
-        "/org/springframework/integration/twitter/receiving_dms_using_ns.xml"}
-)
+@ContextConfiguration
 public class TestRecievingUsingNamespace extends AbstractJUnit4SpringContextTests {
 	@Autowired
 	private TwitterAnnouncer twitterAnnouncer;

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace-context.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 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.
+  -->
+
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:twitter="http://www.springframework.org/schema/integration/twitter"
+		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-1.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
+
+	<context:component-scan
+			base-package="org.springframework.integration.twitter"/>
+
+	<context:property-placeholder
+			location="file://${user.home}/Desktop/twitter.properties"
+			ignore-unresolvable="true"/>
+
+	<twitter:twitter-connection
+			id="tc"
+			access-token="${twitter.oauth.accessToken}"
+			access-token-secret="${twitter.oauth.accessTokenSecret}"
+			consumer-key="${twitter.oauth.consumerKey}"
+			consumer-secret="${twitter.oauth.consumerSecret}"
+			/>
+
+
+	<channel id="out"/>
+
+	<twitter:outbound-dm-channel-adapter twitter-connection="tc" channel="out"/>
+
+
+</beans:beans>
+
+

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingDMsUsingNamespace.java

@@ -33,9 +33,7 @@ import org.springframework.util.StringUtils;
 /**
  * @author Josh Long
  */
-@ContextConfiguration(locations = {
-        "/org/springframework/integration/twitter/sending_dms_using_ns.xml"}
-)
+@ContextConfiguration
 public class TestSendingDMsUsingNamespace extends AbstractJUnit4SpringContextTests {
 
 	private volatile MessagingTemplate messagingTemplate = new MessagingTemplate();

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace-context.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 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.
+  -->
+
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:twitter="http://www.springframework.org/schema/integration/twitter"
+		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-1.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
+
+	<context:component-scan
+			base-package="org.springframework.integration.twitter"/>
+
+	<context:property-placeholder
+			location="classpath:twitter.properties"
+			ignore-unresolvable="true"/>
+        
+	<twitter:twitter-connection
+			id="tc"
+			access-token="${twitter.oauth.accessToken}"
+			access-token-secret="${twitter.oauth.accessTokenSecret}"
+			consumer-key="${twitter.oauth.consumerKey}"
+			consumer-secret="${twitter.oauth.consumerSecret}"
+			/>
+
+
+	<channel id="out"/>
+
+	<twitter:outbound-update-channel-adapter twitter-connection="tc" channel="out"/>
+
+
+</beans:beans>
+
+

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TestSendingUpdatesUsingNamespace.java

@@ -29,9 +29,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 /**
  * @author Josh Long
  */
-@ContextConfiguration(locations = {
-        "/org/springframework/integration/twitter/sending_updates_using_ns.xml"}
-)
+@ContextConfiguration
 public class TestSendingUpdatesUsingNamespace extends AbstractJUnit4SpringContextTests {
 
 	private StatusUpdateSupport statusUpdateSupport = new StatusUpdateSupport();
@@ -43,7 +41,7 @@ public class TestSendingUpdatesUsingNamespace extends AbstractJUnit4SpringContex
 	@Test
 	@Ignore
 	public void testSendingATweet() throws Throwable {
-		MessageBuilder<String> mb = MessageBuilder.withPayload("'Hello world!', from the Spring Integration outbound Twitter adapter")
+		MessageBuilder<String> mb = MessageBuilder.withPayload("test message 1")
 				.setHeader(TwitterHeaders.TWITTER_IN_REPLY_TO_STATUS_ID, 21927437001L)
 				.setHeader(TwitterHeaders.TWITTER_GEOLOCATION,
 						this.statusUpdateSupport.fromLatitudeLongitudePair(-76.226823, 23.642465)) // antarctica

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/TwitterAnnouncer.java

@@ -4,6 +4,11 @@ import org.springframework.integration.twitter.model.DirectMessage;
 import org.springframework.integration.twitter.model.Status;
 import org.springframework.stereotype.Component;
 
+<<<<<<< HEAD
+=======
+import twitter4j.DirectMessage;
+import twitter4j.Status;
+>>>>>>> 64fec64d4095a6e793739607816d63d600e1ed0c
 
 
 @Component

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/receiving_replies_using_ns.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 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.
+  -->
+
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:twitter="http://www.springframework.org/schema/integration/twitter"
+		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-1.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
+
+	<context:component-scan
+			base-package="org.springframework.integration.twitter"/>
+
+	<context:property-placeholder
+			location="file://${user.home}/Desktop/twitter.properties"
+			ignore-unresolvable="true"/>
+
+	<twitter:twitter-connection
+			id="tc"
+			access-token="${twitter.oauth.accessToken}"
+			access-token-secret="${twitter.oauth.accessTokenSecret}"
+			consumer-key="${twitter.oauth.consumerKey}"
+			consumer-secret="${twitter.oauth.consumerSecret}"
+			/>
+
+
+	<channel id="inbound_tweets"/>
+
+	<twitter:inbound-mention-channel-adapter twitter-connection="tc" channel="inbound_tweets"/>
+
+	<service-activator input-channel="inbound_tweets" ref="twitterAnnouncer" method="mention"/>
+
+
+</beans:beans>
+
+

spring-integration-twitter/src/test/java/org/springframework/integration/twitter/receiving_updates_using_ns.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 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.
+  -->
+
+<beans:beans
+		xmlns="http://www.springframework.org/schema/integration"
+		xmlns:beans="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:p="http://www.springframework.org/schema/p"
+		xmlns:context="http://www.springframework.org/schema/context"
+		xmlns:util="http://www.springframework.org/schema/util"
+		xmlns:tool="http://www.springframework.org/schema/tool"
+		xmlns:lang="http://www.springframework.org/schema/lang"
+		xmlns:twitter="http://www.springframework.org/schema/integration/twitter"
+		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-1.0.xsd
+					 	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+                        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
+						http://www.springframework.org/schema/tool http://www.springframework.org/schema/tool/spring-tool-3.0.xsd
+						http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd">
+
+	<context:component-scan
+			base-package="org.springframework.integration.twitter"/>
+
+	<context:property-placeholder
+			location="file://${user.home}/Desktop/twitter.properties"
+			ignore-unresolvable="true"/>
+
+
+	<twitter:twitter-connection
+			id="tc"
+			access-token="${twitter.oauth.accessToken}"
+			access-token-secret="${twitter.oauth.accessTokenSecret}"
+			consumer-key="${twitter.oauth.consumerKey}"
+			consumer-secret="${twitter.oauth.consumerSecret}"
+			/>
+
+
+	<channel id="inbound_tweets"/>
+
+
+	<twitter:inbound-update-channel-adapter
+			twitter-connection="tc"
+			channel="inbound_tweets"
+			/>
+
+	<service-activator input-channel="inbound_tweets"
+					   ref="twitterAnnouncer"
+					   method="friendsTimelineUpdated"/>
+
+
+</beans:beans>
+
+