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

Tweak manifests and make OSGi projects into S2AP bundles

Browse Source
This commit is contained in:
dsyer
2008-07-17 07:55:13 +00:00
parent 7e412c75ff
commit e646cd8a16
15 changed files with 322 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultFieldSet.java
View File

@@ -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()

180
spring-batch-infrastructure/src/main/resources/META-INF/MANIFEST.MF
View File

@@ -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

27
spring-batch-infrastructure/src/main/resources/META-INF/spring-batch-infrastructure.mf
View File

@@ -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.*,

5
spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/database/data-source-context.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
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">
<bean id="dataSource" class="test.jdbc.datasource.InitializingDataSourceFactoryBean">
<property name="dataSource">
@@ -21,4 +23,5 @@
<property name="dataSource" ref="dataSource" />
<property name="columnName" value="ID" />
</bean>
</beans>