From e646cd8a16bb233dbcf5a735751ae4e17ee7f996 Mon Sep 17 00:00:00 2001 From: dsyer Date: Thu, 17 Jul 2008 07:55:13 +0000 Subject: [PATCH] Tweak manifests and make OSGi projects into S2AP bundles --- spring-batch-core/.project | 7 + ....eclipse.wst.common.project.facet.core.xml | 5 + spring-batch-core/pom.xml | 35 +++- .../src/main/resources/META-INF/MANIFEST.MF | 178 ++++++++--------- .../resources/META-INF/spring-batch-core.mf | 27 +-- spring-batch-infrastructure/.project | 7 + ....eclipse.wst.common.project.facet.core.xml | 5 + spring-batch-infrastructure/pom.xml | 42 +++- .../item/file/mapping/DefaultFieldSet.java | 2 +- .../src/main/resources/META-INF/MANIFEST.MF | 180 +++++++++--------- .../META-INF/spring-batch-infrastructure.mf | 27 +-- .../item/database/data-source-context.xml | 5 +- ...hunkMessageItemWriterIntegrationTests.java | 3 - .../retry/PollableSourceRetryTests.java | 23 +-- spring-batch-samples/src/site/apt/index.apt | 2 +- 15 files changed, 322 insertions(+), 226 deletions(-) create mode 100644 spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml create mode 100644 spring-batch-infrastructure/.settings/org.eclipse.wst.common.project.facet.core.xml diff --git a/spring-batch-core/.project b/spring-batch-core/.project index aee145583..ca632cd00 100644 --- a/spring-batch-core/.project +++ b/spring-batch-core/.project @@ -6,6 +6,11 @@ spring-batch-infrastructure + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -23,8 +28,10 @@ + com.springsource.platform.ide.facet.core.bundlenature org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.devzuz.q.maven.jdt.core.mavenNature + org.eclipse.wst.common.project.facet.core.nature diff --git a/spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..af55bdf1a --- /dev/null +++ b/spring-batch-core/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index 2f033303c..d33dabff0 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 spring-batch-core @@ -16,6 +17,10 @@ .. + + ${pom.groupId}.core + + clover @@ -249,6 +254,34 @@ + + org.apache.felix + maven-bundle-plugin + + + + + + diff --git a/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF b/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF index 99e5939e6..1c4b6ddd7 100644 --- a/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF +++ b/spring-batch-core/src/main/resources/META-INF/MANIFEST.MF @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Bundle-Name: Spring Batch Core Archiver-Version: Plexus Archiver Build-Jdk: 1.5.0_13 Built-By: tsweeney @@ -8,98 +9,97 @@ Import-Package: edu.emory.mathcs.backport.java.util.concurrent;version version="[1.0.0, 2.0.0)",org.apache.commons.lang;version="[2.1,3.0)"; resolution:=optional,org.apache.commons.lang.builder;version="[2.1,3. 0)";resolution:=optional,org.apache.commons.logging;version="[1.1.0, - 2.0.0)",org.springframework.aop;version="[2.0.0, 3.0.0)",org.springfr - amework.aop.framework;version="[2.0.0, 3.0.0)",org.springframework.ao - p.support;version="[2.0.0, 3.0.0)",org.springframework.batch.item;ver - sion="[1.1.0, 2.0.0)",org.springframework.batch.item.adapter;version= - "[1.1.0, 2.0.0)",org.springframework.batch.item.database.support;vers - ion="[1.1.0, 2.0.0)",org.springframework.batch.item.support;version=" - [1.1.0, 2.0.0)",org.springframework.batch.item.validator;version="[1. - 1.0, 2.0.0)",org.springframework.batch.repeat;version="[1.1.0, 2.0.0) - ",org.springframework.batch.repeat.exception;version="[1.1.0, 2.0.0)" - ,org.springframework.batch.repeat.listener;version="[1.1.0, 2.0.0)",o - rg.springframework.batch.repeat.policy;version="[1.1.0, 2.0.0)",org.s - pringframework.batch.repeat.support;version="[1.1.0, 2.0.0)",org.spri - ngframework.batch.retry;version="[1.1.0, 2.0.0)",org.springframework. - batch.retry.backoff;version="[1.1.0, 2.0.0)",org.springframework.batc - h.retry.callback;version="[1.1.0, 2.0.0)",org.springframework.batch.r - etry.listener;version="[1.1.0, 2.0.0)",org.springframework.batch.retr - y.policy;version="[1.1.0, 2.0.0)",org.springframework.batch.retry.sup - port;version="[1.1.0, 2.0.0)",org.springframework.batch.support;versi - on="[1.1.0, 2.0.0)",org.springframework.batch.support.transaction;ver - sion="[1.1.0, 2.0.0)",org.springframework.beans;version="[2.0.0, 3.0. + 2.0.0)",org.springframework.aop;version="[2.5.5, 3.0.0)",org.springfr + amework.aop.framework;version="[2.5.5, 3.0.0)",org.springframework.ao + p.support;version="[2.5.5, 3.0.0)",org.springframework.batch.item;ver + sion="[2.0.0, 3.0.0)",org.springframework.batch.item.adapter;version= + "[2.0.0, 3.0.0)",org.springframework.batch.item.database.support;vers + ion="[2.0.0, 3.0.0)",org.springframework.batch.item.support;version=" + [2.0.0, 3.0.0)",org.springframework.batch.item.validator;version="[2. + 0.0, 3.0.0)",org.springframework.batch.repeat;version="[2.0.0, 3.0.0) + ",org.springframework.batch.repeat.exception;version="[2.0.0, 3.0.0)" + ,org.springframework.batch.repeat.listener;version="[2.0.0, 3.0.0)",o + rg.springframework.batch.repeat.policy;version="[2.0.0, 3.0.0)",org.s + pringframework.batch.repeat.support;version="[2.0.0, 3.0.0)",org.spri + ngframework.batch.retry;version="[2.0.0, 3.0.0)",org.springframework. + batch.retry.backoff;version="[2.0.0, 3.0.0)",org.springframework.batc + h.retry.callback;version="[2.0.0, 3.0.0)",org.springframework.batch.r + etry.listener;version="[2.0.0, 3.0.0)",org.springframework.batch.retr + y.policy;version="[2.0.0, 3.0.0)",org.springframework.batch.retry.sup + port;version="[2.0.0, 3.0.0)",org.springframework.batch.support;versi + on="[2.0.0, 3.0.0)",org.springframework.batch.support.transaction;ver + sion="[2.0.0, 3.0.0)",org.springframework.beans;version="[2.5.5, 3.0. 0)";resolution:=optional,org.springframework.beans.factory;version="[ - 2.0.0, 3.0.0)";resolution:=optional,org.springframework.beans.factory - .config;version="[2.0.0, 3.0.0)";resolution:=optional,org.springframe - work.context;version="[2.0.0, 3.0.0)";resolution:=optional,org.spring - framework.context.support;version="[2.0.0, 3.0.0)";resolution:=option - al,org.springframework.core;version="[2.0.0, 3.0.0)";resolution:=opti - onal,org.springframework.core.io;version="[2.0.0, 3.0.0)";resolution: - =optional,org.springframework.core.task;version="[2.0.0, 3.0.0)";reso - lution:=optional,org.springframework.dao;version="[2.0.0, 3.0.0)";res - olution:=optional,org.springframework.jdbc.core;version="[2.0.0, 3.0. + 2.5.5, 3.0.0)";resolution:=optional,org.springframework.beans.factory + .config;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframe + work.context;version="[2.5.5, 3.0.0)";resolution:=optional,org.spring + framework.context.support;version="[2.5.5, 3.0.0)";resolution:=option + al,org.springframework.core;version="[2.5.5, 3.0.0)";resolution:=opti + onal,org.springframework.core.io;version="[2.5.5, 3.0.0)";resolution: + =optional,org.springframework.core.task;version="[2.5.5, 3.0.0)";reso + lution:=optional,org.springframework.dao;version="[2.5.5, 3.0.0)";res + olution:=optional,org.springframework.jdbc.core;version="[2.5.5, 3.0. 0)";resolution:=optional,org.springframework.jdbc.core.support;versio - n="[2.0.0, 3.0.0)";resolution:=optional,org.springframework.jdbc.supp - ort.incrementer;version="[2.0.0, 3.0.0)";resolution:=optional,org.spr - ingframework.jdbc.support.lob;version="[2.0.0, 3.0.0)";resolution:=op - tional,org.springframework.transaction;version="[2.0.0, 3.0.0)";resol + n="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.jdbc.supp + ort.incrementer;version="[2.5.5, 3.0.0)";resolution:=optional,org.spr + ingframework.jdbc.support.lob;version="[2.5.5, 3.0.0)";resolution:=op + tional,org.springframework.transaction;version="[2.5.5, 3.0.0)";resol ution:=optional,org.springframework.transaction.interceptor;version=" - [2.0.0, 3.0.0)";resolution:=optional,org.springframework.transaction. - support;version="[2.0.0, 3.0.0)";resolution:=optional,org.springframe - work.util;version="[2.0.0, 3.0.0)";resolution:=optional + [2.5.5, 3.0.0)";resolution:=optional,org.springframework.transaction. + support;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframe + work.util;version="[2.5.5, 3.0.0)";resolution:=optional Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.batch.core -Export-Package: org.springframework.batch.core;version="1.1.0.RELEASE" - ;uses:="org.springframework.batch.item,org.springframework.batch.repe - at",org.springframework.batch.core.configuration;version="1.1.0.RELEA - SE";uses:="org.springframework.batch.core,org.springframework.batch.c - ore.repository",org.springframework.batch.core.configuration.support; - version="1.1.0.RELEASE";uses:="org.springframework.batch.core,org.spr - ingframework.batch.core.configuration,org.springframework.batch.core. - repository,org.springframework.beans,org.springframework.context",org - .springframework.batch.core.converter;version="1.1.0.RELEASE";uses:=" - org.springframework.batch.core",org.springframework.batch.core.job;ve - rsion="1.1.0.RELEASE";uses:="org.springframework.batch.core,org.sprin - gframework.batch.core.listener,org.springframework.batch.core.reposit - ory",org.springframework.batch.core.launch;version="1.1.0.RELEASE";us - es:="org.springframework.batch.core,org.springframework.batch.core.re - pository",org.springframework.batch.core.launch.support;version="1.1. - 0.RELEASE";uses:="org.springframework.batch.core,org.springframework. - batch.core.configuration,org.springframework.batch.core.converter,org - .springframework.batch.core.launch,org.springframework.batch.core.rep - ository,org.springframework.core.task",org.springframework.batch.core - .listener;version="1.1.0.RELEASE";uses:="org.springframework.batch.co - re,org.springframework.batch.repeat",org.springframework.batch.core.r - epository;version="1.1.0.RELEASE";uses:="org.springframework.batch.co - re",org.springframework.batch.core.repository.dao;version="1.1.0.RELE - ASE";uses:="org.springframework.batch.core,org.springframework.batch. - item,org.springframework.dao,org.springframework.jdbc.core,org.spring - framework.jdbc.support.incrementer,org.springframework.jdbc.support.l - ob",org.springframework.batch.core.repository.support;version="1.1.0. - RELEASE";uses:="javax.sql,org.springframework.batch.core,org.springfr - amework.batch.core.repository,org.springframework.batch.core.reposito - ry.dao,org.springframework.batch.item.database.support,org.springfram - ework.transaction",org.springframework.batch.core.resource;version="1 - .1.0.RELEASE";uses:="org.springframework.batch.core,org.springframewo - rk.batch.core.converter,org.springframework.batch.repeat,org.springfr - amework.core.io",org.springframework.batch.core.step;version="1.1.0.R - ELEASE";uses:="org.springframework.batch.core,org.springframework.bat - ch.core.repository,org.springframework.batch.item,org.springframework - .batch.repeat",org.springframework.batch.core.step.item;version="1.1. - 0.RELEASE";uses:="org.apache.commons.logging,org.springframework.batc - h.core,org.springframework.batch.core.listener,org.springframework.ba - tch.core.repository,org.springframework.batch.core.step,org.springfra - mework.batch.core.step.skip,org.springframework.batch.item,org.spring - framework.batch.item.support,org.springframework.batch.item.validator - ,org.springframework.batch.repeat,org.springframework.batch.repeat.ex - ception,org.springframework.batch.repeat.support,org.springframework. - batch.retry,org.springframework.batch.retry.backoff,org.springframewo - rk.core.task,org.springframework.transaction,org.springframework.tran - saction.interceptor",org.springframework.batch.core.step.skip;version - ="1.1.0.RELEASE",org.springframework.batch.core.step.tasklet;version= - "1.1.0.RELEASE";uses:="org.springframework.batch.core,org.springframe - work.batch.core.repository,org.springframework.batch.item,org.springf - ramework.batch.repeat" -Bundle-Version: 1.1.0.RELEASE +Export-Package: org.springframework.batch.core;version="2.0.0.CI";uses + :="org.springframework.batch.item,org.springframework.batch.repeat",o + rg.springframework.batch.core.configuration;version="2.0.0.CI";uses:= + "org.springframework.batch.core,org.springframework.batch.core.reposi + tory",org.springframework.batch.core.configuration.support;version="2 + .0.0.CI";uses:="org.springframework.batch.core,org.springframework.ba + tch.core.configuration,org.springframework.batch.core.repository,org. + springframework.beans,org.springframework.context",org.springframewor + k.batch.core.converter;version="2.0.0.CI";uses:="org.springframework. + batch.core",org.springframework.batch.core.job;version="2.0.0.CI";use + s:="org.springframework.batch.core,org.springframework.batch.core.lis + tener,org.springframework.batch.core.repository",org.springframework. + batch.core.launch;version="2.0.0.CI";uses:="org.springframework.batch + .core,org.springframework.batch.core.repository",org.springframework. + batch.core.launch.support;version="2.0.0.CI";uses:="org.springframewo + rk.batch.core,org.springframework.batch.core.configuration,org.spring + framework.batch.core.converter,org.springframework.batch.core.launch, + org.springframework.batch.core.repository,org.springframework.core.ta + sk",org.springframework.batch.core.listener;version="2.0.0.CI";uses:= + "org.springframework.batch.core,org.springframework.batch.repeat",org + .springframework.batch.core.repository;version="2.0.0.CI";uses:="org. + springframework.batch.core",org.springframework.batch.core.repository + .dao;version="2.0.0.CI";uses:="org.springframework.batch.core,org.spr + ingframework.batch.item,org.springframework.dao,org.springframework.j + dbc.core,org.springframework.jdbc.support.incrementer,org.springframe + work.jdbc.support.lob",org.springframework.batch.core.repository.supp + ort;version="2.0.0.CI";uses:="javax.sql,org.springframework.batch.cor + e,org.springframework.batch.core.repository,org.springframework.batch + .core.repository.dao,org.springframework.batch.item.database.support, + org.springframework.transaction",org.springframework.batch.core.resou + rce;version="2.0.0.CI";uses:="org.springframework.batch.core,org.spri + ngframework.batch.core.converter,org.springframework.batch.repeat,org + .springframework.core.io",org.springframework.batch.core.step;version + ="2.0.0.CI";uses:="org.springframework.batch.core,org.springframework + .batch.core.repository,org.springframework.batch.item,org.springframe + work.batch.repeat",org.springframework.batch.core.step.item;version=" + 2.0.0.CI";uses:="org.apache.commons.logging,org.springframework.batch + .core,org.springframework.batch.core.listener,org.springframework.bat + ch.core.repository,org.springframework.batch.core.step,org.springfram + ework.batch.core.step.skip,org.springframework.batch.item,org.springf + ramework.batch.item.support,org.springframework.batch.item.validator, + org.springframework.batch.repeat,org.springframework.batch.repeat.exc + eption,org.springframework.batch.repeat.support,org.springframework.b + atch.retry,org.springframework.batch.retry.backoff,org.springframewor + k.core.task,org.springframework.transaction,org.springframework.trans + action.interceptor",org.springframework.batch.core.step.skip;version= + "2.0.0.CI",org.springframework.batch.core.step.tasklet;version="2.0.0 + .CI";uses:="org.springframework.batch.core,org.springframework.batch. + core.repository,org.springframework.batch.item,org.springframework.ba + tch.repeat" +Bundle-Version: 2.0.0.CI-SNAPSHOT + - diff --git a/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf b/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf index ce9884897..a50b7b2ad 100644 --- a/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf +++ b/spring-batch-core/src/main/resources/META-INF/spring-batch-core.mf @@ -1,6 +1,7 @@ Bundle-SymbolicName: org.springframework.batch.core -Bundle-Version: 1.1.0.RELEASE +Bundle-Version: 2.0.0.CI-SNAPSHOT Bundle-ManifestVersion: 2 +Bundle-Name: Spring Batch Core Ignored-Existing-Headers: Import-Package, Export-Package @@ -9,17 +10,17 @@ Import-Template: org.aopalliance.aop.*;version="[1.0.0, 2.0.0)", org.apache.commons.lang.*;version="[2.1,3.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.0, 2.0.0)", - org.springframework.aop.*;version="[2.0.0, 3.0.0)", - org.springframework.batch.item.*;version="[1.1.0, 2.0.0)", - org.springframework.batch.repeat.*;version="[1.1.0, 2.0.0)", - org.springframework.batch.retry.*;version="[1.1.0, 2.0.0)", - org.springframework.batch.support.*;version="[1.1.0, 2.0.0)", - org.springframework.beans.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.context.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.core.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.dao.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.jdbc.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.transaction.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.util.*;version="[2.0.0, 3.0.0)";resolution:=optional + org.springframework.aop.*;version="[2.5.5, 3.0.0)", + org.springframework.batch.item.*;version="[2.0.0, 3.0.0)", + org.springframework.batch.repeat.*;version="[2.0.0, 3.0.0)", + org.springframework.batch.retry.*;version="[2.0.0, 3.0.0)", + org.springframework.batch.support.*;version="[2.0.0, 3.0.0)", + org.springframework.beans.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.context.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.core.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.util.*;version="[2.5.5, 3.0.0)";resolution:=optional Unversioned-Imports: javax.sql.* diff --git a/spring-batch-infrastructure/.project b/spring-batch-infrastructure/.project index 6f2559a0c..57493d4b9 100644 --- a/spring-batch-infrastructure/.project +++ b/spring-batch-infrastructure/.project @@ -5,6 +5,11 @@ + + org.eclipse.wst.common.project.facet.core.builder + + + org.eclipse.jdt.core.javabuilder @@ -22,8 +27,10 @@ + com.springsource.platform.ide.facet.core.bundlenature org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.devzuz.q.maven.jdt.core.mavenNature + org.eclipse.wst.common.project.facet.core.nature diff --git a/spring-batch-infrastructure/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-batch-infrastructure/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..af55bdf1a --- /dev/null +++ b/spring-batch-infrastructure/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index c01cbe945..908065834 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 spring-batch-infrastructure jar @@ -13,6 +14,9 @@ 2.0.0.CI-SNAPSHOT .. + + ${pom.groupId}.infrastructure + clover @@ -50,6 +54,40 @@ org.apache.maven.plugins maven-antrun-plugin + + org.apache.felix + maven-bundle-plugin + + + + + + @@ -165,7 +203,7 @@ 2.3.0 true - + org.springframework spring-aop diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java index 59d64155b..49b4afce8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java @@ -60,7 +60,7 @@ public class DefaultFieldSet implements FieldSet { this.tokens = (String[]) tokens.clone(); this.names = Arrays.asList(names); } - + /* * (non-Javadoc) * @see org.springframework.batch.io.file.mapping.IFieldSet#getNames() diff --git a/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF b/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF index d7e35c188..7b6924f80 100644 --- a/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF +++ b/spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF @@ -1,4 +1,5 @@ Manifest-Version: 1.0 +Bundle-Name: Spring Batch Infrastructure Archiver-Version: Plexus Archiver Build-Jdk: 1.5.0_13 Built-By: tsweeney @@ -15,97 +16,98 @@ Import-Package: com.ibatis.sqlmap.client;version="[2.3.0, 3.0.0)";reso .commons.logging;version="[1.1.0, 2.0.0)",org.hibernate;version="[3.2 .5.ga, 3.3.0.ga)";resolution:=optional,org.hibernate.classic;version= "[3.2.5.ga, 3.3.0.ga)";resolution:=optional,org.springframework.aop;v - ersion="[2.0.0, 3.0.0)";resolution:=optional,org.springframework.aop. - framework;version="[2.0.0, 3.0.0)";resolution:=optional,org.springfra - mework.aop.support;version="[2.0.0, 3.0.0)";resolution:=optional,org. - springframework.beans;version="[2.0.0, 3.0.0)";resolution:=optional,o - rg.springframework.beans.factory;version="[2.0.0, 3.0.0)";resolution: - =optional,org.springframework.core;version="[2.0.0, 3.0.0)";resolutio - n:=optional,org.springframework.core.enums;version="[2.0.0, 3.0.0)";r - esolution:=optional,org.springframework.core.io;version="[2.0.0, 3.0. - 0)";resolution:=optional,org.springframework.core.task;version="[2.0. - 0, 3.0.0)";resolution:=optional,org.springframework.dao;version="[2.0 - .0, 3.0.0)";resolution:=optional,org.springframework.jdbc;version="[2 - .0.0, 3.0.0)";resolution:=optional,org.springframework.jdbc.core;vers - ion="[2.0.0, 3.0.0)";resolution:=optional,org.springframework.jdbc.su - pport;version="[2.0.0, 3.0.0)";resolution:=optional,org.springframewo - rk.jdbc.support.incrementer;version="[2.0.0, 3.0.0)";resolution:=opti - onal,org.springframework.jms;version="[2.0.0, 3.0.0)";resolution:=opt - ional,org.springframework.jms.core;version="[2.0.0, 3.0.0)";resolutio - n:=optional,org.springframework.orm.hibernate3;version="[2.0.0, 3.0.0 - )";resolution:=optional,org.springframework.orm.ibatis;version="[2.0. - 0, 3.0.0)";resolution:=optional,org.springframework.oxm;version="[1.0 + ersion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.aop. + framework;version="[2.5.5, 3.0.0)";resolution:=optional,org.springfra + mework.aop.support;version="[2.5.5, 3.0.0)";resolution:=optional,org. + springframework.beans;version="[2.5.5, 3.0.0)";resolution:=optional,o + rg.springframework.beans.factory;version="[2.5.5, 3.0.0)";resolution: + =optional,org.springframework.core;version="[2.5.5, 3.0.0)";resolutio + n:=optional,org.springframework.core.enums;version="[2.5.5, 3.0.0)";r + esolution:=optional,org.springframework.core.io;version="[2.5.5, 3.0. + 0)";resolution:=optional,org.springframework.core.task;version="[2.5. + 5, 3.0.0)";resolution:=optional,org.springframework.dao;version="[2.5 + .5, 3.0.0)";resolution:=optional,org.springframework.jdbc;version="[2 + .5.5, 3.0.0)";resolution:=optional,org.springframework.jdbc.core;vers + ion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.jdbc.su + pport;version="[2.5.5, 3.0.0)";resolution:=optional,org.springframewo + rk.jdbc.support.incrementer;version="[2.5.5, 3.0.0)";resolution:=opti + onal,org.springframework.jms;version="[2.5.5, 3.0.0)";resolution:=opt + ional,org.springframework.jms.core;version="[2.5.5, 3.0.0)";resolutio + n:=optional,org.springframework.orm.hibernate3;version="[2.5.5, 3.0.0 + )";resolution:=optional,org.springframework.orm.ibatis;version="[2.5. + 5, 3.0.0)";resolution:=optional,org.springframework.oxm;version="[1.5 .0, 2.0.0)";resolution:=optional,org.springframework.transaction;vers - ion="[2.0.0, 3.0.0)";resolution:=optional,org.springframework.transac - tion.support;version="[2.0.0, 3.0.0)";resolution:=optional,org.spring - framework.util;version="[2.0.0, 3.0.0)";resolution:=optional,org.spri - ngframework.validation;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.xml.transform;version="[1.0.0, 2.0.0)";resolution + ion="[2.5.5, 3.0.0)";resolution:=optional,org.springframework.transac + tion.support;version="[2.5.5, 3.0.0)";resolution:=optional,org.spring + framework.util;version="[2.5.5, 3.0.0)";resolution:=optional,org.spri + ngframework.validation;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.xml.transform;version="[1.5.0, 2.0.0)";resolution :=optional Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.springframework.batch.infrastructure -Export-Package: org.springframework.batch.item;version="1.1.0",org.spr - ingframework.batch.item.adapter;version="1.1.0";uses:="org.springfram - ework.batch.item",org.springframework.batch.item.database;version="1. - 1.0";uses:="com.ibatis.sqlmap.client,javax.sql,org.hibernate,org.spri - ngframework.batch.item,org.springframework.dao,org.springframework.jd - bc.core,org.springframework.jdbc.support,org.springframework.orm.hibe - rnate3",org.springframework.batch.item.database.support;version="1.1. - 0";uses:="com.ibatis.sqlmap.client,javax.sql,org.springframework.batc - h.item,org.springframework.batch.item.database,org.springframework.jd - bc.core,org.springframework.jdbc.support.incrementer,org.springframew - ork.orm.ibatis",org.springframework.batch.item.file;version="1.1.0";u - ses:="org.springframework.batch.item,org.springframework.batch.item.f - ile.mapping,org.springframework.batch.item.file.separator,org.springf - ramework.batch.item.file.transform,org.springframework.core.io",org.s - pringframework.batch.item.file.mapping;version="1.1.0";uses:="org.spr - ingframework.beans.factory,org.springframework.validation",org.spring - framework.batch.item.file.separator;version="1.1.0";uses:="org.spring - framework.batch.item,org.springframework.core.io",org.springframework - .batch.item.file.transform;version="1.1.0";uses:="org.springframework - .batch.item.file.mapping,org.springframework.batch.item.transform",or - g.springframework.batch.item.jms;version="1.1.0";uses:="javax.jms,org - .springframework.jms.core",org.springframework.batch.item.support;ver - sion="1.1.0";uses:="org.springframework.batch.item",org.springframewo - rk.batch.item.transform;version="1.1.0",org.springframework.batch.ite - m.util;version="1.1.0",org.springframework.batch.item.validator;versi - on="1.1.0";uses:="org.springframework.validation",org.springframework - .batch.item.xml;version="1.1.0";uses:="javax.xml.stream,org.springfra - mework.batch.item,org.springframework.core.io",org.springframework.ba - tch.item.xml.oxm;version="1.1.0";uses:="javax.xml.stream,org.springfr - amework.oxm",org.springframework.batch.item.xml.stax;version="1.1.0"; - uses:="javax.xml.namespace,javax.xml.stream,javax.xml.stream.events", - org.springframework.batch.repeat;version="1.1.0",org.springframework. - batch.repeat.callback;version="1.1.0";uses:="org.springframework.batc - h.item,org.springframework.batch.repeat",org.springframework.batch.re - peat.context;version="1.1.0";uses:="org.springframework.batch.repeat" - ,org.springframework.batch.repeat.exception;version="1.1.0";uses:="or - g.springframework.batch.repeat,org.springframework.batch.support",org - .springframework.batch.repeat.interceptor;version="1.1.0";uses:="org. - aopalliance.intercept,org.springframework.batch.repeat",org.springfra - mework.batch.repeat.listener;version="1.1.0";uses:="org.springframewo - rk.batch.repeat",org.springframework.batch.repeat.policy;version="1.1 - .0";uses:="org.springframework.batch.repeat,org.springframework.batch - .repeat.context",org.springframework.batch.repeat.support;version="1. - 1.0";uses:="org.springframework.batch.repeat,org.springframework.batc - h.repeat.exception,org.springframework.core.task",org.springframework - .batch.retry;version="1.1.0",org.springframework.batch.retry.backoff; - version="1.1.0";uses:="org.springframework.batch.retry",org.springfra - mework.batch.retry.callback;version="1.1.0";uses:="org.springframewor - k.batch.retry",org.springframework.batch.retry.context;version="1.1.0 - ";uses:="org.springframework.batch.retry",org.springframework.batch.r - etry.interceptor;version="1.1.0";uses:="org.aopalliance.intercept,org - .springframework.batch.item,org.springframework.batch.retry",org.spri - ngframework.batch.retry.listener;version="1.1.0";uses:="org.springfra - mework.batch.retry",org.springframework.batch.retry.policy;version="1 - .1.0";uses:="org.springframework.batch.retry,org.springframework.batc - h.retry.callback,org.springframework.batch.support",org.springframewo - rk.batch.retry.support;version="1.1.0";uses:="org.springframework.bat - ch.retry,org.springframework.batch.retry.backoff",org.springframework - .batch.support;version="1.1.0";uses:="org.springframework.beans",org. - springframework.batch.support.transaction;version="1.1.0";uses:="org. - aopalliance.intercept,org.springframework.transaction,org.springframe - work.transaction.support" -Bundle-Version: 1.1.0 +Export-Package: org.springframework.batch.item;version="2.0.0.CI",org. + springframework.batch.item.adapter;version="2.0.0.CI";uses:="org.spri + ngframework.batch.item",org.springframework.batch.item.database;versi + on="2.0.0.CI";uses:="com.ibatis.sqlmap.client,javax.sql,org.hibernate + ,org.springframework.batch.item,org.springframework.dao,org.springfra + mework.jdbc.core,org.springframework.jdbc.support,org.springframework + .orm.hibernate3",org.springframework.batch.item.database.support;vers + ion="2.0.0.CI";uses:="com.ibatis.sqlmap.client,javax.sql,org.springfr + amework.batch.item,org.springframework.batch.item.database,org.spring + framework.jdbc.core,org.springframework.jdbc.support.incrementer,org. + springframework.orm.ibatis",org.springframework.batch.item.file;versi + on="2.0.0.CI";uses:="org.springframework.batch.item,org.springframewo + rk.batch.item.file.mapping,org.springframework.batch.item.file.separa + tor,org.springframework.batch.item.file.transform,org.springframework + .core.io",org.springframework.batch.item.file.mapping;version="2.0.0. + CI";uses:="org.springframework.beans.factory,org.springframework.vali + dation",org.springframework.batch.item.file.separator;version="2.0.0. + CI";uses:="org.springframework.batch.item,org.springframework.core.io + ",org.springframework.batch.item.file.transform;version="2.0.0.CI";us + es:="org.springframework.batch.item.file.mapping,org.springframework. + batch.item.transform",org.springframework.batch.item.jms;version="2.0 + .0.CI";uses:="javax.jms,org.springframework.jms.core",org.springframe + work.batch.item.support;version="2.0.0.CI";uses:="org.springframework + .batch.item",org.springframework.batch.item.transform;version="2.0.0. + CI",org.springframework.batch.item.util;version="2.0.0.CI",org.spring + framework.batch.item.validator;version="2.0.0.CI";uses:="org.springfr + amework.validation",org.springframework.batch.item.xml;version="2.0.0 + .CI";uses:="javax.xml.stream,org.springframework.batch.item,org.sprin + gframework.core.io",org.springframework.batch.item.xml.oxm;version="2 + .0.0.CI";uses:="javax.xml.stream,org.springframework.oxm",org.springf + ramework.batch.item.xml.stax;version="2.0.0.CI";uses:="javax.xml.name + space,javax.xml.stream,javax.xml.stream.events",org.springframework.b + atch.repeat;version="2.0.0.CI",org.springframework.batch.repeat.callb + ack;version="2.0.0.CI";uses:="org.springframework.batch.item,org.spri + ngframework.batch.repeat",org.springframework.batch.repeat.context;ve + rsion="2.0.0.CI";uses:="org.springframework.batch.repeat",org.springf + ramework.batch.repeat.exception;version="2.0.0.CI";uses:="org.springf + ramework.batch.repeat,org.springframework.batch.support",org.springfr + amework.batch.repeat.interceptor;version="2.0.0.CI";uses:="org.aopall + iance.intercept,org.springframework.batch.repeat",org.springframework + .batch.repeat.listener;version="2.0.0.CI";uses:="org.springframework. + batch.repeat",org.springframework.batch.repeat.policy;version="2.0.0. + CI";uses:="org.springframework.batch.repeat,org.springframework.batch + .repeat.context",org.springframework.batch.repeat.support;version="2. + 0.0.CI";uses:="org.springframework.batch.repeat,org.springframework.b + atch.repeat.exception,org.springframework.core.task",org.springframew + ork.batch.retry;version="2.0.0.CI",org.springframework.batch.retry.ba + ckoff;version="2.0.0.CI";uses:="org.springframework.batch.retry",org. + springframework.batch.retry.callback;version="2.0.0.CI";uses:="org.sp + ringframework.batch.retry",org.springframework.batch.retry.context;ve + rsion="2.0.0.CI";uses:="org.springframework.batch.retry",org.springfr + amework.batch.retry.interceptor;version="2.0.0.CI";uses:="org.aopalli + ance.intercept,org.springframework.batch.item,org.springframework.bat + ch.retry",org.springframework.batch.retry.listener;version="2.0.0.CI" + ;uses:="org.springframework.batch.retry",org.springframework.batch.re + try.policy;version="2.0.0.CI";uses:="org.springframework.batch.retry, + org.springframework.batch.retry.callback,org.springframework.batch.su + pport",org.springframework.batch.retry.support;version="2.0.0.CI";use + s:="org.springframework.batch.retry,org.springframework.batch.retry.b + ackoff",org.springframework.batch.support;version="2.0.0.CI";uses:="o + rg.springframework.beans",org.springframework.batch.support.transacti + on;version="2.0.0.CI";uses:="org.aopalliance.intercept,org.springfram + ework.transaction,org.springframework.transaction.support" +Bundle-Version: 2.0.0.CI + - diff --git a/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf b/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf index cc7b20e65..07fe56609 100644 --- a/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf +++ b/spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf @@ -1,6 +1,7 @@ Bundle-SymbolicName: org.springframework.batch.infrastructure -Bundle-Version: 1.1.0 +Bundle-Version: 2.0.0.CI-SNAPSHOT Bundle-ManifestVersion: 2 +Bundle-Name: Spring Batch Infrastructure Import-Template: com.ibatis.sqlmap.*;version="[2.3.0, 3.0.0)";resolution:=optional, edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, @@ -9,18 +10,18 @@ Import-Template: org.aopalliance.*;version=1.0.0;resolution:=optional, org.apache.commons.logging.*;version="[1.1.0, 2.0.0)", org.hibernate.*;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional, - org.springframework.aop.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.beans.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.core.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.dao.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.jdbc.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.jms.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.orm.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.transaction.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.util.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.validation.*;version="[2.0.0, 3.0.0)";resolution:=optional, - org.springframework.oxm.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.springframework.xml.*;version="[1.0.0, 2.0.0)";resolution:=optional + org.springframework.aop.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.beans.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.core.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.dao.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.jdbc.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.jms.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.orm.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.transaction.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.util.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.validation.*;version="[2.5.5, 3.0.0)";resolution:=optional, + org.springframework.oxm.*;version="[1.5.0, 2.0.0)";resolution:=optional, + org.springframework.xml.*;version="[1.5.0, 2.0.0)";resolution:=optional Unversioned-Imports: javax.sql.*, javax.xml.namespace.*, diff --git a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/database/data-source-context.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/database/data-source-context.xml index 71102f902..29aa4d78e 100644 --- a/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/database/data-source-context.xml +++ b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/database/data-source-context.xml @@ -1,6 +1,8 @@ + xmlns:util="http://www.springframework.org/schema/util" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd"> @@ -21,4 +23,5 @@ + \ No newline at end of file diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java index 6aba45ab2..e78037c9b 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java @@ -25,9 +25,6 @@ import org.springframework.batch.core.repository.dao.MapJobInstanceDao; import org.springframework.batch.core.repository.dao.MapStepExecutionDao; import org.springframework.batch.core.repository.support.SimpleJobRepository; import org.springframework.batch.core.step.item.SimpleStepFactoryBean; -import org.springframework.batch.integration.chunk.AsynchronousFailureException; -import org.springframework.batch.integration.chunk.ChunkMessageChannelItemWriter; -import org.springframework.batch.integration.chunk.ChunkRequest; import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.ExitStatus; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java index 0dafec109..9803a6ad7 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java @@ -22,11 +22,9 @@ import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.ExitStatus; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.interceptor.RepeatOperationsInterceptor; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; import org.springframework.batch.repeat.support.RepeatTemplate; import org.springframework.batch.retry.interceptor.StatefulRetryOperationsInterceptor; -import org.springframework.batch.support.PropertiesConverter; import org.springframework.batch.support.transaction.ResourcelessTransactionManager; import org.springframework.batch.support.transaction.TransactionAwareProxyFactory; import org.springframework.context.Lifecycle; @@ -43,7 +41,6 @@ import org.springframework.integration.scheduling.PollingSchedule; import org.springframework.integration.scheduling.SimpleTaskScheduler; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.interceptor.TransactionInterceptor; import org.springframework.util.StringUtils; public class PollableSourceRetryTests { @@ -484,9 +481,9 @@ public class PollableSourceRetryTests { /** * @return */ - private TransactionInterceptor getTransactionInterceptor() { - return new TransactionInterceptor(transactionManager, PropertiesConverter.stringToProperties("*=PROPAGATION_REQUIRED")); - } +// private TransactionInterceptor getTransactionInterceptor() { +// return new TransactionInterceptor(transactionManager, PropertiesConverter.stringToProperties("*=PROPAGATION_REQUIRED")); +// } /** * @param endpoint @@ -517,13 +514,13 @@ public class PollableSourceRetryTests { * @param commitInterval * @return */ - private RepeatOperationsInterceptor getRepeatOperationsInterceptor(int commitInterval) { - RepeatOperationsInterceptor advice = new RepeatOperationsInterceptor(); - RepeatTemplate repeatTemplate = new RepeatTemplate(); - repeatTemplate.setCompletionPolicy(new SimpleCompletionPolicy(commitInterval)); - advice.setRepeatOperations(repeatTemplate); - return advice; - } +// private RepeatOperationsInterceptor getRepeatOperationsInterceptor(int commitInterval) { +// RepeatOperationsInterceptor advice = new RepeatOperationsInterceptor(); +// RepeatTemplate repeatTemplate = new RepeatTemplate(); +// repeatTemplate.setCompletionPolicy(new SimpleCompletionPolicy(commitInterval)); +// advice.setRepeatOperations(repeatTemplate); +// return advice; +// } private Object getProxy(Object target, Class intf, Advice[] advices, String methodName) { ProxyFactory factory = new ProxyFactory(target); diff --git a/spring-batch-samples/src/site/apt/index.apt b/spring-batch-samples/src/site/apt/index.apt index 1d1d97c6e..bd18d8bf9 100644 --- a/spring-batch-samples/src/site/apt/index.apt +++ b/spring-batch-samples/src/site/apt/index.apt @@ -613,5 +613,5 @@ games.player_id group by games.player_id, games.year_no sample application you can execute the JUnit test <<>>, and you'll see an output showing each of the records as they are processed. Please keep in mind that - AoP is used to wrap the <<> and output each record as it + AoP is used to wrap the <<>> and output each record as it is processed to the logger, which may impact performance.