diff --git a/build.gradle b/build.gradle index 9263cc773e..574a293444 100644 --- a/build.gradle +++ b/build.gradle @@ -326,6 +326,7 @@ project('spring-integration-rmi') { compile project(":spring-integration-core") compile "org.springframework:spring-aop:$springVersion" compile "org.springframework:spring-context:$springVersion" + testCompile project(":spring-integration-test") } // suppress deprecation warnings (@SuppressWarnings("deprecation") is not enough for javac) diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd index ec7848ff6a..7610abaf04 100644 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-2.0.xsd @@ -60,6 +60,14 @@ + + + + Specifies the order for invocation when this endpoint is connected as a + subscriber to a SubscribableChannel. + + + diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java index ceaa3c77dd..479e6387f2 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -21,7 +21,6 @@ import static org.junit.Assert.assertNotNull; import org.junit.Before; import org.junit.Test; - import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.Message; @@ -29,15 +28,17 @@ import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.rmi.RmiInboundGateway; +import org.springframework.integration.rmi.RmiOutboundGateway; +import org.springframework.integration.test.util.TestUtils; /** * @author Mark Fisher + * @author Gary Russell */ public class RmiOutboundGatewayParserTests { private final QueueChannel testChannel = new QueueChannel(); - @Before @SuppressWarnings("deprecation") public void setupTestInboundGateway() throws Exception { @@ -48,6 +49,13 @@ public class RmiOutboundGatewayParserTests { gateway.afterPropertiesSet(); } + @Test + public void testOrder() { + ApplicationContext context = new ClassPathXmlApplicationContext( + "rmiOutboundGatewayParserTests.xml", this.getClass()); + RmiOutboundGateway gateway = context.getBean(RmiOutboundGateway.class); + assertEquals(23, TestUtils.getPropertyValue(gateway, "order")); + } @Test public void directInvocation() { diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml index 1db2c7b291..78bbbe6cb0 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/rmiOutboundGatewayParserTests.xml @@ -12,6 +12,10 @@ - + \ No newline at end of file