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

Fix JmsMockTests for bad Mockito usage

Browse Source 
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2074

Upgrade to SK-2.0 M1 and SIK-3.0 M1

Fix JPA sample adding `SEQUENCE HIBERNATE_SEQUENCE` DDL
into the `schema.sql`

https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2078/

The latest Hibernate version doesn't create such a DB entity if
we use `hibernate.ddl-auto: none`

Increase timeouts in the JMS and TCP tests
This commit is contained in:
Artem Bilan
2017-04-27 16:19:02 -04:00
parent fdb9ddceeb
commit be0e24aea5
11 changed files with 79 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
basic/jms/src/main/resources/META-INF/spring/integration/aggregation.xml
View File

@@ -6,8 +6,6 @@
xmlns:int-stream="http://www.springframework.org/schema/integration/stream"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd
http://www.springframework.org/schema/integration
http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/jms
@@ -15,11 +13,9 @@
http://www.springframework.org/schema/integration/stream
http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<int-stream:stdin-channel-adapter id="stdin" channel="stdinToJmsoutChannel"/>
<int-stream:stdin-channel-adapter id="stdin" channel="stdinToJmsOutChannel"/>
<int:channel id="stdinToJmsoutChannel"/>
<int:chain input-channel="stdinToJmsoutChannel">
<int:chain input-channel="stdinToJmsOutChannel">
<int:header-enricher>
<int:header name="jms_replyTo" ref="replyQueue" />
</int:header-enricher>
@@ -32,7 +28,7 @@
<int:channel id="jmsReplyChannel" />
<int:aggregator input-channel="jmsReplyChannel" output-channel="out"
group-timeout="5000"
group-timeout="20000"
expire-groups-upon-timeout="false"
send-partial-result-on-expiry="true"
discard-channel="logLateArrivers"

6
basic/jms/src/main/resources/META-INF/spring/integration/outboundChannelAdapter.xml
View File

@@ -13,10 +13,10 @@
http://www.springframework.org/schema/integration/stream
http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsoutChannel"/>
<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsOutChannel"/>
<channel id="stdinToJmsoutChannel"/>
<channel id="stdinToJmsOutChannel"/>
<jms:outbound-channel-adapter id="jmsout" channel="stdinToJmsoutChannel" destination="requestQueue"/>
<jms:outbound-channel-adapter id="jmsout" channel="stdinToJmsOutChannel" destination="requestQueue"/>
</beans:beans>

6
basic/jms/src/main/resources/META-INF/spring/integration/outboundGateway.xml
View File

@@ -15,11 +15,11 @@
http://www.springframework.org/schema/integration/stream
http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">
<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsoutChannel"/>
<stream:stdin-channel-adapter id="stdin" channel="stdinToJmsOutChannel"/>
<channel id="stdinToJmsoutChannel"/>
<channel id="stdinToJmsOutChannel"/>
<jms:outbound-gateway request-channel="stdinToJmsoutChannel"
<jms:outbound-gateway request-channel="stdinToJmsOutChannel"
request-destination="requestQueue"
reply-channel="jmsReplyChannel"/>