INT-1200 the <annotation-config> now accepts the 'default-publisher-channel' attribute for the @Publisher support

spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml

@@ -13,6 +13,10 @@
 		<si:queue />
 	</si:channel>
 
-	<si:annotation-config/>
+	<si:channel id="defaultChannel">
+		<si:queue />
+	</si:channel>
+
+	<si:annotation-config default-publisher-channel="defaultChannel"/>
 
 </beans>

spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java

@@ -39,26 +39,44 @@ public class AnnotationConfigRegistrationTests {
 	private TestBean testBean;
 
 	@Autowired
-	private QueueChannel channel;
+	private QueueChannel testChannel;
+
+	@Autowired
+	private QueueChannel defaultChannel;
 
 
 	@Test // INT-1200
 	public void verifyInterception() {
 		String name = testBean.setName("John", "Doe");
 		Assert.assertNotNull(name);
-		Message<?> message = channel.receive(0);
+		Message<?> message = testChannel.receive(0);
 		Assert.assertNotNull(message);
-		Assert.assertEquals("John Doe", message.getPayload());
+		Assert.assertEquals("John DoeDoe", message.getPayload());
 		Assert.assertEquals("123", message.getHeaders().get("x"));
 	}
 
+	@Test
+	public void defaultChannel() {
+		String result = testBean.exclaim("hello");
+		Assert.assertNotNull(result);
+		Assert.assertEquals("HELLO!!!", result);
+		Message<?> message = defaultChannel.receive(0);
+		Assert.assertNotNull(message);
+		Assert.assertEquals("HELLO!!!", message.getPayload());
+	}
+
 
 	public static class TestBean {
 
-		@Publisher(channel="testChannel", payload="#return", headers="x='123'")
+		@Publisher(channel="testChannel", payload="#return + #args.lname", headers="x='123'")
 		public String setName(String fname, String lname){
 			return fname + " " + lname;
 		}
+
+		@Publisher
+		public String exclaim(String s) {
+			return s.toUpperCase() + "!!!";
+		}
 	}
 
 }