Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1296: merge XSD types

Browse Source
This commit is contained in:
David Syer
2010-08-04 16:29:29 +00:00
parent caaa261719
commit 278d16fde4
4 changed files with 11 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -6,3 +6,5 @@ spring-integration-samples/loanshark/application.log*
integration-repo
spring-integration-jms/activemq-data/
si.java.hsp
*/src/main/java/META-INF
spring-integration-parent/.project

84
spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd
View File

@@ -1944,6 +1944,12 @@ Name of the header whose value to use.
</xsd:element>
<xsd:complexType name="aggregator-type">
<xsd:complexContent>
<xsd:extension base="correlating-message-handler-type"/>
</xsd:complexContent>
</xsd:complexType>
<xsd:complexType name="correlating-message-handler-type">
<xsd:complexContent>
<xsd:extension base="innerEndpointDefinitionAware">
<xsd:attribute name="expression" type="xsd:string">
@@ -2049,80 +2055,7 @@ Name of the header whose value to use.
<xsd:complexType name="resequencer-type">
<xsd:complexContent>
<xsd:extension base="handlerEndpointType">
<xsd:attribute name="correlation-strategy" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="java.lang.Object" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="correlation-strategy-method" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation>
<tool:expected-method type-ref="@correlation-strategy" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="release-strategy" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
The release strategy to use to decide when
messages can be processed. Defaults to a
SequenceSizeReleaseStrategy,
releasing all messages once the sequence is complete.
This is mutually exclusive with
the release-partial-sequences
attribute (either or none can be specified , but not both).
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="java.lang.Object" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="release-strategy-method" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation>
<tool:expected-method type-ref="@release-strategy" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="discard-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.core.MessageChannel" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="message-store" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
Reference to a MessageGroupStore for holding
state in between message processing. The default
is to use a
volatile in-memory store, which means that unprocessed messages
will be lost if the
JVM exits. To
customize the expiry of incomplete message groups
configure the message store.
</xsd:documentation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.store.MessageGroupStore" />
</tool:annotation>
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:extension base="correlating-message-handler-type">
<xsd:attribute name="comparator" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
@@ -2144,10 +2077,9 @@ Name of the header whose value to use.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="send-partial-result-on-expiry" type="xsd:string" />
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:complexType>
<xsd:complexType name="channelInterceptorsType">
<xsd:annotation>

0
spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests-context.xml → spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
View File

2
spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java → spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.aggregator;
package org.springframework.integration.aggregator.scenarios;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;