diff --git a/archetypes/simple-cli/.classpath b/archetypes/simple-cli/.classpath index fd0447b45..96489ff1c 100644 --- a/archetypes/simple-cli/.classpath +++ b/archetypes/simple-cli/.classpath @@ -1,9 +1,10 @@ + - - - - - - - + + + + + + + diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index 46d9c97c8..f237f5433 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.batch spring-batch-simple-cli @@ -9,245 +10,251 @@ http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype This project is a minimal command line batch sample from Spring Batch. Once installed you can use "mvn exec:java" to see the job run; or if you ship the lib directory you can put the project jar on the classpath and run the CommandLineJobRunner directly or with "java -jar". - - true - 2.5.6 - - - - strict - - false - - - - tiger - - 1.5 - - - - stax - stax - 1.2.0 - - - - - staging - - - staging - file:///${user.dir}/target/staging - - - staging - file:///${user.dir}/target/staging - - - - - - - junit - junit - 4.4 - test - - - org.springframework - spring-test - ${spring.framework.version} - test - - - org.springframework - spring-jdbc - ${spring.framework.version} - - - org.springframework.batch - spring-batch-core - ${pom.version} - - - org.springframework.batch - spring-batch-infrastructure - 2.0.2.CI-SNAPSHOT - - - commons-dbcp - commons-dbcp - 1.2.2 - - - commons-io - commons-io - 1.4 - - - hsqldb - hsqldb - 1.8.0.7 - - - org.aspectj - aspectjrt - 1.5.4 - - - org.aspectj - aspectjweaver - 1.5.4 - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 2.0.0.RELEASE - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.M1B - - - maven-assembly-plugin - false - - - project - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - com.springsource.bundlor - com.springsource.bundlor.maven - - - bundlor-transform - package - - transform - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Tests.java - - - **/Abstract*.java - - junit:junit - - - - org.codehaus.mojo - exec-maven-plugin - 1.1 - - org.springframework.batch.core.launch.support.CommandLineJobRunner - - classpath:/launch-context.xml - job1 - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - true - - org.springframework.batch.core.launch.support.CommandLineJobRunner - true - lib/ - - - - - - - - - - Codehaus - http://repository.codehaus.org/ - - false - - - - com.springsource.repository.bundles.milestone - SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones + + true + 2.5.6 + 2.0.2.CI-SNAPSHOT + + + + strict + + false + + + + tiger + + 1.5 + + + + stax + stax + 1.2.0 + + + + + staging + + + staging + file:///${user.dir}/target/staging + + + staging + file:///${user.dir}/target/staging + + + + + + + junit + junit + 4.4 + test + + + org.springframework + spring-test + ${spring.framework.version} + test + + + org.springframework + spring-jdbc + ${spring.framework.version} + + + org.springframework.batch + spring-batch-core + ${spring.batch.version} + + + org.springframework.batch + spring-batch-infrastructure + ${spring.batch.version} + + + commons-dbcp + commons-dbcp + 1.2.2 + + + log4j + log4j + 1.2.14 + + + commons-io + commons-io + 1.4 + + + hsqldb + hsqldb + 1.8.0.7 + + + org.aspectj + aspectjrt + 1.5.4 + + + org.aspectj + aspectjweaver + 1.5.4 + + + + + + org.springframework.build.aws + org.springframework.build.aws.maven + 2.0.0.RELEASE + + + + + + com.springsource.bundlor + com.springsource.bundlor.maven + 1.0.0.M1B + + + maven-assembly-plugin + false + + + project + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + com.springsource.bundlor + com.springsource.bundlor.maven + + + bundlor-transform + package + + transform + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Tests.java + + + **/Abstract*.java + + junit:junit + + + + org.codehaus.mojo + exec-maven-plugin + 1.1 + + org.springframework.batch.core.launch.support.CommandLineJobRunner + + classpath:/launch-context.xml + job1 + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + true + + org.springframework.batch.core.launch.support.CommandLineJobRunner + true + lib/ + + + + + + + + + + Codehaus + http://repository.codehaus.org/ + + false + + + + com.springsource.repository.bundles.milestone + SpringSource Enterprise Bundle Repository - SpringSource Bundle Milestones - http://repository.springsource.com/maven/bundles/milestone - - false - - - - com.springsource.repository.bundles.snapshots - SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots + http://repository.springsource.com/maven/bundles/milestone + + false + + + + com.springsource.repository.bundles.snapshots + SpringSource Enterprise Bundle Repository - SpringSource Bundle Snapshots - http://repository.springsource.com/maven/bundles/snapshot - - - - http://www.springframework.org/download - - staging - file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId} - - - spring-release - Spring Release Repository + http://repository.springsource.com/maven/bundles/snapshot + + + + http://www.springframework.org/download + + staging + file:///${user.dir}/target/staging/org.springframework.batch.archetype/${pom.artifactId} + + + spring-release + Spring Release Repository - file:///${user.dir}/target/staging/release - - - spring-snapshot - Spring Snapshot Repository + file:///${user.dir}/target/staging/release + + + spring-snapshot + Spring Snapshot Repository - file:///${user.dir}/target/staging/snapshot - - + file:///${user.dir}/target/staging/snapshot + + \ No newline at end of file diff --git a/archetypes/simple-cli/src/main/resources/log4j.properties b/archetypes/simple-cli/src/main/resources/log4j.properties index 6d5422d74..fd06b94c7 100644 --- a/archetypes/simple-cli/src/main/resources/log4j.properties +++ b/archetypes/simple-cli/src/main/resources/log4j.properties @@ -2,7 +2,7 @@ log4j.rootCategory=INFO, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n +log4j.appender.stdout.layout.ConversionPattern=%d %p %t [%c] - <%m>%n log4j.category.org.apache.activemq=ERROR log4j.category.org.springframework.batch=DEBUG diff --git a/spring-batch-core/.settings/org.maven.ide.eclipse.prefs b/spring-batch-core/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..b49152cf9 --- /dev/null +++ b/spring-batch-core/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Sat Jun 20 14:28:54 BST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-infrastructure-tests/.classpath b/spring-batch-infrastructure-tests/.classpath index ed08cd1cb..96489ff1c 100644 --- a/spring-batch-infrastructure-tests/.classpath +++ b/spring-batch-infrastructure-tests/.classpath @@ -1,9 +1,10 @@ + - - - - - - - + + + + + + + diff --git a/spring-batch-infrastructure-tests/.settings/org.maven.ide.eclipse.prefs b/spring-batch-infrastructure-tests/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..b49152cf9 --- /dev/null +++ b/spring-batch-infrastructure-tests/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Sat Jun 20 14:28:54 BST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-infrastructure/.classpath b/spring-batch-infrastructure/.classpath index b11f0c630..6886233c2 100644 --- a/spring-batch-infrastructure/.classpath +++ b/spring-batch-infrastructure/.classpath @@ -1,10 +1,11 @@ + - - - - - - - - + + + + + + + + diff --git a/spring-batch-infrastructure/.settings/org.maven.ide.eclipse.prefs b/spring-batch-infrastructure/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..99ef11e30 --- /dev/null +++ b/spring-batch-infrastructure/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Sat Jun 20 14:28:53 BST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-integration/.classpath b/spring-batch-integration/.classpath index ed08cd1cb..96489ff1c 100644 --- a/spring-batch-integration/.classpath +++ b/spring-batch-integration/.classpath @@ -1,9 +1,10 @@ + - - - - - - - + + + + + + + diff --git a/spring-batch-integration/.settings/org.maven.ide.eclipse.prefs b/spring-batch-integration/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..a2b35c47b --- /dev/null +++ b/spring-batch-integration/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Sat Jun 20 14:28:55 BST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-parent/.classpath b/spring-batch-parent/.classpath new file mode 100644 index 000000000..a225f00db --- /dev/null +++ b/spring-batch-parent/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/spring-batch-parent/.project b/spring-batch-parent/.project index 4668bfeac..b6ed93e3d 100644 --- a/spring-batch-parent/.project +++ b/spring-batch-parent/.project @@ -5,7 +5,19 @@ + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature diff --git a/spring-batch-parent/.settings/org.eclipse.jdt.core.prefs b/spring-batch-parent/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..d31832305 --- /dev/null +++ b/spring-batch-parent/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +#Sun Jun 21 09:14:50 BST 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-batch-parent/.settings/org.maven.ide.eclipse.prefs b/spring-batch-parent/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..0fda837c8 --- /dev/null +++ b/spring-batch-parent/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Sun Jun 21 09:14:45 BST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-samples/.classpath b/spring-batch-samples/.classpath index ed08cd1cb..96489ff1c 100644 --- a/spring-batch-samples/.classpath +++ b/spring-batch-samples/.classpath @@ -1,9 +1,10 @@ + - - - - - - - + + + + + + + diff --git a/spring-batch-samples/.settings/org.maven.ide.eclipse.prefs b/spring-batch-samples/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..b49152cf9 --- /dev/null +++ b/spring-batch-samples/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,9 @@ +#Sat Jun 20 14:28:54 BST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml index 19a2d65f2..98403ec01 100644 --- a/spring-batch-samples/pom.xml +++ b/spring-batch-samples/pom.xml @@ -134,6 +134,11 @@ 1.2 test + + log4j + log4j + true + org.codehaus.groovy groovy diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml index 84aba357c..c4b909e86 100644 --- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml @@ -1,14 +1,14 @@ - - + - - + - - - - - - - + + + + + + + - - + - - - - - - - + + + + + + + - - - - + + + + - - + - - + + - - - - - + + + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - + - + - - - + + + - - - + + + - + - + diff --git a/spring-batch-test/.classpath b/spring-batch-test/.classpath index e35a76c61..f42fb64cf 100755 --- a/spring-batch-test/.classpath +++ b/spring-batch-test/.classpath @@ -1,9 +1,10 @@ + - - - - - - - + + + + + + +