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

BATCH-2229 & BATCH-2218: Removed OSGi related metadata and Maven POMs

Browse Source
This commit is contained in:
Michael Minella
2014-05-08 14:37:27 -05:00
parent 76af420116
commit e7a4e348a5
147 changed files with 499 additions and 5044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
spring-batch-test/pom.xml
View File

@@ -1,89 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-batch-test</artifactId>
<name>Test</name>
<packaging>jar</packaging>
<description>Domain for batch job testing</description>
<parent>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-parent</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-batch-parent</relativePath>
</parent>
<scm>
<url>https://github.com/spring-projects/spring-batch</url>
<connection>scm:git:git://github.com/spring-projects/spring-batch.git</connection>
<developerConnection>scm:git:git://github.com/spring-projects/spring-batch.git</developerConnection>
<tag>HEAD</tag>
</scm>
<dependencies>
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
</dependencies>
<reporting>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>1.0-alpha-1</version>
</plugin>
</plugins>
</reporting>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<junitArtifactName>junit:junit</junitArtifactName>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>

2
spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java
View File

@@ -41,7 +41,7 @@ import org.springframework.util.StringUtils;
/**
* Wrapper for a {@link DataSource} that can run scripts on start up and shut
* down. Us as a bean definition <br/><br/>
* down. Us as a bean definition <br><br>
*
* Run this class to initialize a database in a running server process.
* Make sure the server is running first by launching the "hsql-server" from the

19
spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java
View File

@@ -15,15 +15,6 @@
*/
package org.springframework.batch.test;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import javax.sql.DataSource;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobInstance;
import org.springframework.batch.core.JobParameter;
@@ -42,6 +33,14 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
import org.springframework.util.Assert;
import javax.sql.DataSource;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* Convenience class for creating and removing {@link JobExecution} instances
* from a database. Typical usage in test case would be to create instances
@@ -123,7 +122,6 @@ public class JobRepositoryTestUtils extends AbstractJdbcBatchMetadataDao impleme
* @param count the required number of instances of {@link JobExecution} to
* create
* @return a collection of {@link JobExecution}
* @throws Exception if there is a problem in the {@link JobRepository}
*/
public List<JobExecution> createJobExecutions(String jobName, String[] stepNames, int count)
throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException {
@@ -147,7 +145,6 @@ public class JobRepositoryTestUtils extends AbstractJdbcBatchMetadataDao impleme
* @param count the required number of instances of {@link JobExecution} to
* create
* @return a collection of {@link JobExecution}
* @throws Exception if there is a problem in the {@link JobRepository}
*/
public List<JobExecution> createJobExecutions(int count) throws JobExecutionAlreadyRunningException,
JobRestartException, JobInstanceAlreadyCompleteException {

15
spring-batch-test/src/site/apt/changelog.apt
View File

@@ -1,15 +0,0 @@
Changelog: Spring Batch Test
* 2.0.0.RC1
* BATCH-1049: Add compile scope to spring-test in spring-batch-test
* BATCH-1048: Add site docos for the Test project
* 2.0.0.M4
* BATCH-1045: Move DataSourceInitializer to the test project's "main" folder
* BATCH-1032: Modify AbstractJobTests in test project to be able to launch FlowJob steps individually
* 2.0.0.M3
* BATCH-933: AssertFile class for checking equality of files in unit tests
* BATCH-903: Create test project

22
spring-batch-test/src/site/apt/index.apt
View File

@@ -1,22 +0,0 @@
Spring Batch Test
* Overview
This module contains code for facilitating the testing of batch jobs. The project
includes the following classes:
*----+----+
| <<Class Name>> | <<Use>> |
*----+----+
| AbstractJobTests | End-to-end batch job testing as well as testing individual steps |
*----+----+
| AssertFile | Checking equality of flat files |
*----+----+
| DataSourceInitializer | Wrapper for a DataSource that can run scripts on start up and shut down |
*----+----+
| JobRepositoryTestUtils | Create and remove JobExecution instances from a database |
*----+----+
| MetaDataInstanceFactory | Create test instances of JobExecution, JobInstance and StepExecution |
*----+----+
| StepRunner | Execute steps outside of a Job |
*----+----+

17
spring-batch-test/src/site/site.xml
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Spring Batch: ${project.name}">
<body>
<links>
<item name="${project.name}" href="index.html"/>
</links>
<menu name="Documentation">
<item name="${project.name}" href="index.html"/>
</menu>
<menu ref="reports"/>
</body>
</project>

39
spring-batch-test/template.mf
View File

@@ -1,39 +0,0 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.springframework.batch.test
Bundle-Name: Spring Batch Test
Bundle-Vendor: Spring
Bundle-Version: ${version}
Bundle-ManifestVersion: 2
Ignored-Existing-Headers:
Import-Package,
Export-Package
Import-Template:
com.ibatis.sqlmap.*;version="[2.3.0, 3.0.0)";resolution:=optional,
javax.jms.*;version=1.1.0;resolution:=optional,
javax.xml.stream.*;version=1.2.0;resolution:=optional,
javax.persistence.*;version="[1.0.0,2.0.0)";resolution:=optional,
org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
org.apache.commons.io.*;version="[1.4.0, 2.0.0)";resolution:=optional,
org.junit;version="[4.4.0,5.0.0)";resolution:=optional,
junit.framework;version="[4.4.0,5.0.0)";resolution:=optional,
org.hibernate.*;version="[3.2.5.ga, 3.3.0.ga)";resolution:=optional,
org.springframework.batch.*;version="[2.0.0, 3.0.0)",
org.springframework.aop.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.aop.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.beans.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.core.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.dao.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.test.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.context.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.jdbc.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.jms.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.orm.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.transaction.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.util.*;version="[2.5.5, 4.0.0)";resolution:=optional,
org.springframework.validation.*;version="[2.5.5, 4.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,
javax.sql.*;version="0",
javax.xml.namespace.*;version="0",
javax.xml.transform.*;version="0"