From 3bfc17433e3fae9fa796311a33adc27b6127bd85 Mon Sep 17 00:00:00 2001 From: dsyer Date: Mon, 6 Apr 2009 08:54:09 +0000 Subject: [PATCH] BATCH-1188: upgrade to bundlor M2 --- archetypes/simple-cli/template.mf | 3 +- spring-batch-core/template.mf | 10 +- spring-batch-infrastructure/template.mf | 14 +- spring-batch-parent/pom.xml | 2 +- spring-batch-samples/.springBeans | 202 +----------------------- 5 files changed, 12 insertions(+), 219 deletions(-) diff --git a/archetypes/simple-cli/template.mf b/archetypes/simple-cli/template.mf index 0af001be5..3a4d2fda2 100755 --- a/archetypes/simple-cli/template.mf +++ b/archetypes/simple-cli/template.mf @@ -13,5 +13,4 @@ Import-Template: org.springframework.transaction.*;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, -Unversioned-Imports: - javax.sql.* + javax.sql.*;version="0";resolution:=optional diff --git a/spring-batch-core/template.mf b/spring-batch-core/template.mf index 8400a07e3..764b4bae5 100644 --- a/spring-batch-core/template.mf +++ b/spring-batch-core/template.mf @@ -11,7 +11,6 @@ Import-Template: org.codehaus.jettison.*;version="[1.0,1.1)";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)", org.aspectj.*;version="[1.5.2,1.7.0)";resolution:=optional, - org.osgi.framework;resolution:=optional, org.apache.commons.logging.*;version="[1.0.4, 2.0.0)", org.springframework.batch.*;version="[2.0.0, 3.0.0)";resolution:=optional, org.springframework.aop.*;version="[2.5.5, 3.0.0)", @@ -23,9 +22,8 @@ Import-Template: 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, - org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional -Unversioned-Imports: - javax.sql.*, - org.osgi.framework, - org.w3c.dom.* + org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional, + org.osgi.framework;version="0";resolution:=optional, + org.w3c.dom;version="0";resolution:=optional, + javax.sql.*;version="0";resolution:=optional \ No newline at end of file diff --git a/spring-batch-infrastructure/template.mf b/spring-batch-infrastructure/template.mf index 8073642c7..fc8b64703 100644 --- a/spring-batch-infrastructure/template.mf +++ b/spring-batch-infrastructure/template.mf @@ -29,12 +29,8 @@ Import-Template: org.springframework.validation.*;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.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional -Unversioned-Imports: - javax.sql.*, - org.osgi.framework, - org.w3c.dom.*, - javax.jms, - javax.persistence, - javax.xml.* - \ No newline at end of file + org.springframework.osgi.*;version="[1.1.0, 2.0.0)";resolution:=optional, + javax.sql.*;version="0";resolution:=optional, + javax.jms;version="0";resolution:=optional, + javax.persistence;version="0";resolution:=optional, + javax.xml.*;version="0";resolution:=optional diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml index 0b43a163b..06b2a5052 100644 --- a/spring-batch-parent/pom.xml +++ b/spring-batch-parent/pom.xml @@ -14,7 +14,7 @@ true 2.5.6.A - 1.0.0.M1A + 1.0.0.M2 diff --git a/spring-batch-samples/.springBeans b/spring-batch-samples/.springBeans index 4a9376336..d3d466999 100644 --- a/spring-batch-samples/.springBeans +++ b/spring-batch-samples/.springBeans @@ -1,74 +1,12 @@ 1 - + - src/main/resources/jobs/multilineJob.xml - src/main/resources/jobs/multilineOrderIo.xml - src/main/resources/jobs/multilineOrderJob.xml - src/main/resources/jobs/tradeJob.xml - src/main/resources/jobs/restartSample.xml - src/main/resources/data-source-context.xml - src/main/resources/jobs/beanWrapperMapperSampleJob.xml - src/main/resources/jobs/adhocLoopJob.xml - src/main/resources/jobs/infiniteLoopJob.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/footballJob.xml - src/main/resources/jobs/delegatingJob.xml - src/main/resources/jobs/parallelJob.xml - src/main/resources/jobs/retrySample.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/adhoc-job-launcher-context.xml - src/main/resources/alt-data-source-context.xml - src/main/resources/quartz-job-launcher-context.xml - src/main/resources/jobs/skipSampleJob.xml - src/main/resources/jobs/multilineOrderInputTokenizers.xml - src/main/resources/jobs/multilineOrderOutputAggregators.xml - src/main/resources/jobs/compositeItemWriterSampleJob.xml - src/main/resources/hibernate-context.xml - src/main/resources/staging-test-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/jobs/headerFooterSample.xml - src/main/resources/jobs/customerFilterJob.xml - src/main/resources/skipSample-job-launcher-context.xml - src/main/resources/jobs/ioSampleJob.xml - src/main/resources/jobs/iosample/delimited.xml - src/main/resources/jobs/iosample/fixedLength.xml - src/main/resources/jobs/iosample/jdbcCursor.xml - src/main/resources/jobs/iosample/multiLine.xml - src/main/resources/jobs/iosample/multiRecordType.xml - src/main/resources/jobs/iosample/multiResource.xml - src/main/resources/jobs/iosample/xml.xml - src/main/resources/jobs/iosample/hibernate.xml - src/main/resources/jobs/hibernateJob.xml - src/main/resources/jobs/iosample/jpa.xml - src/main/resources/jobs/iosample/ibatis.xml - src/test/resources/org/springframework/batch/sample/JobOperatorFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/CustomerFilterJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/DatabaseShutdownFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/DelegatingJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/FootballJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/GracefulShutdownFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/HeaderFooterSampleFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/HibernateFailureJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/domain/trade/internal/JdbcCustomerDebitDaoTests-context.xml - src/main/resources/jobs/loopFlowSample.xml - src/test/resources/org/springframework/batch/sample/MultilineJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/MultilineOrderJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/ParallelJobFunctionalTests-context.xml - src/main/resources/jobs/partitionJob.xml - src/test/resources/org/springframework/batch/sample/RestartFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/RetrySampleFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/common/StagingItemReaderTests-context.xml - src/test/resources/org/springframework/batch/sample/common/StagingItemWriterTests-context.xml - src/test/resources/org/springframework/batch/sample/TradeJobFunctionalTests-context.xml - src/test/resources/org/springframework/batch/sample/PartitionJobFunctionalTests-context.xml @@ -76,7 +14,6 @@ true false - src/main/resources/data-source-context.xml @@ -84,11 +21,6 @@ true false - src/main/resources/jobs/beanWrapperMapperSampleJob.xml - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -96,10 +28,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/jobs/delegatingJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -107,10 +35,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/jobs/footballJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -118,11 +42,6 @@ true false - src/main/resources/jobs/infiniteLoopJob.xml - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -130,11 +49,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/multilineJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -142,10 +56,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/jobs/parallelJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -153,11 +63,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/restartSample.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -165,11 +70,6 @@ true false - src/main/resources/jobs/retrySample.xml - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -177,11 +77,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/tradeJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -189,10 +84,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -200,10 +91,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/quartz-job-launcher-context.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -211,14 +98,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/multilineOrderIo.xml - src/main/resources/jobs/multilineOrderJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/jobs/multilineOrderInputTokenizers.xml - src/main/resources/jobs/multilineOrderOutputAggregators.xml @@ -226,11 +105,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/jobs/compositeItemWriterSampleJob.xml @@ -238,11 +112,6 @@ true false - src/main/resources/jobs/adhocLoopJob.xml - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -250,8 +119,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/staging-test-context.xml @@ -259,9 +126,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml @@ -269,10 +133,6 @@ true false - src/main/resources/adhoc-job-launcher-context.xml - src/main/resources/data-source-context.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -280,10 +140,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/jobs/headerFooterSample.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml @@ -291,11 +147,6 @@ true false - src/main/resources/jobs/customerFilterJob.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -303,11 +154,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/hibernate-context.xml - src/main/resources/jobs/hibernateJob.xml @@ -315,10 +161,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml @@ -326,11 +168,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/jobs/skipSampleJob.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/skipSample-job-launcher-context.xml @@ -338,13 +175,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/ioSampleJob.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/hibernate-context.xml - src/main/resources/jobs/iosample/hibernate.xml @@ -352,12 +182,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/iosample/jdbcCursor.xml - src/main/resources/jobs/ioSampleJob.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml @@ -365,11 +189,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/iosample/multiLine.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml @@ -377,11 +196,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/iosample/multiRecordType.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml @@ -389,12 +203,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/iosample/jpa.xml - src/main/resources/jobs/ioSampleJob.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/simple-job-launcher-context.xml @@ -409,11 +217,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/simple-job-launcher-context.xml - src/main/resources/org/springframework/batch/sample/config/common-context.xml - src/main/resources/data-source-context-init.xml - src/main/resources/jobs/iosample/ibatis.xml @@ -421,9 +224,6 @@ true false - src/main/resources/data-source-context.xml - src/main/resources/jobs/partitionJob.xml - src/main/resources/simple-job-launcher-context.xml