Permalink
Browse files

BATCHADM-125: Version-less URLs for S.I. 2.1

Also changes for deprecation of interval-trigger on poller.

BATCHADM-125 Polishing (garyrussell)

Revert spaces to tabs; fix up some inconsistent newlines.

RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml
FileDropJobIntegrationTests-context.xml
AbstractIntegrationViewTests-context.xml
VanillaIntegrationTests-context.xml
RepeatTransactionalPollingIntegrationTests-context.xml
RetryRepeatTransactionalPollingIntegrationTests-context.xml
TransactionalPollingIntegrationTests-context.xml
RetryTransactionalPollingIntegrationTests-context.xml
  • Loading branch information...
1 parent 8acbc34 commit 29bce3f7bb085e43540a3d6786e20a861607abf1 dvictor committed with garyrussell Feb 20, 2012
Showing with 82 additions and 74 deletions.
  1. +1 −1 ...tch-admin-manager/src/main/resources/META-INF/spring/batch/bootstrap/integration/file-context.xml
  2. +1 −1 ...admin-manager/src/main/resources/META-INF/spring/batch/bootstrap/integration/launcher-context.xml
  3. +1 −1 ...-admin-manager/src/main/resources/META-INF/spring/batch/bootstrap/integration/restart-context.xml
  4. +1 −1 ...ch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/integration-context.xml
  5. +4 −6 ...src/test/resources/org/springframework/batch/admin/sample/FileDropJobIntegrationTests-context.xml
  6. +1 −1 ...sources/org/springframework/batch/admin/service/JobLocatorStepLocatorIntegrationTests-context.xml
  7. +1 −1 ...st/resources/org/springframework/batch/admin/service/LocalFileServiceIntegrationTests-context.xml
  8. +1 −1 ...resources/org/springframework/batch/admin/service/LocalFileServiceJobIntegrationTests-context.xml
  9. +4 −4 ...test/resources/org/springframework/batch/admin/web/views/AbstractIntegrationViewTests-context.xml
  10. +1 −1 spring-batch-admin-sample/src/main/resources/META-INF/spring/batch/jobs/infinite-context.xml
  11. +1 −1 spring-batch-admin-sample/src/main/resources/META-INF/spring/batch/jobs/jobs-context.xml
  12. +1 −1 ...in-sample/src/test/resources/org/springframework/batch/admin/sample/JobExecutionTests-context.xml
  13. +1 −1 ...-sample/src/test/resources/org/springframework/batch/admin/sample/JobIntegrationTests-context.xml
  14. +1 −1 spring-batch-integration/src/test/resources/job-execution-context.xml
  15. +1 −1 ...batch-integration/src/test/resources/org/springframework/batch/integration/SmokeTests-context.xml
  16. +1 −1 ...s/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests-context.xml
  17. +1 −1 ...pringframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests-context.xml
  18. +1 −1 ...es/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests-context.xml
  19. +1 −1 .../springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepIntegrationTests-context.xml
  20. +11 −12 ...ingframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml
  21. +1 −1 ...ringframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJmsIntegrationTests-context.xml
  22. +1 −1 ...resources/org/springframework/batch/integration/chunk/RemoteChunkStepIntegrationTests-context.xml
  23. +1 −1 ...esources/org/springframework/batch/integration/file/FileToMessagesJobIntegrationTests-context.xml
  24. +1 −1 ...resources/org/springframework/batch/integration/file/ResourceSplitterIntegrationTests-context.xml
  25. +1 −1 ...resources/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests-context.xml
  26. +1 −1 ...g/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml
  27. +1 −1 ...rc/test/resources/org/springframework/batch/integration/partition/JmsIntegrationTests-context.xml
  28. +4 −8 ...est/resources/org/springframework/batch/integration/partition/VanillaIntegrationTests-context.xml
  29. +8 −4 ...rg/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests-context.xml
  30. +12 −9 ...ringframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests-context.xml
  31. +7 −3 ...org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests-context.xml
  32. +7 −3 ...rces/org/springframework/batch/integration/retry/TransactionalPollingIntegrationTests-context.xml
  33. +1 −1 ...test/resources/org/springframework/batch/integration/step/StepGatewayIntegrationTests-context.xml
@@ -3,7 +3,7 @@
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<publish-subscribe-channel id="input-files" />
@@ -3,7 +3,7 @@
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<channel id="job-requests" />
<!-- TODO: filter into success and failure channels -->
@@ -2,7 +2,7 @@
<beans:beans xmlns="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<channel id="job-launches" />
<channel id="job-restarts" />
@@ -3,7 +3,7 @@
xmlns:integration="http://www.springframework.org/schema/integration" xmlns:http="http://www.springframework.org/schema/integration/http"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-2.0.xsd
+ http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
@@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:file="http://www.springframework.org/schema/integration/file" xmlns:integration="http://www.springframework.org/schema/integration"
- xsi:schemaLocation="http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd"
xmlns:beans="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p">
<import resource="classpath*:/META-INF/spring/batch/bootstrap/integration/launcher-context.xml" />
<integration:channel id="lead-files" />
<file:inbound-channel-adapter directory="target/data" channel="lead-files">
- <integration:poller>
- <integration:interval-trigger interval="200" />
- </integration:poller>
+ <integration:poller fixed-delay="200"/>
</file:inbound-channel-adapter>
-
+
<integration:service-activator input-channel="lead-files" output-channel="job-requests">
<beans:bean class="org.springframework.batch.admin.integration.FileToJobLaunchRequestAdapter">
<beans:property name="job" ref="staging"/>
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<bean id="stepLocator" class="org.springframework.batch.admin.service.JobLocatorStepLocator">
<property name="jobLocator" ref="jobRegistry"></property>
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<import resource="classpath*:/META-INF/spring/batch/bootstrap/integration/file-context.xml" />
@@ -3,7 +3,7 @@
xmlns:integration="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<import resource="classpath*:/META-INF/spring/batch/bootstrap/manager/env-context.xml" />
<import resource="classpath*:/META-INF/spring/batch/bootstrap/manager/data-source-context.xml" />
@@ -3,15 +3,15 @@
xmlns:integration="http://www.springframework.org/schema/integration"
xmlns:http="http://www.springframework.org/schema/integration/http"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http-1.0.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd">
+ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd">
<import resource="classpath*:/META-INF/spring/batch/servlet/resources/*-context.xml"/>
<import resource="classpath*:/META-INF/spring/batch/servlet/manager/manager-context.xml"/>
<import resource="classpath*:/META-INF/spring/batch/servlet/manager/integration-context.xml"/>
<import resource="classpath*:/META-INF/spring/batch/bootstrap/integration/file-context.xml"/>
-
+
<bean id="resourceService" class="org.springframework.batch.admin.web.resources.DefaultResourceService"/>
<integration:channel id="job-launches"/>
@@ -6,7 +6,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
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/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd">
<job id="infinite" xmlns="http://www.springframework.org/schema/batch">
@@ -4,7 +4,7 @@
xmlns:integration="http://www.springframework.org/schema/integration" xmlns:p="http://www.springframework.org/schema/p"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/file http://www.springframework.org/schema/integration/file/spring-integration-file-1.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
@@ -1,6 +1,6 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<import resource="classpath*:/META-INF/spring/batch/bootstrap/resources/*.xml" />
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:integration="http://www.springframework.org/schema/integration"
- xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
<import resource="classpath*:/META-INF/spring/batch/bootstrap/resources/*.xml" />
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+ http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd">
<annotation-config/>
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+ http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://www.springframework.org/schema/tx
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration.xsd">
<annotation-config />
<channel id="requests"/>
<channel id="replies">
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-2.0.xsd">
+ http://www.springframework.org/schema/integration/spring-integration.xsd">
<annotation-config />
<channel id="requests">
<queue />
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/integration
- http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+ http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-2.5.xsd
http://www.springframework.org/schema/tx
@@ -5,7 +5,7 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
@@ -4,13 +4,13 @@
xmlns:batch="http://www.springframework.org/schema/batch" xmlns:context="http://www.springframework.org/schema/context"
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:int-jdbc="http://www.springframework.org/schema/integration/jdbc"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
- xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
- http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
- http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd
+ xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+ http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
- http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
+ http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
+ http://www.springframework.org/schema/integration/jdbc http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<job id="job" xmlns="http://www.springframework.org/schema/batch">
@@ -63,10 +63,10 @@
<property name="retryPolicy">
<bean class="org.springframework.batch.retry.policy.SimpleRetryPolicy">
<constructor-arg value="10" />
- <constructor-arg>
- <map key-type="java.lang.Class" value-type="java.lang.Boolean">
- <entry key="org.springframework.dao.CannotAcquireLockException" value="true" />
- </map>
+ <constructor-arg>
+ <map key-type="java.lang.Class" value-type="java.lang.Boolean">
+ <entry key="org.springframework.dao.CannotAcquireLockException" value="true" />
+ </map>
</constructor-arg>
</bean>
</property>
@@ -91,8 +91,7 @@
<integration:queue message-store="messageStore" />
</integration:channel>
<integration:service-activator input-channel="requests" output-channel="replies" ref="chunkHandler">
- <integration:poller>
- <integration:interval-trigger interval="100" />
+ <integration:poller fixed-delay="100">
<integration:transactional isolation="READ_COMMITTED" />
</integration:poller>
</integration:service-activator>
@@ -5,7 +5,7 @@
xmlns:jms="http://www.springframework.org/schema/jms" xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd
- http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration-2.0.xsd
+ http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/integration/jms http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
Oops, something went wrong.

0 comments on commit 29bce3f

Please sign in to comment.