diff --git a/core/.classpath b/core/.classpath deleted file mode 100644 index 65de75cb7..000000000 --- a/core/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/execution/.classpath b/execution/.classpath deleted file mode 100644 index b9f24a16d..000000000 --- a/execution/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/BatchHibernateInterceptor.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/BatchHibernateInterceptor.java deleted file mode 100644 index 257f69e4d..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/BatchHibernateInterceptor.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.springframework.batch.execution.repository.dao; - -import java.io.Serializable; - -import org.hibernate.EmptyInterceptor; -import org.hibernate.type.Type; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobIdentifier; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.repeat.ExitStatus; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.util.Assert; - -/** - * Hibernate interceptor for batch meta data. It can distinguish between the - * various {@link JobIdentifier} strategies in a {@link JobInstance}, and can - * truncate the exit descriptions. Its main task is to return the correct entity - * name for a {@link JobInstance} based on the type of {@link JobIdentifier} - * used. There is necessarily some tight coupling between this and the Hibernate - * mappings for {@link JobInstance} because the map from {@link JobIdentifier} - * type to entity name is in both places. - * - * @author Dave Syer - * - */ -public class BatchHibernateInterceptor extends EmptyInterceptor implements - InitializingBean { - - /** - * - */ - private static final int EXIT_MESSAGE_LENGTH = 250; - private EntityNameLocator entityNameLocator; - - /** - * Public setter for the {@link EntityNameLocator} property. - * - * @param entityNameLocator - * the entityNameLocator to set - */ - public void setEntityNameLocator(EntityNameLocator entityNameLocator) { - this.entityNameLocator = entityNameLocator; - } - - /** - * Check mandatory properties ({@link #entityNameLocator}). - * - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - */ - public void afterPropertiesSet() throws Exception { - Assert - .notNull(entityNameLocator, - "EntityNameLocator must be provided."); - } - - /** - * If the object is a {@link JobInstance} search the identifier types for an - * entity name based on the {@link JobIdentifier} type. Fall back to - * SimpleJobIdentifier if the value is not found. - * - * @see org.hibernate.EmptyInterceptor#getEntityName(java.lang.Object) - */ - public String getEntityName(Object object) { - if (object instanceof JobInstance) { - JobInstance instance = (JobInstance) object; - return entityNameLocator - .locate(instance.getIdentifier().getClass()); - } - return super.getEntityName(object); - } - - /** - * Ensure that {@link JobExecution} and {@link StepExecution} have exit - * status with legal description (not too long). - * - * @see org.hibernate.EmptyInterceptor#onFlushDirty(java.lang.Object, - * java.io.Serializable, java.lang.Object[], java.lang.Object[], - * java.lang.String[], org.hibernate.type.Type[]) - */ - public boolean onFlushDirty(Object entity, Serializable id, - Object[] currentState, Object[] previousState, - String[] propertyNames, Type[] types) { - - if (entity instanceof StepExecution || entity instanceof JobExecution) { - int index = findExitStatus(propertyNames); - ExitStatus status = (ExitStatus) currentState[index]; - String description = status == null ? "" : status - .getExitDescription(); - if (description.length() > EXIT_MESSAGE_LENGTH) { - status = status.addExitDescription(description.substring(0, - EXIT_MESSAGE_LENGTH)); - currentState[index] = status; - // state was modified... - return true; - } - } - - return false; - } - - /** - * @param propertyNames - * @return - */ - private int findExitStatus(String[] propertyNames) { - for (int i = 0; i < propertyNames.length; i++) { - if ("exitStatus".equals(propertyNames[i])) { - return i; - } - } - return -1; - } - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/BatchStatusUserType.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/BatchStatusUserType.java deleted file mode 100644 index 9f73de74b..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/BatchStatusUserType.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; - -import org.hibernate.HibernateException; -import org.springframework.batch.core.domain.BatchStatus; - -/** - * User type object to help Hibernate to persist {@link BatchStatus} objects - * (just plonking it a String). - * - * @author Dave Syer - * - */ -public class BatchStatusUserType extends ImmutableValueUserType { - - /* (non-Javadoc) - * @see org.springframework.batch.execution.repository.dao.ImmutableValueUserType#sqlTypes() - */ - public int[] sqlTypes() { - return new int[] { Types.VARCHAR }; - } - - /** - * Get the - * @see org.springframework.batch.execution.repository.dao.ImmutableValueUserType#nullSafeGet(java.sql.ResultSet, java.lang.String[], java.lang.Object) - */ - public Object nullSafeGet(ResultSet rs, String[] names, Object owner) - throws HibernateException, SQLException { - return BatchStatus.getStatus(rs.getString(names[0])); - } - - - - /** - * Plonk a String representation of the status in the prepared statement. - * - * @see org.springframework.batch.execution.repository.dao.ImmutableValueUserType#nullSafeSet(java.sql.PreparedStatement, java.lang.Object, int) - */ - public void nullSafeSet(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - st.setString(index, value!=null ? value.toString() : null); - } - - /* (non-Javadoc) - * @see org.springframework.batch.execution.repository.dao.ImmutableValueUserType#returnedClass() - */ - public Class returnedClass() { - return BatchStatus.class; - } - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/EntityNameLocator.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/EntityNameLocator.java deleted file mode 100644 index ad270b3d1..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/EntityNameLocator.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.batch.execution.repository.dao; - -/** - * Locator strategy for entity names based on class. - * - * @author Dave Syer - * - */ -public interface EntityNameLocator { - - /** - * Translate a concrete class into an entity name. - * - * @param clz the Class of the object to locate - * @return an entity name - */ - String locate(Class clz); - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/ExitStatusUserType.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/ExitStatusUserType.java deleted file mode 100644 index bb043fe22..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/ExitStatusUserType.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Types; - -import org.hibernate.HibernateException; -import org.springframework.batch.repeat.ExitStatus; - -/** - * User type object to help Hibernate persist (@link {@link ExitStatus}) - * objects. The continuable flag is mapped to a String with value Y/N. - * - * @author Dave Syer - * - */ -public class ExitStatusUserType extends ImmutableValueUserType { - - /** - * Convert a result set to an {@link ExitStatus}. - * - * @see org.springframework.batch.execution.repository.dao.ImmutableValueUserType#nullSafeGet(java.sql.ResultSet, java.lang.String[], java.lang.Object) - */ - public Object nullSafeGet(ResultSet rs, String[] names, Object owner) - throws HibernateException, SQLException { - boolean continuable = "Y".equals(rs.getString(names[0])); - String code = rs.getString(names[1]); - String message = rs.getString(names[2]); - return new ExitStatus(continuable, code, message); - } - - /** - * Convert the value (as an {@link ExitStatus}) to the columns in the - * prepared statement. - * - * @see org.springframework.batch.execution.repository.dao.ImmutableValueUserType#nullSafeSet(java.sql.PreparedStatement, - * java.lang.Object, int) - */ - public void nullSafeSet(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - ExitStatus status = (ExitStatus) value; - st.setString(index, status.isContinuable() ? "Y" : "N"); - st.setString(index + 1, status.getExitCode()); - st.setString(index + 2, status.getExitDescription()); - } - - public Class returnedClass() { - return ExitStatus.class; - } - - public int[] sqlTypes() { - return new int[] { Types.CHAR, Types.VARCHAR, Types.VARCHAR }; - } - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateJobDao.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateJobDao.java deleted file mode 100644 index 4ce2f597b..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateJobDao.java +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.criterion.Expression; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobIdentifier; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.repository.NoSuchBatchDomainObjectException; -import org.springframework.batch.execution.runtime.ScheduledJobIdentifier; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.springframework.util.Assert; - -/** - * Implementation of {@link JobDao} functionality based on the Hibernate ORM - * framework. Its advantage is the independence of implementation on the - * underlying database. - * - * @author Tomas Slanina - * @author Dave Syer - */ - -public class HibernateJobDao extends HibernateDaoSupport implements JobDao, InitializingBean { - - private EntityNameLocator entityNameLocator; - - /** - * Public setter for the {@link EntityNameLocator} property. - * - * @param entityNameLocator the entityNameLocator to set - */ - public void setEntityNameLocator(EntityNameLocator entityNameLocator) { - this.entityNameLocator = entityNameLocator; - } - - /** - * Check mandatory properties ({@link #entityNameLocator}). - * @see org.springframework.dao.support.DaoSupport#initDao() - */ - protected void initDao() throws Exception { - Assert.notNull(entityNameLocator, "An EntityNameLocator must be provided."); - super.initDao(); - } - - /** - * @see JobDao#createJob(JobIdentifier) - * - * In this Hibernate implementation a job is stored into the database. Id is - * obtained from Hibernate. - */ - public JobInstance createJob(JobIdentifier jobIdentifier) { - - validateJobIdentifier(jobIdentifier); - - JobInstance job = new JobInstance(jobIdentifier); - - Long jobId = (Long) getHibernateTemplate().save(job); - - job.setId(jobId); - - return job; - } - - /** - * @see JobDao#findJobs(JobIdentifier) - * - * Hibernate is asked to get all jobs that matches criteria. Afterwards, - * result is mapped into domain objects. - */ - public List findJobs(JobIdentifier jobIdentifier) { - - final JobIdentifier jobRuntimeInformation = jobIdentifier; - - validateJobIdentifier(jobRuntimeInformation); - - List list = this.getHibernateTemplate().executeFind( - new HibernateCallback() { - public Object doInHibernate(Session session) { - String entityName = entityNameLocator.locate(jobRuntimeInformation.getClass()); - Criteria criteria = session - .createCriteria(entityName); - criteria.add(Expression.eq("identifier", - jobRuntimeInformation)); - return criteria.list(); - } - }); - - return list; - } - - /** - * @see JobDao#getJobExecutionCount(Long) - */ - public int getJobExecutionCount(final Long jobId) { - - Assert.notNull(jobId, "JobId cannot be null"); - - Long result = (Long) this.getHibernateTemplate().execute( - new HibernateCallback() { - public Object doInHibernate(Session session) { - return session - .createQuery( - "select count(id) from JobExecution where job.id = :jobId") - .setLong("jobId", jobId.longValue()) - .uniqueResult(); - } - }); - - return (result == null) ? 0 : result.intValue(); - } - - /** - * @see JobDao#save(JobExecution) - * - * Hibernate implementation persists JobExecution instance. Id is obtained - * from Hibernate. - */ - public void save(JobExecution jobExecution) { - - validateJobExecution(jobExecution); - - Long id = (Long) getHibernateTemplate().save(jobExecution); - jobExecution.setId(id); - } - - /** - * @see JobDao#update(JobInstance) - */ - public void update(JobInstance job) { - - Assert.notNull(job, "Job Cannot be Null"); - Assert.notNull(job.getStatus(), "Job Status cannot be Null"); - Assert.notNull(job.getId(), "Job ID cannot be null"); - - getHibernateTemplate().update(job); - } - - /** - * @see JobDao#update(JobExecution) - */ - public void update(final JobExecution jobExecution) { - - validateJobExecution(jobExecution); - - if (jobExecution.getId() == null) { - throw new IllegalArgumentException( - "JobExecution ID cannot be null. JobExecution must be saved " - + "before it can be updated."); - } - - JobExecution other = (JobExecution) getHibernateTemplate() - .get(JobExecution.class, jobExecution.getId()); - if (other == null) { - throw new NoSuchBatchDomainObjectException( - "Invalid JobExecution, ID " + jobExecution.getId() - + " not found."); - } - - getHibernateTemplate().evict(other); - - getHibernateTemplate().update(jobExecution); - } - - public List findJobExecutions(JobInstance job) { - - Assert.notNull(job, "Job cannot be null."); - Assert.notNull(job.getId(), "Job ID cannot be null."); - - final Long jobId = job.getId(); - - List list = this.getHibernateTemplate().executeFind( - new HibernateCallback() { - public Object doInHibernate(Session session) { - Criteria criteria = session - .createCriteria(JobExecution.class); - criteria.add(Expression.eq("job.id", jobId)); - return criteria.list(); - } - }); - - return list; - } - - /* - * Validate JobExecution. At a minimum, JobId, StartTime, EndTime, and - * Status cannot be null. - * - * @param jobExecution @throws IllegalArgumentException - */ - private void validateJobExecution(JobExecution jobExecution) { - - Assert.notNull(jobExecution); - Assert.notNull(jobExecution.getJobId(), - "JobExecution Job-Id cannot be null."); - Assert.notNull(jobExecution.getStartTime(), - "JobExecution start time cannot be null."); - Assert.notNull(jobExecution.getStatus(), - "JobExecution status cannot be null."); - } - - /* - * Validate JobRuntimeInformation. Due to differing requirements, it is - * acceptable for any field to be blank, however null fields may cause odd - * and vague exception reports from the database driver. - */ - private void validateJobIdentifier(JobIdentifier jobIdentifier) { - - Assert.notNull(jobIdentifier, "JobIdentifier cannot be null."); - Assert.hasText(jobIdentifier.getName(), - "JobIdentifier name cannot be null or empty."); - - if (jobIdentifier instanceof ScheduledJobIdentifier) { - ScheduledJobIdentifier jobRuntimeInformation = (ScheduledJobIdentifier) jobIdentifier; - - Assert.notNull(jobRuntimeInformation.getJobKey(), - "ScheduledJobIdentifier JobKey cannot be null."); - Assert.notNull(jobRuntimeInformation.getScheduleDate(), - "ScheduledJobIdentifier ScheduleDate cannot be null."); - } - } -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateStepDao.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateStepDao.java deleted file mode 100644 index 62b64f999..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/HibernateStepDao.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.criterion.Expression; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepInstance; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.springframework.util.Assert; - -/** - * It represents an implementation of {@link StepDao} functionality based - * on the Hibernate ORM framework. Its advantage is the independence of implementation - * on the underlying database. - * - * @author Tomas Slanina - * @author Dave Syer - */ -public class HibernateStepDao extends HibernateDaoSupport implements StepDao { - - /* (non-Javadoc) - * @see org.springframework.batch.container.repository.dao.StepDao#createStep(String, java.lang.Long) - */ - public StepInstance createStep(JobInstance job, String stepName) { - - Assert.notNull(job, "Job cannot be null."); - Assert.notNull(stepName, "StepName cannot be null."); - - StepInstance step = new StepInstance(job, stepName); - - Long stepId = (Long)getHibernateTemplate().save(step); - - step.setId(stepId); - - return step; - - } - - /** - * @see StepDao#findStep(Long, String) - */ - public StepInstance findStep(final JobInstance job, final String stepName) { - - Assert.notNull(job, "Job cannot be null."); - Assert.notNull(job.getId(), "Job ID cannot be null"); - Assert.notNull(stepName, "StepName cannot be null"); - - return (StepInstance) this.getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) { - Criteria criteria = session.createCriteria(StepInstance.class); - criteria.add(Expression.eq("name", stepName)); - criteria.add(Expression.eq("job.id", job.getId())); - return criteria.uniqueResult(); - } - }); - - } - - /** - * @see StepDao#findSteps(JobInstance) - * - * Hibernate is asked to get all jobs that matches criteria. Afterwards, result is mapped into domain objects. - * It should be noted that restart data must be requested separately. - * - */ - public List findSteps(final JobInstance job) { - - Assert.notNull(job, "JobId cannot be null."); - - List list = this.getHibernateTemplate().executeFind(new HibernateCallback() { - public Object doInHibernate(Session session) { - Criteria criteria = session.createCriteria(StepInstance.class); - criteria.add(Expression.eq("job.id", job.getId())); - return criteria.list(); - } - }); - - return list; - } - - /** - * @see StepDao#getStepExecutionCount(Long) - */ - public int getStepExecutionCount(final Long stepId) { - Long result = (Long) this.getHibernateTemplate().execute(new HibernateCallback() { - public Object doInHibernate(Session session) { - return session.createQuery("select count(id) from StepExecution s where s.step.id = :stepId") - .setLong("stepId", stepId.longValue()) - .uniqueResult(); - } - }); - - return (result==null) ? 0 :result.intValue(); - } - - /** - * @see StepDao#save(StepExecution) - * - * Hibernate implementation persists StepExecution instance. Id is obtained from Hibernate. - */ - public void save(StepExecution stepExecution) { - - validateStepExecution(stepExecution); - - Long id = (Long)getHibernateTemplate().save(stepExecution); - stepExecution.setId(id); - } - - /** - * @see StepDao#update(StepInstance) - */ - public void update(StepInstance step) { - - Assert.notNull(step, "Step cannot be null."); - Assert.notNull(step.getStatus(), "Step status cannot be null."); - Assert.notNull(step.getId(), "Step Id cannot be null."); - - getHibernateTemplate().update(step); - } - - /** - * @see StepDao#update(StepExecution) - */ - public void update(StepExecution stepExecution) { - - validateStepExecution(stepExecution); - Assert.notNull(stepExecution.getId(), "StepExecution Id cannot be null. StepExecution must saved" + - " before it can be updated."); - - getHibernateTemplate().update(stepExecution); - } - - public List findStepExecutions(final StepInstance step) { - - Assert.notNull(step, "Step cannot be null."); - - List results = this.getHibernateTemplate().executeFind(new HibernateCallback() { - public Object doInHibernate(Session session) { - Criteria criteria = session.createCriteria(StepExecution.class); - criteria.add(Expression.eq("step.id", step.getId())); - return criteria.list(); - } - }); - - return results; - - } - - /* - * Validate StepExecution. At a minimum, JobId, StartTime, EndTime, and Status cannot be - * null. EndTime can be null for an unfinished job. - * - * @param jobExecution - * @throws IllegalArgumentException - */ - private void validateStepExecution(StepExecution stepExecution){ - - Assert.notNull(stepExecution); - Assert.notNull(stepExecution.getStepId(), "StepExecution Step-Id cannot be null."); - Assert.notNull(stepExecution.getStartTime(), "StepExecution start time cannot be null."); - Assert.notNull(stepExecution.getStatus(), "StepExecution status cannot be null."); - } - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/ImmutableValueUserType.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/ImmutableValueUserType.java deleted file mode 100644 index a2f42955a..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/ImmutableValueUserType.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.springframework.batch.execution.repository.dao; - -import java.io.Serializable; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.hibernate.HibernateException; -import org.hibernate.usertype.UserType; - -/** - * A base class for user types that map immutable values (objects that cannot be - * changed after construction and may be safely shared). - * - * @author Ben Hale - * @author Dave Syer - */ -public abstract class ImmutableValueUserType implements UserType { - - public Object assemble(Serializable cached, Object owner) - throws HibernateException { - return cached; - } - - public Object deepCopy(Object value) throws HibernateException { - return value; - } - - public Serializable disassemble(Object value) throws HibernateException { - return (Serializable) value; - } - - public boolean equals(Object x, Object y) throws HibernateException { - if (x==null && y==null) { - return true; - } - if (x==null) { - return false; - } - return x.equals(y); - } - - public int hashCode(Object x) throws HibernateException { - return x.hashCode(); - } - - public boolean isMutable() { - return false; - } - - public Object replace(Object original, Object target, Object owner) - throws HibernateException { - return original; - } - - // subclasses must implement the following methods - - public abstract Class returnedClass(); - - public abstract int[] sqlTypes(); - - public abstract Object nullSafeGet(ResultSet rs, String[] names, - Object owner) throws HibernateException, SQLException; - - public abstract void nullSafeSet(PreparedStatement st, Object value, - int index) throws HibernateException, SQLException; - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobIdentifierEntityNameLocator.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobIdentifierEntityNameLocator.java deleted file mode 100644 index bd3eac792..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobIdentifierEntityNameLocator.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.batch.execution.repository.dao; - -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.springframework.batch.core.domain.JobIdentifier; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.execution.runtime.DefaultJobIdentifier; -import org.springframework.batch.execution.runtime.ScheduledJobIdentifier; -import org.springframework.util.ClassUtils; - -/** - * An {@link EntityNameLocator} that knows about {@link JobIdentifier} class - * types and translates them into entity names that are recongnized by - * Hibernate. The implementation is actually generic, and can be used as a - * general purpose {@link EntityNameLocator} by setting the - * {@link #identifierTypes} property. By default it knows about all the entity - * types that work out of the box with Spring Batch. - * - * @author Dave Syer - * - */ -public class JobIdentifierEntityNameLocator implements EntityNameLocator { - - private static final String SIMPLE_JOB_INSTANCE = "SimpleJobInstance"; - private Map identifierTypes; - private Set entrySet; - - public JobIdentifierEntityNameLocator() { - Map types = new HashMap(); - types.put(ScheduledJobIdentifier.class, "ScheduledJobInstance"); - types.put(DefaultJobIdentifier.class, "DefaultJobInstance"); - setIdentifierTypes(types); - }; - - /** - * Public setter for the identifier types. A map from Class (the - * {@link JobIdentifier} implementation) to String (the entity name). If a - * map from String to String is provided it will be interpreted as a map - * from class name to entity name. - * - * @throws IllegalArgumentException - * if a String key is provided that is not a Class name. - * - * @param types - * the identifierTypes to set - */ - public void setIdentifierTypes(Map types) { - - this.identifierTypes = new HashMap(); - for (Iterator iterator = types.entrySet().iterator(); iterator - .hasNext();) { - Map.Entry entry = (Map.Entry) iterator.next(); - Object key = entry.getKey(); - if (key instanceof Class) { - identifierTypes.put(key, entry.getValue()); - } else { - try { - Class classKey = ClassUtils.forName(key.toString()); - identifierTypes.put(classKey, entry.getValue()); - } catch (ClassNotFoundException e) { - throw new IllegalArgumentException( - "Could not convert key in identifierTypes to type Class: [" - + key + "]", e); - } - } - } - - this.entrySet = new TreeSet(new ClassComparator()); - entrySet.addAll(identifierTypes.keySet()); - - } - - /** - * Identify a {@link JobInstance} entity type from the given - * {@link JobIdentifier} class. - * - * @see org.springframework.batch.execution.repository.dao.EntityNameLocator#locate(java.lang.Class) - */ - public String locate(Class clz) { - for (Iterator iterator = entrySet.iterator(); iterator.hasNext();) { - Class key = (Class) iterator.next(); - if (key.isAssignableFrom(clz)) { - return (String) identifierTypes.get(key); - } - } - return SIMPLE_JOB_INSTANCE; - } - - /** - * Comparator for classes to order by inheritance. - * - * @author Dave Syer - * - */ - private class ClassComparator implements Comparator { - /** - * @return 1 if arg0 is assignable from arg1 - * @return -1 otherwise - * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) - */ - public int compare(Object arg0, Object arg1) { - Class cls0 = (Class) arg0; - Class cls1 = (Class) arg1; - if (cls0.isAssignableFrom(cls1)) { - return 1; - } - return -1; - } - } - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/PropertiesUserType.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/PropertiesUserType.java deleted file mode 100644 index 13c56c267..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/PropertiesUserType.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Properties; - -import org.springframework.batch.support.PropertiesConverter; -import org.springframework.jdbc.support.lob.LobCreator; -import org.springframework.jdbc.support.lob.LobHandler; -import org.springframework.orm.hibernate3.support.ClobStringType; - -/** - * User type object to help Hibernate to persist Poperties objects - * (just plonking it a Clob). - * - * @author Dave Syer - * - */ -public class PropertiesUserType extends ClobStringType { - - /** - * Get a {@link Properties} from a Clob. - * - * @return a {@link Properties} object whose string representation is the - * same as the database value. - * - * @see org.springframework.orm.hibernate3.support.ClobStringType#nullSafeGetInternal(java.sql.ResultSet, - * java.lang.String[], java.lang.Object, - * org.springframework.jdbc.support.lob.LobHandler) - */ - protected Object nullSafeGetInternal(ResultSet rs, String[] names, Object owner, LobHandler lobHandler) - throws SQLException { - final String value = (String) super.nullSafeGetInternal(rs, names, owner, lobHandler); - return PropertiesConverter.stringToProperties(value); - } - - /** - * Convert a {@link Properties} object to a string and then pop it in a Clob. - * - * @see org.springframework.orm.hibernate3.support.ClobStringType#nullSafeSetInternal(java.sql.PreparedStatement, int, java.lang.Object, org.springframework.jdbc.support.lob.LobCreator) - */ - protected void nullSafeSetInternal(PreparedStatement ps, int index, Object value, LobCreator lobCreator) - throws SQLException { - String string = PropertiesConverter.propertiesToString((Properties)value); - super.nullSafeSetInternal(ps, index, string, lobCreator); - } - -} diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/RestartDataUserType.java b/execution/src/main/java/org/springframework/batch/execution/repository/dao/RestartDataUserType.java deleted file mode 100644 index b1f2c3f8f..000000000 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/RestartDataUserType.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Properties; - -import org.springframework.batch.restart.GenericRestartData; -import org.springframework.batch.restart.RestartData; -import org.springframework.batch.support.PropertiesConverter; -import org.springframework.jdbc.support.lob.LobCreator; -import org.springframework.jdbc.support.lob.LobHandler; -import org.springframework.orm.hibernate3.support.ClobStringType; - -/** - * User type object to help Hibernate persist (@link RestartData) objects by setting - * a string in a clob. - * - * @author Lucas Ward - * - */ -public class RestartDataUserType extends ClobStringType { - - /** - * Get a {@link Properties} from a Clob. - * - * @return a {@link GenericRestartData} object whose internal properties string representation is the - * same as the database value. - * - * @see org.springframework.orm.hibernate3.support.ClobStringType#nullSafeGetInternal(java.sql.ResultSet, - * java.lang.String[], java.lang.Object, - * org.springframework.jdbc.support.lob.LobHandler) - */ - protected Object nullSafeGetInternal(ResultSet rs, String[] names, Object owner, LobHandler lobHandler) - throws SQLException { - final String value = (String) super.nullSafeGetInternal(rs, names, owner, lobHandler); - return new GenericRestartData(PropertiesConverter.stringToProperties(value)); - } - - /** - * Convert a {@link RestartData} object to a string and then pop it in a Clob. - * - * @see org.springframework.orm.hibernate3.support.ClobStringType#nullSafeSetInternal(java.sql.PreparedStatement, int, java.lang.Object, org.springframework.jdbc.support.lob.LobCreator) - */ - protected void nullSafeSetInternal(PreparedStatement ps, int index, Object value, LobCreator lobCreator) - throws SQLException { - final RestartData restartData = (RestartData)value; - String string = (restartData == null) ? "" - :PropertiesConverter.propertiesToString(restartData.getProperties()); - super.nullSafeSetInternal(ps, index, string, lobCreator); - } -} diff --git a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobExecution.hbm.xml b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobExecution.hbm.xml deleted file mode 100644 index ce568d90d..000000000 --- a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobExecution.hbm.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - %globals; -]> - - - - - &job-execution-generator; - - - - - - - - - - - - - - diff --git a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml deleted file mode 100644 index bd3046b2c..000000000 --- a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - %globals; -]> - - - - - - &job-generator; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/StepExecution.hbm.xml b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/StepExecution.hbm.xml deleted file mode 100644 index 75806ce03..000000000 --- a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/StepExecution.hbm.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - %globals; -]> - - - - - &step-execution-generator; - - - - - - - - - - - - - - - - - - - diff --git a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/StepInstance.hbm.xml b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/StepInstance.hbm.xml deleted file mode 100644 index 4e2d9c9df..000000000 --- a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/StepInstance.hbm.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - %globals; -]> - - - - - &step-generator; - - - - - - - - diff --git a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/globals.dtd b/execution/src/main/resources/org/springframework/batch/execution/repository/dao/globals.dtd deleted file mode 100644 index de8bd0b2c..000000000 --- a/execution/src/main/resources/org/springframework/batch/execution/repository/dao/globals.dtd +++ /dev/null @@ -1,20 +0,0 @@ - - - - -'> - - - - -]]> - -'> - '> - - - - -]]> diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/BatchHibernateInterceptorTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/BatchHibernateInterceptorTests.java deleted file mode 100644 index 3e150dd78..000000000 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/BatchHibernateInterceptorTests.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.springframework.batch.execution.repository.dao; - -import junit.framework.TestCase; - -import org.hibernate.type.Type; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.execution.runtime.ScheduledJobIdentifier; -import org.springframework.batch.repeat.ExitStatus; - -public class BatchHibernateInterceptorTests extends TestCase { - - public static final String LONG_STRING = "A very long description: \n" + - "Nov 16 20:10:42 util.JDBCExceptionReporter 78 - Data truncation: Data too long for column 'exit_message' at row 1\n" + - "Nov 16 20:10:43 def.AbstractFlushingEventListener 301 - Could not synchronize database state with session \n" + - "org.hibernate.exception.DataException: could not update: [org.springframework.batch.core.domain.JobExecution#67]\n" + - " at org.hibernate.exception.SQLStateConverter.convert(SQLStateConverter.java:77)\n"; - - private BatchHibernateInterceptor interceptor = new BatchHibernateInterceptor(); - - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - protected void setUp() throws Exception { - super.setUp(); - interceptor.setEntityNameLocator(new EntityNameLocator() { - public String locate(Class clz) { - return "foo"; - } - }); - } - - public void testAfterPropertiesSet() throws Exception { - interceptor = new BatchHibernateInterceptor(); - try { - interceptor.afterPropertiesSet(); - fail("Expected IllegalArgumentException"); - } catch (IllegalArgumentException e) { - // expected - } - } - - public void testGetEntityName() { - JobInstance job = new JobInstance(new ScheduledJobIdentifier("foo")); - assertEquals("foo", interceptor.getEntityName(job)); - } - - public void testGetEntityNameForNonJobInstance() { - Object job = new Object(); - assertEquals(null, interceptor.getEntityName(job)); - } - - public void testOnFlushDirtyWithJobInstance() throws Exception { - JobInstance job = new JobInstance(new ScheduledJobIdentifier("foo")); - assertFalse(interceptor.onFlushDirty(job, null, new Object[1], new Object[1], new String[] {"exitStatus"}, new Type[1])); - } - - public void testOnFlushDirtyWithShortDescription() throws Exception { - JobExecution execution = new JobExecution(new JobInstance(new ScheduledJobIdentifier("foo"))); - execution.setExitStatus(ExitStatus.UNKNOWN.addExitDescription("bar")); - assertFalse(interceptor.onFlushDirty(execution, null, new Object[] {execution.getExitStatus()}, new Object[1], new String[] {"exitStatus"}, new Type[1])); - } - - public void testOnFlushDirtyWithLongDescription() throws Exception { - JobExecution execution = new JobExecution(new JobInstance(new ScheduledJobIdentifier("foo"))); - execution.setExitStatus(ExitStatus.UNKNOWN.addExitDescription(LONG_STRING)); - Object[] state = new Object[] {execution.getExitStatus()}; - assertTrue(interceptor.onFlushDirty(execution, null, state, new Object[1], new String[] {"exitStatus"}, new Type[1])); - assertEquals(250, ((ExitStatus) state[0]).getExitDescription().length()); - } - - public void testOnFlushDirtyWithMissingExitStatusProperty() throws Exception { - JobExecution execution = new JobExecution(new JobInstance(new ScheduledJobIdentifier("foo"))); - execution.setExitStatus(ExitStatus.UNKNOWN.addExitDescription("bar")); - try { - interceptor.onFlushDirty(execution, null, new Object[] {execution.getExitStatus()}, new Object[1], new String[1], new Type[1]); - fail("Expected ArrayIndexOutOfBoundsException"); - } catch (ArrayIndexOutOfBoundsException e) { - // expected; - } - } -} diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/ExitStatusUserTypeTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/ExitStatusUserTypeTests.java deleted file mode 100644 index d675a78c1..000000000 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/ExitStatusUserTypeTests.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.springframework.batch.execution.repository.dao; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.Types; - -import junit.framework.TestCase; - -import org.easymock.MockControl; -import org.springframework.batch.repeat.ExitStatus; - -public class ExitStatusUserTypeTests extends TestCase { - - ExitStatusUserType type = new ExitStatusUserType(); - - public void testReturnedClass() { - assertEquals(ExitStatus.class, type.returnedClass()); - } - - public void testSqlTypes() { - int[] types = type.sqlTypes(); - assertEquals(3, types.length); - assertEquals(Types.CHAR, types[0]); - } - - public void testNullSafeGet() throws Exception { - String[] names = new String[] {"a", "b", "c"}; - MockControl control = MockControl.createControl(ResultSet.class); - ResultSet rs = (ResultSet) control.getMock(); - control.expectAndReturn(rs.getString(names[0]), "Y"); - control.expectAndReturn(rs.getString(names[1]), "foo"); - control.expectAndReturn(rs.getString(names[2]), "bar"); - control.replay(); - Object result = type.nullSafeGet(rs, names, null); - assertNotNull(result); - assertTrue(result instanceof ExitStatus); - control.verify(); - } - - public void testNullSafeSet() throws Exception { - MockControl control = MockControl.createControl(PreparedStatement.class); - PreparedStatement st = (PreparedStatement) control.getMock(); - st.setString(2, "Y"); - st.setString(3, ExitStatus.CONTINUABLE.getExitCode()); - st.setString(4, ExitStatus.CONTINUABLE.getExitDescription()); - control.replay(); - type.nullSafeSet(st, ExitStatus.CONTINUABLE, 2); - control.verify(); - } - -} diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java deleted file mode 100644 index b6ce2c099..000000000 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateJobDaoTests.java +++ /dev/null @@ -1,150 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.sql.Timestamp; -import java.util.List; -import java.util.Map; - -import org.hibernate.SessionFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobIdentifier; -import org.springframework.batch.core.domain.JobInstance; -import org.springframework.batch.core.runtime.SimpleJobIdentifier; -import org.springframework.batch.execution.runtime.ScheduledJobIdentifier; -import org.springframework.batch.repeat.ExitStatus; -import org.springframework.util.ClassUtils; - -public class HibernateJobDaoTests extends AbstractJobDaoTests { - - private static final String LONG_STRING = BatchHibernateInterceptorTests.LONG_STRING; - - private SessionFactory sessionFactory; - - protected String[] getConfigLocations() { - return new String[] { ClassUtils.addResourcePathToPackagePath( - getClass(), "hibernate-dao-test.xml") }; - } - - public void setSessionFactory(SessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } - - public void testUpdateJobExecution() { - - jobExecution.setStatus(BatchStatus.COMPLETED); - jobExecution.setEndTime(new Timestamp(System.currentTimeMillis())); - jobDao.update(jobExecution); - - sessionFactory.getCurrentSession().flush(); - - List executions = jdbcTemplate.queryForList( - "SELECT * FROM BATCH_JOB_EXECUTION where JOB_ID=?", - new Object[] { job.getId() }); - assertEquals(1, executions.size()); - assertEquals(jobExecution.getEndTime(), ((Map) executions.get(0)) - .get("END_TIME")); - } - - public void testUpdateDetachedJobExecution() { - - sessionFactory.getCurrentSession().evict(jobExecution); - - jobExecution.setStatus(BatchStatus.COMPLETED); - jobExecution.setEndTime(new Timestamp(System.currentTimeMillis())); - jobDao.update(jobExecution); - - sessionFactory.getCurrentSession().flush(); - - List executions = jdbcTemplate.queryForList( - "SELECT * FROM BATCH_JOB_EXECUTION where JOB_ID=?", - new Object[] { job.getId() }); - assertEquals(1, executions.size()); - assertEquals(jobExecution.getEndTime(), ((Map) executions.get(0)) - .get("END_TIME")); - - } - - public void testCreateSimpleJobExecution() { - - JobIdentifier simpleIdentifier = new SimpleJobIdentifier("SimpleJob"); - - JobInstance simpleJob = jobDao.createJob(simpleIdentifier); - - List jobs = jobDao.findJobs(simpleIdentifier); - - assertEquals(jobs.size(), 1); - JobInstance testJob = (JobInstance) jobs.get(0); - assertEquals(simpleJob, testJob); - } - - public void testUpdateJobExecutionWithLongExitCode() { - - assertTrue(LONG_STRING.length()>250); - jobExecution.setExitStatus(ExitStatus.FINISHED.addExitDescription(LONG_STRING)); - jobDao.update(jobExecution); - - sessionFactory.getCurrentSession().flush(); - - List executions = jdbcTemplate.queryForList( - "SELECT * FROM BATCH_JOB_EXECUTION where JOB_ID=?", - new Object[] { job.getId() }); - assertEquals(1, executions.size()); - assertEquals(LONG_STRING.substring(0, 250), ((Map) executions.get(0)) - .get("EXIT_MESSAGE")); - } - - public void testNullIdentifierName() { - - JobIdentifier simpleIdentifier = new SimpleJobIdentifier(null); - - try { - jobDao.createJob(simpleIdentifier); - fail(); - } catch (IllegalArgumentException ex) { - // expected - } - } - - public void testEmptyIdentifierName() { - - JobIdentifier simpleIdentifier = new SimpleJobIdentifier(""); - - try { - jobDao.createJob(simpleIdentifier); - fail(); - } catch (IllegalArgumentException ex) { - // expected - } - - } - - public void testNullScheduleDate() { - - ScheduledJobIdentifier scheduledIdentifier = new ScheduledJobIdentifier( - "ScheduledJob"); - scheduledIdentifier.setJobKey(null); - - try { - jobDao.createJob(scheduledIdentifier); - fail(); - } catch (IllegalArgumentException ex) { - // expected - } - } - -} diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java deleted file mode 100644 index f4a6648c6..000000000 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/HibernateStepDaoTests.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.batch.execution.repository.dao; - -import java.sql.Timestamp; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import org.hibernate.SessionFactory; -import org.springframework.batch.core.domain.BatchStatus; -import org.springframework.batch.core.domain.JobExecution; -import org.springframework.batch.core.domain.StepExecution; -import org.springframework.batch.core.domain.StepInstance; -import org.springframework.batch.repeat.ExitStatus; -import org.springframework.batch.support.PropertiesConverter; -import org.springframework.util.ClassUtils; - -public class HibernateStepDaoTests extends AbstractStepDaoTests { - - private static final String LONG_STRING = BatchHibernateInterceptorTests.LONG_STRING; - private SessionFactory sessionFactory; - - public void setSessionFactory(SessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } - - protected String[] getConfigLocations() { - return new String[] { ClassUtils.addResourcePathToPackagePath(getClass(), "hibernate-dao-test.xml") }; - } - - public void testSaveStatistics() throws Exception { - StepInstance step = stepDao.createStep(job, "foo"); - StepExecution stepExecution = new StepExecution(step, new JobExecution(step.getJob())); - Properties statistics = new Properties(); - statistics.setProperty("x", "y"); - statistics.setProperty("a", "b"); - stepExecution.setStatistics(statistics); - stepDao.save(stepExecution); - sessionFactory.getCurrentSession().flush(); - String returnedStatistics = (String) jdbcTemplate.queryForObject( - "SELECT TASK_STATISTICS from BATCH_STEP_EXECUTION where ID=?", new Object[] { stepExecution.getId() }, - String.class); - - Properties fromDb = PropertiesConverter.stringToProperties(returnedStatistics); - //assertEquals("x=y, a=b", returnedStatistics); - assertEquals(fromDb, statistics); - } - - public void testUpdateDetachedStepExecution() { - - sessionFactory.getCurrentSession().evict(stepExecution); - - stepExecution.setStatus(BatchStatus.COMPLETED); - stepExecution.setEndTime(new Timestamp(System.currentTimeMillis())); - stepDao.update(stepExecution); - - sessionFactory.getCurrentSession().flush(); - - List executions = jdbcTemplate.queryForList( - "SELECT * FROM BATCH_STEP_EXECUTION where STEP_ID=?", - new Object[] { step1.getId() }); - assertEquals(1, executions.size()); - assertEquals(stepExecution.getEndTime(), ((Map) executions.get(0)) - .get("END_TIME")); - - } - - public void testUpdateStepExecutionWithLongDescription() { - - assertTrue(LONG_STRING.length()>250); - stepExecution.setExitStatus(ExitStatus.FINISHED.addExitDescription(LONG_STRING)); - stepDao.update(stepExecution); - - sessionFactory.getCurrentSession().flush(); - - List executions = jdbcTemplate.queryForList( - "SELECT * FROM BATCH_STEP_EXECUTION where STEP_ID=?", - new Object[] { step1.getId() }); - assertEquals(1, executions.size()); - assertEquals(LONG_STRING.substring(0, 250), ((Map) executions.get(0)) - .get("EXIT_MESSAGE")); - - } - -} diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/ImmutableValueUserTypeTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/ImmutableValueUserTypeTests.java deleted file mode 100644 index 245e09913..000000000 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/ImmutableValueUserTypeTests.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.springframework.batch.execution.repository.dao; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; - -import org.hibernate.HibernateException; - -import junit.framework.TestCase; - -public class ImmutableValueUserTypeTests extends TestCase { - - ImmutableValueUserType type = new ImmutableValueUserType() { - public Object nullSafeGet(ResultSet rs, String[] names, Object owner) - throws HibernateException, SQLException { - return null; - } - public void nullSafeSet(PreparedStatement st, Object value, int index) - throws HibernateException, SQLException { - } - public Class returnedClass() { - return null; - } - public int[] sqlTypes() { - return null; - } - }; - - public void testAssemble() { - assertEquals("foo", type.assemble("foo", null)); - } - - public void testDeepCopy() { - assertEquals("foo", type.deepCopy("foo")); - } - - public void testDisassemble() { - assertEquals("foo", type.disassemble("foo")); - } - - public void testEqualsWithNullObjects() { - assertTrue(type.equals(null, null)); - } - - public void testEqualsWithFirstNullObject() { - assertFalse(type.equals(null, "foo")); - } - - public void testEqualsWithSecondNullObject() { - assertFalse(type.equals("foo", null)); - } - - public void testEqualsWithEqualObjects() { - assertTrue(type.equals("foo", "foo")); - } - - public void testEqualsWithUnEqualObjects() { - assertFalse(type.equals("foo", "bar")); - } - - public void testHashCodeObject() { - assertEquals("foo".hashCode(), type.hashCode("foo")); - } - - public void testIsMutable() { - assertFalse(type.isMutable()); - } - - public void testReplace() { - assertEquals("foo",type.replace("foo", "bar", null)); - } - -} diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/JobIdentiferEntityNameLocatorTests.java b/execution/src/test/java/org/springframework/batch/execution/repository/dao/JobIdentiferEntityNameLocatorTests.java deleted file mode 100644 index 63b9b9e68..000000000 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/JobIdentiferEntityNameLocatorTests.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright 2006-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.batch.execution.repository.dao; - -import java.util.Collections; - -import junit.framework.TestCase; - -import org.springframework.batch.core.runtime.SimpleJobIdentifier; -import org.springframework.batch.execution.runtime.DefaultJobIdentifier; -import org.springframework.batch.execution.runtime.ScheduledJobIdentifier; - -/** - * @author Dave Syer - * - */ -public class JobIdentiferEntityNameLocatorTests extends TestCase { - - private JobIdentifierEntityNameLocator interceptor = new JobIdentifierEntityNameLocator(); - - public void testGetEntityNameForScheduledJobIdentifier() { - assertEquals("ScheduledJobInstance", interceptor.locate(ScheduledJobIdentifier.class)); - } - - public void testGetEntityNameForDefaultJobIdentifier() { - assertEquals("DefaultJobInstance", interceptor.locate(DefaultJobIdentifier.class)); - } - - public void testGetEntityNameForSimpleJobIdentifier() { - assertEquals("SimpleJobInstance", interceptor.locate(SimpleJobIdentifier.class)); - } - - public void testSetIdentifierTypesWithString() { - interceptor.setIdentifierTypes(Collections.singletonMap(ScheduledJobIdentifier.class.getName(), "foo")); - assertEquals("foo", interceptor.locate(ScheduledJobIdentifier.class)); - } - - public void testSetIdentifierTypesWithClass() { - interceptor.setIdentifierTypes(Collections.singletonMap(ScheduledJobIdentifier.class, "foo")); - assertEquals("foo", interceptor.locate(ScheduledJobIdentifier.class)); - } - - public void testSetIdentifierTypesWithInvalidClassName() { - try { - interceptor.setIdentifierTypes(Collections.singletonMap("FooBarNotAClass", "foo")); - fail("Expected IllegalArgumentException"); - } catch (IllegalArgumentException e) { - // expected - } - } - -} diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-context.xml b/execution/src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-context.xml deleted file mode 100644 index a81bda566..000000000 --- a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-context.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - classpath:/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml - classpath:/org/springframework/batch/execution/repository/dao/JobExecution.hbm.xml - classpath:/org/springframework/batch/execution/repository/dao/StepInstance.hbm.xml - classpath:/org/springframework/batch/execution/repository/dao/StepExecution.hbm.xml - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-dao-test.xml b/execution/src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-dao-test.xml deleted file mode 100644 index 98472b15c..000000000 --- a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-dao-test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/infrastructure/.classpath b/infrastructure/.classpath deleted file mode 100644 index cf96a6241..000000000 --- a/infrastructure/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/integration/.classpath b/integration/.classpath deleted file mode 100644 index b9f24a16d..000000000 --- a/integration/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 0bc76872e..8f22d371c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,11 +13,11 @@ pom - infrastructure - core - execution - samples - integration + spring-batch-infrastructure + spring-batch-core + spring-batch-execution + spring-batch-samples + spring-batch-integration docs diff --git a/samples/.classpath b/samples/.classpath deleted file mode 100644 index 40e1ea78b..000000000 --- a/samples/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/samples/src/main/resources/hibernate-context.xml b/samples/src/main/resources/hibernate-context.xml deleted file mode 100644 index 0d62542d6..000000000 --- a/samples/src/main/resources/hibernate-context.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - classpath:/org/springframework/batch/execution/repository/dao/JobInstance.hbm.xml - - - classpath:/org/springframework/batch/execution/repository/dao/JobExecution.hbm.xml - - - classpath:/org/springframework/batch/execution/repository/dao/StepInstance.hbm.xml - - - classpath:/org/springframework/batch/execution/repository/dao/StepExecution.hbm.xml - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spring-batch-core/.classpath b/spring-batch-core/.classpath new file mode 100644 index 000000000..71e6e0204 --- /dev/null +++ b/spring-batch-core/.classpath @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/integration/.project b/spring-batch-core/.project similarity index 67% rename from integration/.project rename to spring-batch-core/.project index e3d128c80..876c4799d 100644 --- a/integration/.project +++ b/spring-batch-core/.project @@ -1,8 +1,9 @@ - batch-integration - + spring-batch-core + Core domain for batch processing, expressing a domain of Jobs, Steps, Chunks, etc. + spring-batch-infrastructure @@ -15,15 +16,9 @@ - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature org.springframework.ide.eclipse.core.springnature diff --git a/core/.settings/org.eclipse.mylyn.tasks.ui.prefs b/spring-batch-core/.settings/org.eclipse.mylyn.tasks.ui.prefs similarity index 100% rename from core/.settings/org.eclipse.mylyn.tasks.ui.prefs rename to spring-batch-core/.settings/org.eclipse.mylyn.tasks.ui.prefs diff --git a/core/.springBeans b/spring-batch-core/.springBeans similarity index 100% rename from core/.springBeans rename to spring-batch-core/.springBeans diff --git a/core/pom.xml b/spring-batch-core/pom.xml similarity index 100% rename from core/pom.xml rename to spring-batch-core/pom.xml diff --git a/core/src/main/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationException.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfiguration.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationException.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationLocator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationLocator.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationLocator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationLocator.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationRegistry.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationRegistry.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/JobConfigurationRegistry.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/ListableJobConfigurationRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobConfigurationRegistry.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/ListableJobConfigurationRegistry.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/ListableJobConfigurationRegistry.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationException.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/StepConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/StepConfiguration.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/StepConfiguration.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/StepConfiguration.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/StepConfigurationSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/StepConfigurationSupport.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/StepConfigurationSupport.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/StepConfigurationSupport.java diff --git a/core/src/main/java/org/springframework/batch/core/configuration/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/configuration/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/configuration/package.html diff --git a/core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/BatchStatus.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/Entity.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/Entity.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/Entity.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/Entity.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/JobExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobExecution.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobIdentifier.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/JobInstance.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/JobInstance.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/StepExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepExecution.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/StepInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepInstance.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/StepInstance.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/StepInstance.java diff --git a/core/src/main/java/org/springframework/batch/core/domain/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/domain/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/domain/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/domain/package.html diff --git a/core/src/main/java/org/springframework/batch/core/executor/ExitCodeExceptionClassifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/ExitCodeExceptionClassifier.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/ExitCodeExceptionClassifier.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/ExitCodeExceptionClassifier.java diff --git a/core/src/main/java/org/springframework/batch/core/executor/JobExecutionException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/JobExecutionException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/JobExecutionException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/JobExecutionException.java diff --git a/core/src/main/java/org/springframework/batch/core/executor/JobExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/JobExecutor.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/JobExecutor.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/JobExecutor.java diff --git a/core/src/main/java/org/springframework/batch/core/executor/StepExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/StepExecutor.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/StepExecutor.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/StepExecutor.java diff --git a/core/src/main/java/org/springframework/batch/core/executor/StepExecutorFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/StepExecutorFactory.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/StepExecutorFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/StepExecutorFactory.java diff --git a/core/src/main/java/org/springframework/batch/core/executor/StepInterruptedException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/StepInterruptedException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/StepInterruptedException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/StepInterruptedException.java diff --git a/core/src/main/java/org/springframework/batch/core/executor/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/executor/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/executor/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/executor/package.html diff --git a/core/src/main/java/org/springframework/batch/core/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/package.html diff --git a/core/src/main/java/org/springframework/batch/core/repository/BatchRestartException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/BatchRestartException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/repository/BatchRestartException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/BatchRestartException.java diff --git a/core/src/main/java/org/springframework/batch/core/repository/JobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/repository/JobRepository.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java diff --git a/core/src/main/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectException.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectException.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectException.java diff --git a/core/src/main/java/org/springframework/batch/core/repository/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/repository/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/repository/package.html diff --git a/core/src/main/java/org/springframework/batch/core/runtime/JobIdentifierFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/JobIdentifierFactory.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/runtime/JobIdentifierFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/runtime/JobIdentifierFactory.java diff --git a/core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifier.java diff --git a/core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactory.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactory.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactory.java diff --git a/core/src/main/java/org/springframework/batch/core/runtime/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/runtime/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/runtime/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/runtime/package.html diff --git a/core/src/main/java/org/springframework/batch/core/tasklet/Recoverable.java b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Recoverable.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/tasklet/Recoverable.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Recoverable.java diff --git a/core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java similarity index 100% rename from core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/Tasklet.java diff --git a/core/src/main/java/org/springframework/batch/core/tasklet/package.html b/spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/package.html similarity index 100% rename from core/src/main/java/org/springframework/batch/core/tasklet/package.html rename to spring-batch-core/src/main/java/org/springframework/batch/core/tasklet/package.html diff --git a/core/src/main/java/overview.html b/spring-batch-core/src/main/java/overview.html similarity index 100% rename from core/src/main/java/overview.html rename to spring-batch-core/src/main/java/overview.html diff --git a/core/src/site/apt/changelog.apt b/spring-batch-core/src/site/apt/changelog.apt similarity index 100% rename from core/src/site/apt/changelog.apt rename to spring-batch-core/src/site/apt/changelog.apt diff --git a/core/src/site/apt/index.apt b/spring-batch-core/src/site/apt/index.apt similarity index 100% rename from core/src/site/apt/index.apt rename to spring-batch-core/src/site/apt/index.apt diff --git a/core/src/site/resources/images/core-domain-extended.png b/spring-batch-core/src/site/resources/images/core-domain-extended.png similarity index 100% rename from core/src/site/resources/images/core-domain-extended.png rename to spring-batch-core/src/site/resources/images/core-domain-extended.png diff --git a/core/src/site/resources/images/core-domain-overview.png b/spring-batch-core/src/site/resources/images/core-domain-overview.png similarity index 100% rename from core/src/site/resources/images/core-domain-overview.png rename to spring-batch-core/src/site/resources/images/core-domain-overview.png diff --git a/core/src/site/site.xml b/spring-batch-core/src/site/site.xml similarity index 100% rename from core/src/site/site.xml rename to spring-batch-core/src/site/site.xml diff --git a/core/src/test/java/org/springframework/batch/core/AbstractExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/AbstractExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/AbstractExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/AbstractExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobConfigurationExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/JobConfigurationTests.java diff --git a/core/src/test/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/NoSuchJobConfigurationExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/configuration/SpringBeanJobConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/SpringBeanJobConfigurationTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/configuration/SpringBeanJobConfigurationTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/SpringBeanJobConfigurationTests.java diff --git a/core/src/test/java/org/springframework/batch/core/configuration/StepConfigurationSupportTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/StepConfigurationSupportTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/configuration/StepConfigurationSupportTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/configuration/StepConfigurationSupportTests.java diff --git a/core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/BatchStatusTests.java diff --git a/core/src/test/java/org/springframework/batch/core/domain/EntityTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/EntityTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/domain/EntityTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/EntityTests.java diff --git a/core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobExecutionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/JobInstanceTests.java diff --git a/core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepExecutionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/domain/StepInstanceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepInstanceTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/domain/StepInstanceTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/domain/StepInstanceTests.java diff --git a/core/src/test/java/org/springframework/batch/core/executor/JobExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/executor/JobExecutionExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/executor/JobExecutionExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/executor/JobExecutionExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/executor/StepInterruptedExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/executor/StepInterruptedExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/executor/StepInterruptedExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/executor/StepInterruptedExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/repository/BatchRestartExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/BatchRestartExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/repository/BatchRestartExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/BatchRestartExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectExceptionTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectExceptionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/repository/NoSuchBatchDomainObjectExceptionTests.java diff --git a/core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactoryTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactoryTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierFactoryTests.java diff --git a/core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierTests.java similarity index 100% rename from core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/runtime/SimpleJobIdentifierTests.java diff --git a/core/src/test/resources/clover.license b/spring-batch-core/src/test/resources/clover.license similarity index 100% rename from core/src/test/resources/clover.license rename to spring-batch-core/src/test/resources/clover.license diff --git a/core/src/test/resources/log4j.properties b/spring-batch-core/src/test/resources/log4j.properties similarity index 100% rename from core/src/test/resources/log4j.properties rename to spring-batch-core/src/test/resources/log4j.properties diff --git a/spring-batch-execution/.classpath b/spring-batch-execution/.classpath new file mode 100644 index 000000000..2096f79ec --- /dev/null +++ b/spring-batch-execution/.classpath @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/execution/.project b/spring-batch-execution/.project similarity index 73% rename from execution/.project rename to spring-batch-execution/.project index 9f2aeae2a..29c286e5f 100644 --- a/execution/.project +++ b/spring-batch-execution/.project @@ -1,8 +1,10 @@ - execution + spring-batch-execution Execution tools and implementations of Spring Batch Core interfaces + spring-batch-infrastructure + spring-batch-core @@ -15,15 +17,9 @@ - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature org.springframework.ide.eclipse.core.springnature diff --git a/execution/.settings/org.eclipse.jdt.core.prefs b/spring-batch-execution/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from execution/.settings/org.eclipse.jdt.core.prefs rename to spring-batch-execution/.settings/org.eclipse.jdt.core.prefs diff --git a/execution/.springBeans b/spring-batch-execution/.springBeans similarity index 75% rename from execution/.springBeans rename to spring-batch-execution/.springBeans index 86ec81276..d31740914 100644 --- a/execution/.springBeans +++ b/spring-batch-execution/.springBeans @@ -1,14 +1,14 @@ - - xml - + 1 + + + + src/test/resources/simple-container-definition.xml src/test/resources/job-configuration.xml src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml - src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-context.xml - src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-dao-test.xml src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment.xml src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-no-launcher.xml @@ -38,8 +38,6 @@ false src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml - src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-context.xml - src/test/resources/org/springframework/batch/execution/repository/dao/hibernate-dao-test.xml diff --git a/execution/pom.xml b/spring-batch-execution/pom.xml similarity index 89% rename from execution/pom.xml rename to spring-batch-execution/pom.xml index 3a098f6cf..7f4e7def1 100644 --- a/execution/pom.xml +++ b/spring-batch-execution/pom.xml @@ -40,30 +40,7 @@ junit junit - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - provided - - - - cglib - cglib-nodep - true - - - org.hibernate - hibernate - true - - - org.springframework - spring-aop - test - org.springframework spring-beans @@ -76,10 +53,6 @@ org.springframework spring-jdbc - - org.springframework - spring-orm - org.springframework spring-test diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEvent.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEvent.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEvent.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEvent.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisher.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisher.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncher.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExitCodeMapper.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ExportedJobLauncher.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/JvmSystemExiter.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapper.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SystemExiter.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ThreadInterruptJobExecutionListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ThreadInterruptJobExecutionListener.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ThreadInterruptJobExecutionListener.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/ThreadInterruptJobExecutionListener.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptor.java diff --git a/execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessor.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessor.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessor.java diff --git a/execution/src/main/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistry.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistry.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistry.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistry.java diff --git a/execution/src/main/java/org/springframework/batch/execution/configuration/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/configuration/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/configuration/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/job/DefaultJobExecutor.java diff --git a/execution/src/main/java/org/springframework/batch/execution/job/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/job/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/job/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/job/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningException.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningException.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningException.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningException.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListener.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListener.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListener.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListener.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListenerSupport.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListenerSupport.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListenerSupport.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutionListenerSupport.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/JobExecutorFacade.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutorFacade.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/JobExecutorFacade.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobExecutorFacade.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/JobLauncher.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/NoSuchJobExecutionException.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/NoSuchJobExecutionException.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/NoSuchJobExecutionException.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/NoSuchJobExecutionException.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacade.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/SimpleJobLauncher.java diff --git a/execution/src/main/java/org/springframework/batch/execution/launch/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/launch/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/launch/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/SimpleJobRepository.java diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/JobDao.java diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobDao.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobDao.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapJobDao.java diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepDao.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepDao.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/MapStepDao.java diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java similarity index 85% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java index f0b7df81e..97cdb52a8 100644 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlJobDao.java @@ -52,54 +52,69 @@ import org.springframework.util.StringUtils; */ public class SqlJobDao implements JobDao, InitializingBean { - protected static final Log logger = LogFactory.getLog(SqlJobDao.class); + private static final String CHECK_JOB_EXECUTION_EXISTS = "SELECT COUNT(*) FROM %PREFIX%JOB_EXECUTION WHERE ID=?"; + + // Job SQL statements + private static final String CREATE_JOB = "INSERT into %PREFIX%JOB(ID, JOB_NAME, JOB_KEY, SCHEDULE_DATE)" + + " values (?, ?, ?, ?)"; /** * Default value for the table prefix property. */ public static final String DEFAULT_TABLE_PREFIX = "BATCH_"; - private String tablePrefix = DEFAULT_TABLE_PREFIX; - - // Job SQL statements - private static final String CREATE_JOB = "INSERT into %PREFIX%JOB(ID, JOB_NAME, JOB_KEY, SCHEDULE_DATE)" - + " values (?, ?, ?, ?)"; + private static final int EXIT_MESSAGE_LENGTH = 250; private static final String FIND_JOBS = "SELECT ID, STATUS from %PREFIX%JOB where JOB_NAME = ? and " + "JOB_KEY = ? and SCHEDULE_DATE = ?"; - private static final String UPDATE_JOB = "UPDATE %PREFIX%JOB set STATUS = ? where ID = ?"; - private static final String GET_JOB_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%JOB_EXECUTION " + "where JOB_ID = ?"; + protected static final Log logger = LogFactory.getLog(SqlJobDao.class); + + private static final String SAVE_JOB_EXECUTION = "INSERT into %PREFIX%JOB_EXECUTION(ID, JOB_ID, START_TIME, " + + "END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) values (?, ?, ?, ?, ?, ?, ?, ?)"; + + private static final String UPDATE_JOB = "UPDATE %PREFIX%JOB set STATUS = ? where ID = ?"; + // Job Execution SqlStatements private static final String UPDATE_JOB_EXECUTION = "UPDATE %PREFIX%JOB_EXECUTION set START_TIME = ?, END_TIME = ?, " + " STATUS = ?, CONTINUABLE = ?, EXIT_CODE = ?, EXIT_MESSAGE = ? where ID = ?"; - private static final String SAVE_JOB_EXECUTION = "INSERT into %PREFIX%JOB_EXECUTION(ID, JOB_ID, START_TIME, " - + "END_TIME, STATUS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) values (?, ?, ?, ?, ?, ?, ?, ?)"; + private String checkJobExecutionExistsQuery; - private static final String CHECK_JOB_EXECUTION_EXISTS = "SELECT COUNT(*) FROM %PREFIX%JOB_EXECUTION WHERE ID=?"; - - private static final int EXIT_MESSAGE_LENGTH = 250; + private String findJobsQuery; private JdbcTemplate jdbcTemplate; - private DataFieldMaxValueIncrementer jobIncrementer; + private String jobExecutionCountQuery; private DataFieldMaxValueIncrementer jobExecutionIncrementer; - /** - * Public setter for the table prefix property. This will be prefixed to all - * the table names before queries are executed. Defaults to - * {@value #DEFAULT_TABLE_PREFIX}. + private DataFieldMaxValueIncrementer jobIncrementer; + + private String saveJobExecutionQuery; + + private String tablePrefix = DEFAULT_TABLE_PREFIX; + + private String updateJobExecutionQuery; + + private String updateJobQuery; + + /* + * (non-Javadoc) * - * @param tablePrefix - * the tablePrefix to set + * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() + * + * Ensure jdbcTemplate and incrementers have been provided. */ - public void setTablePrefix(String tablePrefix) { - this.tablePrefix = tablePrefix; + public void afterPropertiesSet() throws Exception { + + Assert.notNull(jdbcTemplate, "JdbcTemplate cannot be null"); + Assert.notNull(jobIncrementer, "JobIncrementor cannot be null"); + Assert.notNull(jobExecutionIncrementer, + "JobExecutionIncrementer cannot be null"); } /** @@ -127,6 +142,16 @@ public class SqlJobDao implements JobDao, InitializingBean { return job; } + public List findJobExecutions(final JobInstance job) { + + Assert.notNull(job, "Job cannot be null."); + Assert.notNull(job.getId(), "Job Id cannot be null."); + + return jdbcTemplate.query( + getQuery(JobExecutionRowMapper.FIND_JOB_EXECUTIONS), + new Object[] { job.getId() }, new JobExecutionRowMapper(job)); + } + /** * The job table is queried for any jobs that match the * given identifier, adding them to a list via the RowMapper callback. @@ -158,20 +183,89 @@ public class SqlJobDao implements JobDao, InitializingBean { return jdbcTemplate.query(getFindJobsQuery(), parameters, rowMapper); } + public String getCheckJobExecutionExistsQuery() { + if (checkJobExecutionExistsQuery != null) { + return checkJobExecutionExistsQuery; + } + return getQuery(CHECK_JOB_EXECUTION_EXISTS); + } + + public String getCreateJobQuery() { + return getQuery(CREATE_JOB); + } + + public String getFindJobsQuery() { + if (findJobsQuery != null) { + return findJobsQuery; + } + return getQuery(FIND_JOBS); + } + /** - * @see JobDao#update(JobInstance) + * @see JobDao#getJobExecutionCount(JobInstance) * @throws IllegalArgumentException - * if Job, Job.status, or job.id is null + * if jobId is null. */ - public void update(JobInstance job) { + public int getJobExecutionCount(Long jobId) { - Assert.notNull(job, "Job Cannot be Null"); - Assert.notNull(job.getStatus(), "Job Status cannot be Null"); - Assert.notNull(job.getId(), "Job ID cannot be null"); + Assert.notNull(jobId, "JobId cannot be null"); - Object[] parameters = new Object[] { job.getStatus().toString(), - job.getId() }; - jdbcTemplate.update(getUpdateJobQuery(), parameters); + Object[] parameters = new Object[] { jobId }; + + return jdbcTemplate + .queryForInt(getJobExecutionCountQuery(), parameters); + } + + public String getJobExecutionCountQuery() { + if (jobExecutionCountQuery != null) { + return jobExecutionCountQuery; + } + return getQuery(GET_JOB_EXECUTION_COUNT); + } + + private String getQuery(String base) { + return StringUtils.replace(base, "%PREFIX%", tablePrefix); + } + + public String getSaveJobExecutionQuery() { + if (saveJobExecutionQuery != null) { + return saveJobExecutionQuery; + } + return getQuery(SAVE_JOB_EXECUTION); + } + + /** + * Convert a {@link JobIdentifier} to a {@link ScheduledJobIdentifier} by + * supplying additional fields with null values, as necessary. + * + * @param jobIdentifier + * a {@link JobIdentifier} + * @return a {@link ScheduledJobIdentifier} with the same name + */ + private ScheduledJobIdentifier getScheduledJobIdentifier( + JobIdentifier jobIdentifier) { + if (jobIdentifier instanceof ScheduledJobIdentifier) { + return (ScheduledJobIdentifier) jobIdentifier; + } + if (jobIdentifier instanceof DefaultJobIdentifier) { + return new ScheduledJobIdentifier(jobIdentifier.getName(), + ((DefaultJobIdentifier) jobIdentifier).getJobKey()); + } + return new ScheduledJobIdentifier(jobIdentifier.getName()); + } + + public String getUpdateJobExecutionQuery() { + if (updateJobExecutionQuery != null) { + return updateJobExecutionQuery; + } + return getQuery(UPDATE_JOB_EXECUTION); + } + + public String getUpdateJobQuery() { + if (updateJobQuery != null) { + return updateJobQuery; + } + return getQuery(UPDATE_JOB); } /** @@ -201,6 +295,85 @@ public class SqlJobDao implements JobDao, InitializingBean { Types.VARCHAR, Types.CHAR, Types.VARCHAR, Types.VARCHAR }); } + /** + * Public setter for the checkJobExecutionExistsQuery property. + * + * @param checkJobExecutionExistsQuery the checkJobExecutionExistsQuery to set + */ + public void setCheckJobExecutionExistsQuery(String checkJobExecutionExistsQuery) { + this.checkJobExecutionExistsQuery = checkJobExecutionExistsQuery; + } + + /** + * Public setter for the findJobsQuery property. + * + * @param findJobsQuery the findJobsQuery to set + */ + public void setFindJobsQuery(String findJobsQuery) { + this.findJobsQuery = findJobsQuery; + } + + public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { + this.jdbcTemplate = jdbcTemplate; + } + + /** + * Public setter for the jobExecutionCountQuery property. + * + * @param jobExecutionCountQuery the jobExecutionCountQuery to set + */ + public void setJobExecutionCountQuery(String jobExecutionCountQuery) { + this.jobExecutionCountQuery = jobExecutionCountQuery; + } + + public void setJobExecutionIncrementer( + DataFieldMaxValueIncrementer jobExecutionIncrementer) { + this.jobExecutionIncrementer = jobExecutionIncrementer; + } + + public void setJobIncrementer(DataFieldMaxValueIncrementer jobIncrementer) { + this.jobIncrementer = jobIncrementer; + } + + /** + * Public setter for the saveJobExecutionQuery property. + * + * @param saveJobExecutionQuery the saveJobExecutionQuery to set + */ + public void setSaveJobExecutionQuery(String saveJobExecutionQuery) { + this.saveJobExecutionQuery = saveJobExecutionQuery; + } + + /** + * Public setter for the table prefix property. This will be prefixed to all + * the table names before queries are executed. Defaults to + * {@value #DEFAULT_TABLE_PREFIX}. + * + * @param tablePrefix + * the tablePrefix to set + */ + public void setTablePrefix(String tablePrefix) { + this.tablePrefix = tablePrefix; + } + + /** + * Public setter for the updateJobExecutionQuery property. + * + * @param updateJobExecutionQuery the updateJobExecutionQuery to set + */ + public void setUpdateJobExecutionQuery(String updateJobExecutionQuery) { + this.updateJobExecutionQuery = updateJobExecutionQuery; + } + + /** + * Public setter for the updateJobQuery property. + * + * @param updateJobQuery the updateJobQuery to set + */ + public void setUpdateJobQuery(String updateJobQuery) { + this.updateJobQuery = updateJobQuery; + } + /** * Update given JobExecution using a SQL UPDATE statement. The JobExecution * is first checked to ensure all fields are not null, and that it has an @@ -249,88 +422,19 @@ public class SqlJobDao implements JobDao, InitializingBean { } /** - * @see JobDao#getJobExecutionCount(JobInstance) + * @see JobDao#update(JobInstance) * @throws IllegalArgumentException - * if jobId is null. + * if Job, Job.status, or job.id is null */ - public int getJobExecutionCount(Long jobId) { + public void update(JobInstance job) { - Assert.notNull(jobId, "JobId cannot be null"); + Assert.notNull(job, "Job Cannot be Null"); + Assert.notNull(job.getStatus(), "Job Status cannot be Null"); + Assert.notNull(job.getId(), "Job ID cannot be null"); - Object[] parameters = new Object[] { jobId }; - - return jdbcTemplate - .queryForInt(getJobExecutionCountQuery(), parameters); - } - - public List findJobExecutions(final JobInstance job) { - - Assert.notNull(job, "Job cannot be null."); - Assert.notNull(job.getId(), "Job Id cannot be null."); - - return jdbcTemplate.query( - getQuery(JobExecutionRowMapper.FIND_JOB_EXECUTIONS), - new Object[] { job.getId() }, new JobExecutionRowMapper(job)); - } - - private String getQuery(String base) { - return StringUtils.replace(base, "%PREFIX%", tablePrefix); - } - - private String getCreateJobQuery() { - return getQuery(CREATE_JOB); - } - - private String getFindJobsQuery() { - return getQuery(FIND_JOBS); - } - - private String getUpdateJobQuery() { - return getQuery(UPDATE_JOB); - } - - private String getSaveJobExecutionQuery() { - return getQuery(SAVE_JOB_EXECUTION); - } - - private String getUpdateJobExecutionQuery() { - return getQuery(UPDATE_JOB_EXECUTION); - } - - private String getCheckJobExecutionExistsQuery() { - return getQuery(CHECK_JOB_EXECUTION_EXISTS); - } - - private String getJobExecutionCountQuery() { - return getQuery(GET_JOB_EXECUTION_COUNT); - } - - public void setJdbcTemplate(JdbcTemplate jdbcTemplate) { - this.jdbcTemplate = jdbcTemplate; - } - - public void setJobIncrementer(DataFieldMaxValueIncrementer jobIncrementer) { - this.jobIncrementer = jobIncrementer; - } - - public void setJobExecutionIncrementer( - DataFieldMaxValueIncrementer jobExecutionIncrementer) { - this.jobExecutionIncrementer = jobExecutionIncrementer; - } - - /* - * (non-Javadoc) - * - * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() - * - * Ensure jdbcTemplate and incrementers have been provided. - */ - public void afterPropertiesSet() throws Exception { - - Assert.notNull(jdbcTemplate, "JdbcTemplate cannot be null"); - Assert.notNull(jobIncrementer, "JobIncrementor cannot be null"); - Assert.notNull(jobExecutionIncrementer, - "JobExecutionIncrementer cannot be null"); + Object[] parameters = new Object[] { job.getStatus().toString(), + job.getId() }; + jdbcTemplate.update(getUpdateJobQuery(), parameters); } /* @@ -371,26 +475,6 @@ public class SqlJobDao implements JobDao, InitializingBean { } } - /** - * Convert a {@link JobIdentifier} to a {@link ScheduledJobIdentifier} by - * supplying additional fields with null values, as necessary. - * - * @param jobIdentifier - * a {@link JobIdentifier} - * @return a {@link ScheduledJobIdentifier} with the same name - */ - private ScheduledJobIdentifier getScheduledJobIdentifier( - JobIdentifier jobIdentifier) { - if (jobIdentifier instanceof ScheduledJobIdentifier) { - return (ScheduledJobIdentifier) jobIdentifier; - } - if (jobIdentifier instanceof DefaultJobIdentifier) { - return new ScheduledJobIdentifier(jobIdentifier.getName(), - ((DefaultJobIdentifier) jobIdentifier).getJobKey()); - } - return new ScheduledJobIdentifier(jobIdentifier.getName()); - } - /** * Re-usable mapper for {@link JobExecution} instances. * diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java similarity index 73% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java index fe8a97dbc..96d5c3baf 100644 --- a/execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java +++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/SqlStepDao.java @@ -62,66 +62,96 @@ import org.springframework.util.StringUtils; */ public class SqlStepDao implements StepDao, InitializingBean { - protected static final Log logger = LogFactory.getLog(SqlStepDao.class); + private static final String CREATE_STEP = "INSERT into %PREFIX%STEP(ID, JOB_ID, STEP_NAME) values (?, ?, ?)"; - // Step SQL statements - private static final String FIND_STEPS = "SELECT ID, STEP_NAME, STATUS, RESTART_DATA from %PREFIX%STEP where JOB_ID = ?"; + private static final int EXIT_MESSAGE_LENGTH = 250; private static final String FIND_STEP = "SELECT ID, STATUS, RESTART_DATA from %PREFIX%STEP where JOB_ID = ? " + "and STEP_NAME = ?"; - private static final String CREATE_STEP = "INSERT into %PREFIX%STEP(ID, JOB_ID, STEP_NAME) values (?, ?, ?)"; + private static final String FIND_STEP_EXECUTIONS = "SELECT ID, JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, COMMIT_COUNT," + + " TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_ID = ?"; - private static final String UPDATE_STEP = "UPDATE %PREFIX%STEP set STATUS = ?, RESTART_DATA = ? where ID = ?"; + // Step SQL statements + private static final String FIND_STEPS = "SELECT ID, STEP_NAME, STATUS, RESTART_DATA from %PREFIX%STEP where JOB_ID = ?"; + + private static final String GET_STEP_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%STEP_EXECUTION where " + + "STEP_ID = ?"; + + protected static final Log logger = LogFactory.getLog(SqlStepDao.class); // StepExecution statements private static final String SAVE_STEP_EXECUTION = "INSERT into %PREFIX%STEP_EXECUTION(ID, VERSION, STEP_ID, JOB_EXECUTION_ID, START_TIME, " + "END_TIME, STATUS, COMMIT_COUNT, TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE) " + "values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; + private static final String UPDATE_STEP = "UPDATE %PREFIX%STEP set STATUS = ?, RESTART_DATA = ? where ID = ?"; + private static final String UPDATE_STEP_EXECUTION = "UPDATE %PREFIX%STEP_EXECUTION set START_TIME = ?, END_TIME = ?, " + "STATUS = ?, COMMIT_COUNT = ?, TASK_COUNT = ?, TASK_STATISTICS = ?, CONTINUABLE = ? , EXIT_CODE = ?, " + "EXIT_MESSAGE = ? where ID = ?"; - private static final String GET_STEP_EXECUTION_COUNT = "SELECT count(ID) from %PREFIX%STEP_EXECUTION where " - + "STEP_ID = ?"; + private String createStepQuery; - private static final String FIND_STEP_EXECUTIONS = "SELECT ID, JOB_EXECUTION_ID, START_TIME, END_TIME, STATUS, COMMIT_COUNT," - + " TASK_COUNT, TASK_STATISTICS, CONTINUABLE, EXIT_CODE, EXIT_MESSAGE from %PREFIX%STEP_EXECUTION where STEP_ID = ?"; + private String findStepExecutionsQuery; - private static final int EXIT_MESSAGE_LENGTH = 250; + private String findStepQuery; + + private String findStepsQuery; private JdbcOperations jdbcTemplate; private JobDao jobDao; - private DataFieldMaxValueIncrementer stepIncrementer; + private String saveStepExecutionQuery; + + private String stepExecutionCountQuery; private DataFieldMaxValueIncrementer stepExecutionIncrementer; + private DataFieldMaxValueIncrementer stepIncrementer; + private String tablePrefix = SqlJobDao.DEFAULT_TABLE_PREFIX; - /** - * Public setter for the table prefix property. This will be prefixed to all - * the table names before queries are executed. Defaults to - * {@value #DEFAULT_TABLE_PREFIX}. - * - * @param tablePrefix - * the tablePrefix to set - */ - public void setTablePrefix(String tablePrefix) { - this.tablePrefix = tablePrefix; + private String updateStepExecutionQuery; + + private String updateStepQuery; + + public void afterPropertiesSet() throws Exception { + Assert.notNull(jdbcTemplate, "JdbcTemplate cannot be null."); + Assert.notNull(stepIncrementer, "StepIncrementer cannot be null."); + Assert.notNull(stepExecutionIncrementer, + "StepExecutionIncrementer canot be null."); + } + + private void cascadeJobExecution(JobExecution jobExecution) { + if (jobExecution.getId() != null) { + // assume already saved... + return; + } + jobDao.save(jobExecution); } /** - * Injection setter for job dao. Used to save {@link JobExecution} - * instances. + * Create a step with the given job's id, and the provided step name. A + * unique id is created for the step using an incrementer. (@link + * DataFieldMaxValueIncrementer) * - * @param jobDao - * a {@link JobDao} + * @see StepDao#createStep(JobInstance, String) + * @throws IllegalArgumentException + * if job or stepName is null. */ - public void setJobDao(JobDao jobDao) { - this.jobDao = jobDao; + public StepInstance createStep(JobInstance job, String stepName) { + + Assert.notNull(job, "Job cannot be null."); + Assert.notNull(stepName, "StepName cannot be null."); + + Long stepId = new Long(stepIncrementer.nextLongValue()); + Object[] parameters = new Object[] { stepId, job.getId(), stepName }; + jdbcTemplate.update(getCreateStepQuery(), parameters); + + StepInstance step = new StepInstance(job, stepName, stepId); + return step; } /** @@ -157,7 +187,7 @@ public class SqlStepDao implements StepDao, InitializingBean { }; - List steps = jdbcTemplate.query(getQuery(FIND_STEP), parameters, + List steps = jdbcTemplate.query(getFindStepQuery(), parameters, rowMapper); if (steps.size() == 0) { @@ -178,184 +208,6 @@ public class SqlStepDao implements StepDao, InitializingBean { } - /** - * @see StepDao#findSteps(JobInstance) - * - * Sql implementation which uses a RowMapper to populate a list of all rows - * in the step table with the same JOB_ID. - * - * @throws IllegalArgumentException - * if jobId is null. - */ - public List findSteps(final JobInstance job) { - - Assert.notNull(job, "Job cannot be null."); - - Object[] parameters = new Object[] { job.getId() }; - - RowMapper rowMapper = new RowMapper() { - - public Object mapRow(ResultSet rs, int rowNum) throws SQLException { - - StepInstance step = new StepInstance(job, rs.getString(2), - new Long(rs.getLong(1))); - String status = rs.getString(3); - step.setStatus(BatchStatus.getStatus(status)); - step.setRestartData(new GenericRestartData(PropertiesConverter - .stringToProperties(rs.getString(3)))); - return step; - } - }; - - return jdbcTemplate.query(getQuery(FIND_STEPS), parameters, rowMapper); - } - - /** - * Create a step with the given job's id, and the provided step name. A - * unique id is created for the step using an incrementer. (@link - * DataFieldMaxValueIncrementer) - * - * @see StepDao#createStep(JobInstance, String) - * @throws IllegalArgumentException - * if job or stepName is null. - */ - public StepInstance createStep(JobInstance job, String stepName) { - - Assert.notNull(job, "Job cannot be null."); - Assert.notNull(stepName, "StepName cannot be null."); - - Long stepId = new Long(stepIncrementer.nextLongValue()); - Object[] parameters = new Object[] { stepId, job.getId(), stepName }; - jdbcTemplate.update(getQuery(CREATE_STEP), parameters); - - StepInstance step = new StepInstance(job, stepName, stepId); - return step; - } - - /** - * @see StepDao#update(StepInstance) - * @throws IllegalArgumentException - * if step, or it's status and id is null. - */ - public void update(final StepInstance step) { - - Assert.notNull(step, "Step cannot be null."); - Assert.notNull(step.getStatus(), "Step status cannot be null."); - Assert.notNull(step.getId(), "Step Id cannot be null."); - - Properties restartProps = null; - RestartData restartData = step.getRestartData(); - if (restartData != null) { - restartProps = restartData.getProperties(); - } - - Object[] parameters = new Object[] { step.getStatus().toString(), - PropertiesConverter.propertiesToString(restartProps), - step.getId() }; - - jdbcTemplate.update(getQuery(UPDATE_STEP), parameters); - } - - /** - * Save a StepExecution. A unique id will be generated by the - * stepExecutionIncrementor, and then set in the StepExecution. All values - * will then be stored via an INSERT statement. - * - * @see StepDao#save(StepExecution) - */ - public void save(StepExecution stepExecution) { - - validateStepExecution(stepExecution); - - cascadeJobExecution(stepExecution.getJobExecution()); - - stepExecution.setId(new Long(stepExecutionIncrementer.nextLongValue())); - Object[] parameters = new Object[] { - stepExecution.getId(), - new Long(0), - stepExecution.getStepId(), - stepExecution.getJobExecutionId(), - stepExecution.getStartTime(), - stepExecution.getEndTime(), - stepExecution.getStatus().toString(), - stepExecution.getCommitCount(), - stepExecution.getTaskCount(), - PropertiesConverter.propertiesToString(stepExecution - .getStatistics()), - stepExecution.getExitStatus().isContinuable() ? "Y" : "N", - stepExecution.getExitStatus().getExitCode(), - stepExecution.getExitStatus().getExitDescription() }; - jdbcTemplate - .update(getQuery(SAVE_STEP_EXECUTION), parameters, - new int[] { Types.INTEGER, Types.INTEGER, - Types.INTEGER, Types.INTEGER, Types.TIMESTAMP, - Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER, - Types.INTEGER, Types.VARCHAR, Types.CHAR, - Types.VARCHAR, Types.VARCHAR }); - - } - - private void cascadeJobExecution(JobExecution jobExecution) { - if (jobExecution.getId() != null) { - // assume already saved... - return; - } - jobDao.save(jobExecution); - } - - /** - * @see StepDao#update(StepExecution) - */ - public void update(StepExecution stepExecution) { - - validateStepExecution(stepExecution); - Assert.notNull(stepExecution.getId(), - "StepExecution Id cannot be null. StepExecution must saved" - + " before it can be updated."); - - // TODO: Not sure if this is a good idea on step execution considering - // it is saved at every commit - // point. - // if (jdbcTemplate.queryForInt(CHECK_STEP_EXECUTION_EXISTS, new - // Object[] { stepExecution.getId() }) != 1) { - // return; // throw exception? - // } - - String exitDescription = stepExecution.getExitStatus().getExitDescription(); - if (exitDescription!=null && exitDescription.length()>EXIT_MESSAGE_LENGTH) { - exitDescription = exitDescription.substring(0, EXIT_MESSAGE_LENGTH); - logger.debug("Truncating long message before update of StepExecution: "+stepExecution); - } - - Object[] parameters = new Object[] { - stepExecution.getStartTime(), - stepExecution.getEndTime(), - stepExecution.getStatus().toString(), - stepExecution.getCommitCount(), - stepExecution.getTaskCount(), - PropertiesConverter.propertiesToString(stepExecution - .getStatistics()), - stepExecution.getExitStatus().isContinuable() ? "Y" : "N", - stepExecution.getExitStatus().getExitCode(), - exitDescription, - stepExecution.getId() }; - jdbcTemplate - .update(getQuery(UPDATE_STEP_EXECUTION), parameters, - new int[] { Types.TIMESTAMP, Types.TIMESTAMP, - Types.VARCHAR, Types.INTEGER, Types.INTEGER, - Types.VARCHAR, Types.CHAR, Types.VARCHAR, - Types.VARCHAR, Types.INTEGER }); - - } - - public int getStepExecutionCount(Long stepId) { - - Object[] parameters = new Object[] { stepId }; - - return jdbcTemplate.queryForInt(getQuery(GET_STEP_EXECUTION_COUNT), - parameters); - } - /** * Get StepExecution for the given step. Due to the nature of statistics, * they will not be returned with reconstituted object. @@ -392,33 +244,347 @@ public class SqlStepDao implements StepDao, InitializingBean { } }; - return jdbcTemplate.query(getQuery(FIND_STEP_EXECUTIONS), + return jdbcTemplate.query(getFindStepExecutionsQuery(), new Object[] { step.getId() }, rowMapper); } + /** + * @see StepDao#findSteps(JobInstance) + * + * Sql implementation which uses a RowMapper to populate a list of all rows + * in the step table with the same JOB_ID. + * + * @throws IllegalArgumentException + * if jobId is null. + */ + public List findSteps(final JobInstance job) { + + Assert.notNull(job, "Job cannot be null."); + + Object[] parameters = new Object[] { job.getId() }; + + RowMapper rowMapper = new RowMapper() { + + public Object mapRow(ResultSet rs, int rowNum) throws SQLException { + + StepInstance step = new StepInstance(job, rs.getString(2), + new Long(rs.getLong(1))); + String status = rs.getString(3); + step.setStatus(BatchStatus.getStatus(status)); + step.setRestartData(new GenericRestartData(PropertiesConverter + .stringToProperties(rs.getString(3)))); + return step; + } + }; + + return jdbcTemplate.query(getFindStepsQuery(), parameters, rowMapper); + } + + public String getCreateStepQuery() { + if (createStepQuery != null) { + return createStepQuery; + } + return getQuery(CREATE_STEP); + } + + public String getFindStepExecutionsQuery() { + if (findStepExecutionsQuery != null) { + return findStepExecutionsQuery; + } + return getQuery(FIND_STEP_EXECUTIONS); + } + + public String getFindStepQuery() { + if (findStepQuery != null) { + return findStepQuery; + } + return getQuery(FIND_STEP); + } + + public String getFindStepsQuery() { + if (findStepsQuery != null) { + return findStepsQuery; + } + return getQuery(FIND_STEPS); + } + + private String getQuery(String base) { + return StringUtils.replace(base, "%PREFIX%", tablePrefix); + } + + public String getSaveStepExecutionQuery() { + if (saveStepExecutionQuery != null) { + return saveStepExecutionQuery; + } + return getQuery(SAVE_STEP_EXECUTION); + } + + public int getStepExecutionCount(Long stepId) { + + Object[] parameters = new Object[] { stepId }; + + return jdbcTemplate.queryForInt(getStepExecutionCountQuery(), + parameters); + } + + public String getStepExecutionCountQuery() { + if (stepExecutionCountQuery != null) { + return stepExecutionCountQuery; + } + return getQuery(GET_STEP_EXECUTION_COUNT); + } + + public String getUpdateStepExecutionQuery() { + if (updateStepExecutionQuery != null) { + return updateStepExecutionQuery; + } + return getQuery(UPDATE_STEP_EXECUTION); + } + + public String getUpdateStepQuery() { + if (updateStepQuery != null) { + return updateStepQuery; + } + return getQuery(UPDATE_STEP); + } + + /** + * Save a StepExecution. A unique id will be generated by the + * stepExecutionIncrementor, and then set in the StepExecution. All values + * will then be stored via an INSERT statement. + * + * @see StepDao#save(StepExecution) + */ + public void save(StepExecution stepExecution) { + + validateStepExecution(stepExecution); + + cascadeJobExecution(stepExecution.getJobExecution()); + + stepExecution.setId(new Long(stepExecutionIncrementer.nextLongValue())); + Object[] parameters = new Object[] { + stepExecution.getId(), + new Long(0), + stepExecution.getStepId(), + stepExecution.getJobExecutionId(), + stepExecution.getStartTime(), + stepExecution.getEndTime(), + stepExecution.getStatus().toString(), + stepExecution.getCommitCount(), + stepExecution.getTaskCount(), + PropertiesConverter.propertiesToString(stepExecution + .getStatistics()), + stepExecution.getExitStatus().isContinuable() ? "Y" : "N", + stepExecution.getExitStatus().getExitCode(), + stepExecution.getExitStatus().getExitDescription() }; + jdbcTemplate.update(getSaveStepExecutionQuery(), parameters, new int[] { + Types.INTEGER, Types.INTEGER, Types.INTEGER, Types.INTEGER, + Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.INTEGER, + Types.INTEGER, Types.VARCHAR, Types.CHAR, Types.VARCHAR, + Types.VARCHAR }); + + } + + /** + * Public setter for the createStepQuery property. + * + * @param createStepQuery + * the createStepQuery to set + */ + public void setCreateStepQuery(String createStepQuery) { + this.createStepQuery = createStepQuery; + } + + /** + * Public setter for the findStepExecutionsQuery property. + * + * @param findStepExecutionsQuery + * the findStepExecutionsQuery to set + */ + public void setFindStepExecutionsQuery(String findStepExecutionsQuery) { + this.findStepExecutionsQuery = findStepExecutionsQuery; + } + + /** + * Public setter for the findStepQuery property. + * + * @param findStepQuery + * the findStepQuery to set + */ + public void setFindStepQuery(String findStepQuery) { + this.findStepQuery = findStepQuery; + } + + /** + * Public setter for the findStepQuery property. + * + * @param findStepsQuery + * the findStepsQuery to set + */ + public void setFindStepsQuery(String findStepsQuery) { + this.findStepsQuery = findStepsQuery; + } + public void setJdbcTemplate(JdbcOperations jdbcTemplate) { this.jdbcTemplate = jdbcTemplate; } - public void setStepIncrementer(DataFieldMaxValueIncrementer stepIncrementer) { - this.stepIncrementer = stepIncrementer; + /** + * Injection setter for job dao. Used to save {@link JobExecution} + * instances. + * + * @param jobDao + * a {@link JobDao} + */ + public void setJobDao(JobDao jobDao) { + this.jobDao = jobDao; } + /** + * Public setter for the findStepQuery property. + * + * @param saveStepExecutionQuery + * the saveStepExecutionQuery to set + */ + public void setSaveStepExecutionQuery(String saveStepExecutionQuery) { + this.saveStepExecutionQuery = saveStepExecutionQuery; + } + + /** + * Public setter for the stepExecutionCountQuery property. + * + * @param stepExecutionCountQuery + * the stepExecutionCountQuery to set + */ + public void setStepExecutionCountQuery(String stepExecutionCountQuery) { + this.stepExecutionCountQuery = stepExecutionCountQuery; + } + + /** + * Set the {@link DataFieldMaxValueIncrementer} that will be used to + * increment the primary keys used for {@link StepExecution} instances. + * + * @param stepExecutionIncrementer a {@link DataFieldMaxValueIncrementer} + */ public void setStepExecutionIncrementer( DataFieldMaxValueIncrementer stepExecutionIncrementer) { this.stepExecutionIncrementer = stepExecutionIncrementer; } - public void afterPropertiesSet() throws Exception { - Assert.notNull(jdbcTemplate, "JdbcTemplate cannot be null."); - Assert.notNull(stepIncrementer, "StepIncrementer cannot be null."); - Assert.notNull(stepExecutionIncrementer, - "StepExecutionIncrementer canot be null."); + /** + * Set the {@link DataFieldMaxValueIncrementer} that will be used to + * increment the primary keys used for {@link StepInstance} instances. + * + * @param stepExecutionIncrementer a {@link DataFieldMaxValueIncrementer} + */ + public void setStepIncrementer(DataFieldMaxValueIncrementer stepIncrementer) { + this.stepIncrementer = stepIncrementer; } - private String getQuery(String base) { - return StringUtils.replace(base, "%PREFIX%", tablePrefix); + /** + * Public setter for the table prefix property. This will be prefixed to all + * the table names before queries are executed (unless individual queries + * are overridden with the set*Query methods). Defaults to + * {@value #DEFAULT_TABLE_PREFIX}. + * + * @param tablePrefix + * the tablePrefix to set + */ + public void setTablePrefix(String tablePrefix) { + this.tablePrefix = tablePrefix; + } + + /** + * Public setter for the {@link String} property. + * + * @param updateStepExecutionQuery + * the updateStepExecutionQuery to set + */ + public void setUpdateStepExecutionQuery(String updateStepExecutionQuery) { + this.updateStepExecutionQuery = updateStepExecutionQuery; + } + + /** + * Public setter for the {@link String} property. + * + * @param updateStepQuery + * the updateStepQuery to set + */ + public void setUpdateStepQuery(String updateStepQuery) { + this.updateStepQuery = updateStepQuery; + } + + /** + * @see StepDao#update(StepExecution) + */ + public void update(StepExecution stepExecution) { + + validateStepExecution(stepExecution); + Assert.notNull(stepExecution.getId(), + "StepExecution Id cannot be null. StepExecution must saved" + + " before it can be updated."); + + // TODO: Not sure if this is a good idea on step execution considering + // it is saved at every commit + // point. + // if (jdbcTemplate.queryForInt(CHECK_STEP_EXECUTION_EXISTS, new + // Object[] { stepExecution.getId() }) != 1) { + // return; // throw exception? + // } + + String exitDescription = stepExecution.getExitStatus() + .getExitDescription(); + if (exitDescription != null + && exitDescription.length() > EXIT_MESSAGE_LENGTH) { + exitDescription = exitDescription.substring(0, EXIT_MESSAGE_LENGTH); + logger + .debug("Truncating long message before update of StepExecution: " + + stepExecution); + } + + Object[] parameters = new Object[] { + stepExecution.getStartTime(), + stepExecution.getEndTime(), + stepExecution.getStatus().toString(), + stepExecution.getCommitCount(), + stepExecution.getTaskCount(), + PropertiesConverter.propertiesToString(stepExecution + .getStatistics()), + stepExecution.getExitStatus().isContinuable() ? "Y" : "N", + stepExecution.getExitStatus().getExitCode(), exitDescription, + stepExecution.getId() }; + jdbcTemplate + .update(getUpdateStepExecutionQuery(), parameters, + new int[] { Types.TIMESTAMP, Types.TIMESTAMP, + Types.VARCHAR, Types.INTEGER, Types.INTEGER, + Types.VARCHAR, Types.CHAR, Types.VARCHAR, + Types.VARCHAR, Types.INTEGER }); + + } + + /** + * @see StepDao#update(StepInstance) + * @throws IllegalArgumentException + * if step, or it's status and id is null. + */ + public void update(final StepInstance step) { + + Assert.notNull(step, "Step cannot be null."); + Assert.notNull(step.getStatus(), "Step status cannot be null."); + Assert.notNull(step.getId(), "Step Id cannot be null."); + + Properties restartProps = null; + RestartData restartData = step.getRestartData(); + if (restartData != null) { + restartProps = restartData.getProperties(); + } + + Object[] parameters = new Object[] { step.getStatus().toString(), + PropertiesConverter.propertiesToString(restartProps), + step.getId() }; + + jdbcTemplate.update(getUpdateStepQuery(), parameters); } /* diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/StepDao.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepDao.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/StepDao.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/StepDao.java diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/dao/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/repository/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/repository/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/repository/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/BatchResourceFactoryBean.java diff --git a/execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGenerator.java diff --git a/execution/src/main/java/org/springframework/batch/execution/resource/JobIdentifierLabelGenerator.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/JobIdentifierLabelGenerator.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/resource/JobIdentifierLabelGenerator.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/resource/JobIdentifierLabelGenerator.java diff --git a/execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifier.java diff --git a/execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactory.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactory.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactory.java diff --git a/execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifier.java diff --git a/execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactory.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactory.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactory.java diff --git a/execution/src/main/java/org/springframework/batch/execution/runtime/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/runtime/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/runtime/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/scope/SimpleStepContext.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/SimpleStepContext.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/scope/SimpleStepContext.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/SimpleStepContext.java diff --git a/execution/src/main/java/org/springframework/batch/execution/scope/StepContext.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepContext.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/scope/StepContext.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepContext.java diff --git a/execution/src/main/java/org/springframework/batch/execution/scope/StepContextAware.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepContextAware.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/scope/StepContextAware.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepContextAware.java diff --git a/execution/src/main/java/org/springframework/batch/execution/scope/StepScope.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepScope.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/scope/StepScope.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepScope.java diff --git a/execution/src/main/java/org/springframework/batch/execution/scope/StepSynchronizationManager.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepSynchronizationManager.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/scope/StepSynchronizationManager.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/StepSynchronizationManager.java diff --git a/execution/src/main/java/org/springframework/batch/execution/scope/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/scope/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/scope/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/step/AbstractStepConfiguration.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStepConfiguration.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/AbstractStepConfiguration.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/AbstractStepConfiguration.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactory.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactory.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactory.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsHolder.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsHolder.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsHolder.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsHolder.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsStepConfiguration.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsStepConfiguration.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsStepConfiguration.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/RepeatOperationsStepConfiguration.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/SimpleStepConfiguration.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/SimpleStepConfiguration.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/SimpleStepConfiguration.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/SimpleStepConfiguration.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/DefaultStepExecutor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/DefaultStepExecutor.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/DefaultStepExecutor.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/DefaultStepExecutor.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifier.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifier.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifier.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifier.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutor.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactory.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactory.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactory.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactory.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/StepInterruptionPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/StepInterruptionPolicy.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/StepInterruptionPolicy.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/StepInterruptionPolicy.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicy.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicy.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicy.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicy.java diff --git a/execution/src/main/java/org/springframework/batch/execution/step/simple/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/step/simple/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/step/simple/package.html diff --git a/execution/src/main/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTasklet.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTasklet.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTasklet.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTasklet.java diff --git a/execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTasklet.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTasklet.java similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTasklet.java rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTasklet.java diff --git a/execution/src/main/java/org/springframework/batch/execution/tasklet/package.html b/spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/package.html similarity index 100% rename from execution/src/main/java/org/springframework/batch/execution/tasklet/package.html rename to spring-batch-execution/src/main/java/org/springframework/batch/execution/tasklet/package.html diff --git a/execution/src/main/java/overview.html b/spring-batch-execution/src/main/java/overview.html similarity index 100% rename from execution/src/main/java/overview.html rename to spring-batch-execution/src/main/java/overview.html diff --git a/execution/src/main/resources/batch.template.properties b/spring-batch-execution/src/main/resources/batch.template.properties similarity index 100% rename from execution/src/main/resources/batch.template.properties rename to spring-batch-execution/src/main/resources/batch.template.properties diff --git a/execution/src/main/resources/schema-db2.sql b/spring-batch-execution/src/main/resources/schema-db2.sql similarity index 100% rename from execution/src/main/resources/schema-db2.sql rename to spring-batch-execution/src/main/resources/schema-db2.sql diff --git a/execution/src/main/resources/schema-derby.sql b/spring-batch-execution/src/main/resources/schema-derby.sql similarity index 100% rename from execution/src/main/resources/schema-derby.sql rename to spring-batch-execution/src/main/resources/schema-derby.sql diff --git a/execution/src/main/resources/schema-hsqldb.sql b/spring-batch-execution/src/main/resources/schema-hsqldb.sql similarity index 100% rename from execution/src/main/resources/schema-hsqldb.sql rename to spring-batch-execution/src/main/resources/schema-hsqldb.sql diff --git a/execution/src/main/resources/schema-oracle10g.sql b/spring-batch-execution/src/main/resources/schema-oracle10g.sql similarity index 100% rename from execution/src/main/resources/schema-oracle10g.sql rename to spring-batch-execution/src/main/resources/schema-oracle10g.sql diff --git a/execution/src/main/resources/schema-postgresql.sql b/spring-batch-execution/src/main/resources/schema-postgresql.sql similarity index 100% rename from execution/src/main/resources/schema-postgresql.sql rename to spring-batch-execution/src/main/resources/schema-postgresql.sql diff --git a/execution/src/main/sql/db2.properties b/spring-batch-execution/src/main/sql/db2.properties similarity index 100% rename from execution/src/main/sql/db2.properties rename to spring-batch-execution/src/main/sql/db2.properties diff --git a/execution/src/main/sql/db2.vpp b/spring-batch-execution/src/main/sql/db2.vpp similarity index 100% rename from execution/src/main/sql/db2.vpp rename to spring-batch-execution/src/main/sql/db2.vpp diff --git a/execution/src/main/sql/derby.properties b/spring-batch-execution/src/main/sql/derby.properties similarity index 100% rename from execution/src/main/sql/derby.properties rename to spring-batch-execution/src/main/sql/derby.properties diff --git a/execution/src/main/sql/derby.vpp b/spring-batch-execution/src/main/sql/derby.vpp similarity index 100% rename from execution/src/main/sql/derby.vpp rename to spring-batch-execution/src/main/sql/derby.vpp diff --git a/execution/src/main/sql/destroy.sql.vpp b/spring-batch-execution/src/main/sql/destroy.sql.vpp similarity index 100% rename from execution/src/main/sql/destroy.sql.vpp rename to spring-batch-execution/src/main/sql/destroy.sql.vpp diff --git a/execution/src/main/sql/hsqldb.properties b/spring-batch-execution/src/main/sql/hsqldb.properties similarity index 100% rename from execution/src/main/sql/hsqldb.properties rename to spring-batch-execution/src/main/sql/hsqldb.properties diff --git a/execution/src/main/sql/hsqldb.vpp b/spring-batch-execution/src/main/sql/hsqldb.vpp similarity index 100% rename from execution/src/main/sql/hsqldb.vpp rename to spring-batch-execution/src/main/sql/hsqldb.vpp diff --git a/execution/src/main/sql/init.sql.vpp b/spring-batch-execution/src/main/sql/init.sql.vpp similarity index 100% rename from execution/src/main/sql/init.sql.vpp rename to spring-batch-execution/src/main/sql/init.sql.vpp diff --git a/execution/src/main/sql/oracle10g.properties b/spring-batch-execution/src/main/sql/oracle10g.properties similarity index 100% rename from execution/src/main/sql/oracle10g.properties rename to spring-batch-execution/src/main/sql/oracle10g.properties diff --git a/execution/src/main/sql/oracle10g.vpp b/spring-batch-execution/src/main/sql/oracle10g.vpp similarity index 100% rename from execution/src/main/sql/oracle10g.vpp rename to spring-batch-execution/src/main/sql/oracle10g.vpp diff --git a/execution/src/main/sql/postgresql.properties b/spring-batch-execution/src/main/sql/postgresql.properties similarity index 100% rename from execution/src/main/sql/postgresql.properties rename to spring-batch-execution/src/main/sql/postgresql.properties diff --git a/execution/src/main/sql/postgresql.vpp b/spring-batch-execution/src/main/sql/postgresql.vpp similarity index 100% rename from execution/src/main/sql/postgresql.vpp rename to spring-batch-execution/src/main/sql/postgresql.vpp diff --git a/execution/src/main/sql/schema.sql.vpp b/spring-batch-execution/src/main/sql/schema.sql.vpp similarity index 100% rename from execution/src/main/sql/schema.sql.vpp rename to spring-batch-execution/src/main/sql/schema.sql.vpp diff --git a/execution/src/site/apt/changelog.apt b/spring-batch-execution/src/site/apt/changelog.apt similarity index 100% rename from execution/src/site/apt/changelog.apt rename to spring-batch-execution/src/site/apt/changelog.apt diff --git a/execution/src/site/apt/executable.apt b/spring-batch-execution/src/site/apt/executable.apt similarity index 100% rename from execution/src/site/apt/executable.apt rename to spring-batch-execution/src/site/apt/executable.apt diff --git a/execution/src/site/apt/glossary.apt b/spring-batch-execution/src/site/apt/glossary.apt similarity index 100% rename from execution/src/site/apt/glossary.apt rename to spring-batch-execution/src/site/apt/glossary.apt diff --git a/execution/src/site/apt/index.apt b/spring-batch-execution/src/site/apt/index.apt similarity index 100% rename from execution/src/site/apt/index.apt rename to spring-batch-execution/src/site/apt/index.apt diff --git a/execution/src/site/apt/introduction.apt b/spring-batch-execution/src/site/apt/introduction.apt similarity index 100% rename from execution/src/site/apt/introduction.apt rename to spring-batch-execution/src/site/apt/introduction.apt diff --git a/execution/src/site/apt/outline.apt b/spring-batch-execution/src/site/apt/outline.apt similarity index 100% rename from execution/src/site/apt/outline.apt rename to spring-batch-execution/src/site/apt/outline.apt diff --git a/execution/src/site/apt/overview.apt b/spring-batch-execution/src/site/apt/overview.apt similarity index 100% rename from execution/src/site/apt/overview.apt rename to spring-batch-execution/src/site/apt/overview.apt diff --git a/execution/src/site/apt/samples.apt b/spring-batch-execution/src/site/apt/samples.apt similarity index 100% rename from execution/src/site/apt/samples.apt rename to spring-batch-execution/src/site/apt/samples.apt diff --git a/execution/src/site/resources/images/simple-batch-execution-container.jpg b/spring-batch-execution/src/site/resources/images/simple-batch-execution-container.jpg similarity index 100% rename from execution/src/site/resources/images/simple-batch-execution-container.jpg rename to spring-batch-execution/src/site/resources/images/simple-batch-execution-container.jpg diff --git a/execution/src/site/resources/images/simple-module-job-configuration.jpg b/spring-batch-execution/src/site/resources/images/simple-module-job-configuration.jpg similarity index 100% rename from execution/src/site/resources/images/simple-module-job-configuration.jpg rename to spring-batch-execution/src/site/resources/images/simple-module-job-configuration.jpg diff --git a/execution/src/site/site.xml b/spring-batch-execution/src/site/site.xml similarity index 100% rename from execution/src/site/site.xml rename to spring-batch-execution/src/site/site.xml diff --git a/execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/AbstractExceptionTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEventTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEventTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEventTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/BatchExecutionRequestEventTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisherTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisherTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/JobExecutionNotificationPublisherTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncherTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncherTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/BatchCommandLineLauncherTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/SimpleJvmExitCodeMapperTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/StubJobLauncher.java diff --git a/execution/src/test/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptorTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptorTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/bootstrap/support/TypeConverterMethodInterceptorTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessorTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessorTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/JobConfigurationRegistryBeanPostProcessorTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistryTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/configuration/MapJobConfigurationRegistryTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/job/DefaultJobExecutorTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemProcessor.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemProcessor.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemProcessor.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/EmptyItemProcessor.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/InterruptJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/InterruptJobTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/InterruptJobTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/InterruptJobTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningExceptionTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningExceptionTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningExceptionTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionAlreadyRunningExceptionTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionListenerSupportTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionListenerSupportTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionListenerSupportTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/JobExecutionListenerSupportTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobExecutorFacadeTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobLauncherTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/SimpleJobTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/launch/TaskExecutorJobLauncherTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/TaskExecutorJobLauncherTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/launch/TaskExecutorJobLauncherTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/launch/TaskExecutorJobLauncherTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/MockStepDao.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/SimpleJobRepositoryTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractJobDaoTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/AbstractStepDaoTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobDaoTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobDaoTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapJobDaoTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepDaoTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepDaoTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MapStepDaoTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/MockJdbcTemplate.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MockJdbcTemplate.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/MockJdbcTemplate.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/MockJdbcTemplate.java diff --git a/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoQueryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoQueryTests.java new file mode 100644 index 000000000..48ce670b2 --- /dev/null +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoQueryTests.java @@ -0,0 +1,75 @@ +/* + * Copyright 2006-2007 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.batch.execution.repository.dao; + +import junit.framework.TestCase; + +/** + * @author Dave Syer + * + */ +public class SqlJobDaoQueryTests extends TestCase { + + SqlJobDao sqlDao; + + /* (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + protected void setUp() throws Exception { + sqlDao = new SqlJobDao(); + } + + public void testTablePrefix() throws Exception { + sqlDao.setTablePrefix("FOO_"); + assertTrue("Query did not contain FOO_:"+sqlDao.getFindJobsQuery(), sqlDao.getFindJobsQuery().indexOf("FOO_")>=0); + } + + public void testSetSaveJobExecutionQuery() throws Exception { + sqlDao.setSaveJobExecutionQuery("foo"); + assertEquals("foo", sqlDao.getSaveJobExecutionQuery()); + } + + public void testSetUpdateJobQuery() throws Exception { + sqlDao.setUpdateJobQuery("foo"); + assertEquals("foo", sqlDao.getUpdateJobQuery()); + } + + public void testSetFindJobsQuery() throws Exception { + sqlDao.setFindJobsQuery("foo"); + assertEquals("foo", sqlDao.getFindJobsQuery()); + } + + public void testSetUpdateJobExecutionQuery() throws Exception { + sqlDao.setUpdateJobExecutionQuery("foo"); + assertEquals("foo", sqlDao.getUpdateJobExecutionQuery()); + } + + public void testSetJobExecutionCountQuery() throws Exception { + sqlDao.setJobExecutionCountQuery("foo"); + assertEquals("foo", sqlDao.getJobExecutionCountQuery()); + } + + public void testSetCheckJobExecutionExistsQuery() throws Exception { + sqlDao.setCheckJobExecutionExistsQuery("foo"); + assertEquals("foo", sqlDao.getCheckJobExecutionExistsQuery()); + } + + public void testJobExecutionCountQuery() throws Exception { + sqlDao.setJobExecutionCountQuery("foo"); + assertEquals("foo", sqlDao.getJobExecutionCountQuery()); + } + +} diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java similarity index 56% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java index 66993735a..5c397c025 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlJobDaoTests.java @@ -4,31 +4,20 @@ import java.util.List; import java.util.Map; import org.springframework.batch.repeat.ExitStatus; -import org.springframework.dao.DataAccessException; - public class SqlJobDaoTests extends AbstractJobDaoTests { - private static final String LONG_STRING = BatchHibernateInterceptorTests.LONG_STRING; + public static final String LONG_STRING = "A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String A very long String "; protected void onSetUpBeforeTransaction() throws Exception { ((SqlJobDao) jobDao).setTablePrefix(SqlJobDao.DEFAULT_TABLE_PREFIX); } - public void testTablePrefix() throws Exception { - ((SqlJobDao) jobDao).setTablePrefix("FOO_"); - try { - testUpdateJob(); - fail("Expected DataAccessException"); - } catch (DataAccessException e) { - // expected - } - } - public void testUpdateJobExecutionWithLongExitCode() { - assertTrue(LONG_STRING.length()>250); - jobExecution.setExitStatus(ExitStatus.FINISHED.addExitDescription(LONG_STRING)); + assertTrue(LONG_STRING.length() > 250); + jobExecution.setExitStatus(ExitStatus.FINISHED + .addExitDescription(LONG_STRING)); jobDao.update(jobExecution); List executions = jdbcTemplate.queryForList( diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoPrefixTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoPrefixTests.java similarity index 78% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoPrefixTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoPrefixTests.java index 1c89cdcfb..990865d93 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoPrefixTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoPrefixTests.java @@ -94,6 +94,11 @@ public class SqlStepDaoPrefixTests extends TestCase { assertTrue(jdbcTemplate.getSqlStatement().indexOf("FOO_STEP") != -1); } + public void testStepExecutionCountQuery() throws Exception { + stepDao.setStepExecutionCountQuery("foo"); + assertEquals("foo", stepDao.getStepExecutionCountQuery()); + } + public void testModifiedFindStep(){ stepDao.setTablePrefix("FOO_"); try{ @@ -120,11 +125,21 @@ public class SqlStepDaoPrefixTests extends TestCase { } + public void testFindStepQuery() throws Exception { + stepDao.setFindStepQuery("foo"); + assertEquals("foo", stepDao.getFindStepQuery()); + } + public void testDefaultFindSteps(){ stepDao.findSteps(new JobInstance(null, new Long(1))); assertTrue(jdbcTemplate.getSqlStatement().indexOf("BATCH_STEP") != -1); } + public void testFindStepsQuery() throws Exception { + stepDao.setFindStepsQuery("foo"); + assertEquals("foo", stepDao.getFindStepsQuery()); + } + public void testDefaultCreateStep(){ stepIncrementer.nextLongValue(); stepIncrementerControl.setReturnValue(1); @@ -133,16 +148,31 @@ public class SqlStepDaoPrefixTests extends TestCase { assertTrue(jdbcTemplate.getSqlStatement().indexOf("BATCH_STEP") != -1); } + public void testCreateStepQuery() throws Exception { + stepDao.setCreateStepQuery("foo"); + assertEquals("foo", stepDao.getCreateStepQuery()); + } + public void testDefaultUpdateStep(){ stepDao.update(step); assertTrue(jdbcTemplate.getSqlStatement().indexOf("BATCH_STEP") != -1); } + public void testSetUpdateStepQuery() throws Exception { + stepDao.setUpdateStepQuery("foo"); + assertEquals("foo", stepDao.getUpdateStepQuery()); + } + public void testDefaultFindStepExecutions(){ stepDao.findStepExecutions(step); assertTrue(jdbcTemplate.getSqlStatement().indexOf("BATCH_STEP_EXECUTION") != -1); } + public void testSetFindStepExecutionsQuery() throws Exception { + stepDao.setFindStepExecutionsQuery("foo"); + assertEquals("foo", stepDao.getFindStepExecutionsQuery()); + } + public void testDefaultSaveStepExecution(){ stepExecutionIncrementer.nextLongValue(); stepExecutionIncrementerControl.setReturnValue(1); @@ -151,8 +181,18 @@ public class SqlStepDaoPrefixTests extends TestCase { assertTrue(jdbcTemplate.getSqlStatement().indexOf("BATCH_STEP_EXECUTION") != -1); } + public void testSetSaveStepExecutionQuery() throws Exception { + stepDao.setSaveStepExecutionQuery("foo"); + assertEquals("foo", stepDao.getSaveStepExecutionQuery()); + } + public void testDefaultUpdateStepExecution(){ stepDao.update(stepExecution); assertTrue(jdbcTemplate.getSqlStatement().indexOf("BATCH_STEP_EXECUTION") != -1); } + + public void testSetUpdateStepExecutionQuery() throws Exception { + stepDao.setUpdateStepExecutionQuery("foo"); + assertEquals("foo", stepDao.getUpdateStepExecutionQuery()); + } } diff --git a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java similarity index 89% rename from execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java index f917d9b33..c0695344e 100644 --- a/execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java +++ b/spring-batch-execution/src/test/java/org/springframework/batch/execution/repository/dao/SqlStepDaoTests.java @@ -8,7 +8,7 @@ import org.springframework.dao.DataAccessException; public class SqlStepDaoTests extends AbstractStepDaoTests { - private static final String LONG_STRING = BatchHibernateInterceptorTests.LONG_STRING; + private static final String LONG_STRING = SqlJobDaoTests.LONG_STRING; protected void onSetUpBeforeTransaction() throws Exception { ((SqlStepDao) stepDao).setTablePrefix(SqlJobDao.DEFAULT_TABLE_PREFIX); diff --git a/execution/src/test/java/org/springframework/batch/execution/resource/BatchResourceFactoryBeanTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/BatchResourceFactoryBeanTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/resource/BatchResourceFactoryBeanTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/BatchResourceFactoryBeanTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/resource/DefaultJobIdentifierLabelGeneratorTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactoryTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierFactoryTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/DefaultJobIdentifierTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactoryTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierFactoryTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/runtime/ScheduledJobIdentifierTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/scope/SimpleStepContextTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/SimpleStepContextTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/scope/SimpleStepContextTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/SimpleStepContextTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/scope/StepContextAwareStepScopeTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/StepContextAwareStepScopeTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/scope/StepContextAwareStepScopeTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/StepContextAwareStepScopeTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/scope/StepScopeTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/StepScopeTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/scope/StepScopeTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/scope/StepScopeTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactoryTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/PrototypeBeanStepExecutorFactoryTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/DefaultStepExecutorTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/JobRepositorySupport.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/JobRepositorySupport.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/JobRepositorySupport.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/JobRepositorySupport.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/RepeatOperationsStepConfigurationTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/RepeatOperationsStepConfigurationTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/RepeatOperationsStepConfigurationTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/RepeatOperationsStepConfigurationTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifierTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifierTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifierTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleExitCodeExceptionClassifierTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepConfigurationTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepConfigurationTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepConfigurationTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepConfigurationTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactoryTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactoryTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactoryTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/SimpleStepExecutorFactoryTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/StepExecutorInterruptionTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicyTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicyTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicyTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/step/simple/ThreadStepInterruptionPolicyTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTaskletTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTaskletTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTaskletTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/ItemProviderProcessTaskletTests.java diff --git a/execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTaskletTests.java b/spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTaskletTests.java similarity index 100% rename from execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTaskletTests.java rename to spring-batch-execution/src/test/java/org/springframework/batch/execution/tasklet/RestartableItemProviderTaskletTests.java diff --git a/execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java similarity index 100% rename from execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java rename to spring-batch-execution/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java diff --git a/execution/src/test/resources/beanRefContext.xml b/spring-batch-execution/src/test/resources/beanRefContext.xml similarity index 100% rename from execution/src/test/resources/beanRefContext.xml rename to spring-batch-execution/src/test/resources/beanRefContext.xml diff --git a/execution/src/test/resources/clover.license b/spring-batch-execution/src/test/resources/clover.license similarity index 100% rename from execution/src/test/resources/clover.license rename to spring-batch-execution/src/test/resources/clover.license diff --git a/execution/src/test/resources/job-configuration.xml b/spring-batch-execution/src/test/resources/job-configuration.xml similarity index 100% rename from execution/src/test/resources/job-configuration.xml rename to spring-batch-execution/src/test/resources/job-configuration.xml diff --git a/execution/src/test/resources/log4j.properties b/spring-batch-execution/src/test/resources/log4j.properties similarity index 100% rename from execution/src/test/resources/log4j.properties rename to spring-batch-execution/src/test/resources/log4j.properties diff --git a/execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-no-launcher.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-no-launcher.xml similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-no-launcher.xml rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-no-launcher.xml diff --git a/execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment.xml similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment.xml rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment.xml diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/data-source-context.xml diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/init.sql diff --git a/execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/sql-dao-test.xml diff --git a/execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml similarity index 100% rename from execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml rename to spring-batch-execution/src/test/resources/org/springframework/batch/execution/scope/scope-tests.xml diff --git a/execution/src/test/resources/simple-container-definition.xml b/spring-batch-execution/src/test/resources/simple-container-definition.xml similarity index 100% rename from execution/src/test/resources/simple-container-definition.xml rename to spring-batch-execution/src/test/resources/simple-container-definition.xml diff --git a/spring-batch-infrastructure/.classpath b/spring-batch-infrastructure/.classpath new file mode 100644 index 000000000..88628b90b --- /dev/null +++ b/spring-batch-infrastructure/.classpath @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/infrastructure/.project b/spring-batch-infrastructure/.project similarity index 64% rename from infrastructure/.project rename to spring-batch-infrastructure/.project index 15d61040a..17bd77597 100644 --- a/infrastructure/.project +++ b/spring-batch-infrastructure/.project @@ -1,8 +1,7 @@ - infrastructure - The Spring Batch Infrastructure is a set of low-level components, interfaces and tools for batch processing - applications and optimisations. + spring-batch-infrastructure + The Spring Batch Infrastructure is a set of low-level components, interfaces and tools for batch processing applications and optimisations. @@ -16,15 +15,9 @@ - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature org.springframework.ide.eclipse.core.springnature diff --git a/infrastructure/.springBeans b/spring-batch-infrastructure/.springBeans similarity index 100% rename from infrastructure/.springBeans rename to spring-batch-infrastructure/.springBeans diff --git a/infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml similarity index 100% rename from infrastructure/pom.xml rename to spring-batch-infrastructure/pom.xml diff --git a/infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/common/BinaryExceptionClassifier.java diff --git a/infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifier.java diff --git a/infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/common/ExceptionClassifierSupport.java diff --git a/infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/common/SubclassExceptionClassifier.java diff --git a/infrastructure/src/main/java/org/springframework/batch/common/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/common/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/common/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/common/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/InputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/InputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/InputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/InputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/ItemWriter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/Skippable.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/Skippable.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/Skippable.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/Skippable.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/HibernateCursorInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/JdbcCursorInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/cursor/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/cursor/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/cursor/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/DrivingQueryInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/IbatisDrivingQueryInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/IbatisDrivingQueryInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/IbatisDrivingQueryInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/IbatisDrivingQueryInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/KeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/KeyGenerator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/KeyGenerator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/KeyGenerator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapper.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapper.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapper.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/IbatisKeyGenerator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGenerator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/support/RestartDataRowMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/RestartDataRowMapper.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/support/RestartDataRowMapper.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/RestartDataRowMapper.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGenerator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/BatchConfigurationException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/BatchConfigurationException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/BatchConfigurationException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/BatchConfigurationException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/BatchCriticalException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/BatchCriticalException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/BatchCriticalException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/BatchCriticalException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/BatchEnvironmentException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/BatchEnvironmentException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/BatchEnvironmentException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/BatchEnvironmentException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/DynamicMethodInvocationException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/DynamicMethodInvocationException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/DynamicMethodInvocationException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/DynamicMethodInvocationException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/FlatFileParsingException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/FlatFileParsingException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/FlatFileParsingException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/FlatFileParsingException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/ParsingException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/ParsingException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/ParsingException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/ParsingException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionInvalidException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionInvalidException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionInvalidException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionInvalidException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionValidException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionValidException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionValidException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/TransactionValidException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/ValidationException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/ValidationException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/ValidationException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/ValidationException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/exception/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/exception/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/FieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FieldSet.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/FieldSet.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FieldSet.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/FieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FieldSetMapper.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/FieldSetMapper.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FieldSetMapper.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/FlatFileItemWriter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/ResourceLineReader.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderInputSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderInputSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderInputSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventReaderInputSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapper.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/PropertyMatches.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/mapping/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/RecordSeparatorPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/separator/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapper.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapper.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReader.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReader.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/EventSequence.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentDeserializer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/FragmentEventReader.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentStreamWriter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/ObjectToXmlSerializer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/stax/TransactionalEventReader.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/AbstractLineTokenizer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Converter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineAggregator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/LineTokenizer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/Range.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/support/transform/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/AbstractTransactionalIoSource.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/support/FileUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/FileUtils.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/support/FileUtils.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/FileUtils.java diff --git a/infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/support/HibernateAwareItemWriter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/FailedItemIdentifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/FailedItemIdentifier.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/FailedItemIdentifier.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/FailedItemIdentifier.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/ItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/ItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/ResourceLifecycle.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ResourceLifecycle.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/ResourceLifecycle.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ResourceLifecycle.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/UnexpectedInputException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/exception/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/exception/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/item/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemProcessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemProcessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemProcessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemTransformer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemTransformer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemTransformer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/CompositeItemTransformer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/DelegatingItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/DelegatingItemProcessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/DelegatingItemProcessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/DelegatingItemProcessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/ItemTransformer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemTransformer.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/ItemTransformer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemTransformer.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/ItemWriterItemProcessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProcessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProcessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProcessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/TransformerWriterItemProcessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/processor/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/processor/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/processor/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AbstractItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/AggregateItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/DelegatingItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/InputSourceItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/InputSourceItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/InputSourceItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/InputSourceItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/JmsItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ListItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/ValidatingItemProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/provider/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/provider/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/provider/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/Validator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/item/validator/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/item/validator/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/CompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/CompletionPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/CompletionPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/CompletionPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/ExitStatus.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/RepeatCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatCallback.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/RepeatCallback.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatCallback.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/RepeatContext.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatContext.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/RepeatContext.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatContext.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/RepeatInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatInterceptor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/RepeatInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatInterceptor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/RepeatOperations.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/aop/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallback.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallback.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallback.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/callback/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/callback/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextCounter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextCounter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextCounter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextCounter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/context/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/context/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RepeatException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandler.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandler.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/ExceptionHandler.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandler.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandler.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandler.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/handler/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorAdapter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorAdapter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorAdapter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsApplicationEvent.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsApplicationEvent.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsApplicationEvent.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsApplicationEvent.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/TimeoutTerminationPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/TimeoutTerminationPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/TimeoutTerminationPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/TimeoutTerminationPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/policy/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/policy/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalState.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalState.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalState.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalState.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/support/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/support/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManager.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManager.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManager.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java diff --git a/infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/restart/GenericRestartData.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/GenericRestartData.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/restart/GenericRestartData.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/GenericRestartData.java diff --git a/infrastructure/src/main/java/org/springframework/batch/restart/RestartData.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/RestartData.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/restart/RestartData.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/RestartData.java diff --git a/infrastructure/src/main/java/org/springframework/batch/restart/Restartable.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/Restartable.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/restart/Restartable.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/Restartable.java diff --git a/infrastructure/src/main/java/org/springframework/batch/restart/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/restart/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/restart/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/RetryCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryCallback.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/RetryCallback.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryCallback.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/RetryContext.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryContext.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/RetryContext.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryContext.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/RetryInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryInterceptor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/RetryInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryInterceptor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/RetryOperations.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryOperations.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/RetryOperations.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryOperations.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/RetryStatistics.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryStatistics.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/RetryStatistics.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/RetryStatistics.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/RetryOperationsInterceptor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/aop/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffContext.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffContext.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffContext.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffContext.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/BackOffPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/FixedBackOffPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/NoBackOffPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/StatelessBackOffPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/backoff/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/backoff/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/backoff/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemProviderRetryCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemProviderRetryCallback.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemProviderRetryCallback.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/ItemProviderRetryCallback.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/callback/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/context/RetryContextSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/context/RetryContextSupport.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/context/RetryContextSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/context/RetryContextSupport.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/context/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/context/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/context/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/context/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/BackOffInterruptedException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/ExhaustedRetryException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/RetryException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/TerminatedRetryException.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/exception/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupport.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupport.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupport.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/interceptor/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatefulRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatefulRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatefulRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatefulRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AbstractStatelessRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/AlwaysRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AlwaysRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/AlwaysRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/AlwaysRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/MapRetryContextCache.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/MapRetryContextCache.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/MapRetryContextCache.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/MapRetryContextCache.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/RetryContextCache.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/RetryContextCache.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/RetryContextCache.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/RetryContextCache.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/policy/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/policy/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/support/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/support/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java diff --git a/infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/statistics/StatisticsProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/statistics/StatisticsProvider.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/statistics/StatisticsProvider.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/statistics/StatisticsProvider.java diff --git a/infrastructure/src/main/java/org/springframework/batch/statistics/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/statistics/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/statistics/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/statistics/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/support/AbstractDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AbstractDelegator.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/AbstractDelegator.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AbstractDelegator.java diff --git a/infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java diff --git a/infrastructure/src/main/java/org/springframework/batch/support/PropertiesConverter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PropertiesConverter.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/PropertiesConverter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PropertiesConverter.java diff --git a/infrastructure/src/main/java/org/springframework/batch/support/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/package.html diff --git a/infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java diff --git a/infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java diff --git a/infrastructure/src/main/java/org/springframework/batch/support/transaction/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/package.html similarity index 100% rename from infrastructure/src/main/java/org/springframework/batch/support/transaction/package.html rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/package.html diff --git a/infrastructure/src/main/java/overview.html b/spring-batch-infrastructure/src/main/java/overview.html similarity index 100% rename from infrastructure/src/main/java/overview.html rename to spring-batch-infrastructure/src/main/java/overview.html diff --git a/infrastructure/src/site/apt/changelog.apt b/spring-batch-infrastructure/src/site/apt/changelog.apt similarity index 100% rename from infrastructure/src/site/apt/changelog.apt rename to spring-batch-infrastructure/src/site/apt/changelog.apt diff --git a/infrastructure/src/site/apt/index.apt b/spring-batch-infrastructure/src/site/apt/index.apt similarity index 100% rename from infrastructure/src/site/apt/index.apt rename to spring-batch-infrastructure/src/site/apt/index.apt diff --git a/infrastructure/src/site/site.xml b/spring-batch-infrastructure/src/site/site.xml similarity index 100% rename from infrastructure/src/site/site.xml rename to spring-batch-infrastructure/src/site/site.xml diff --git a/infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/common/BinaryExceptionClassifierTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/common/ExceptionClassifierSupportTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/common/SubclassExceptionClassifierTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceStatefulIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceStatefulIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceStatefulIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/cursor/HibernateCursorInputSourceStatefulIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/cursor/JdbcCursorInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/cursor/JdbcCursorInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/cursor/JdbcCursorInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/cursor/JdbcCursorInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/CompositeKeyFooDao.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/DrivingQueryInputSourceTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/FooDao.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooDao.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/FooDao.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooDao.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooInputSource.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/FooRowMapper.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooRowMapper.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/FooRowMapper.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/FooRowMapper.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/IbatisInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/IbatisInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/IbatisInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/IbatisInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/MultipleColumnJdbcDrivingQueryInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/SingleColumnJdbcDrivingQueryInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/SingleKeyFooDao.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/SingleKeyFooDao.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/SingleKeyFooDao.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/SingleKeyFooDao.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/ColumnMapRestartDataRowMapperTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/MultipleColumnJdbcKeyGeneratorIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/driving/support/SingleColumnJdbcKeyGeneratorIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractBatchCriticalExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractBatchCriticalExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractBatchCriticalExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractBatchCriticalExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/AbstractExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/BatchConfigurationExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/BatchConfigurationExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/BatchConfigurationExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/BatchConfigurationExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/BatchCriticalExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/BatchCriticalExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/BatchCriticalExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/BatchCriticalExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/BatchEnvironmentExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/BatchEnvironmentExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/BatchEnvironmentExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/BatchEnvironmentExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionInvalidExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionInvalidExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionInvalidExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionInvalidExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionValidExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionValidExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionValidExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/TransactionValidExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/exception/ValidationExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/ValidationExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/exception/ValidationExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/exception/ValidationExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/FieldSetTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FieldSetTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/FieldSetTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FieldSetTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSourceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSourceTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSourceTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/DefaultFlatFileInputSourceTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/EventHelper.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/FlatFileItemWriterTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/ResourceLineReaderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSourceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSourceTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSourceTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/SimpleFlatFileInputSourceTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderInputSourceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderInputSourceTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderInputSourceTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventReaderInputSourceTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/StaxEventWriterItemWriterTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/BeanWrapperFieldSetMapperTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/PropertyMatchesTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/mapping/TestObject.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/MarshallingObjectToXmlSerializerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/oxm/UnmarshallingFragmentDeserializerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/DefaultRecordSeparatorPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SimpleRecordSeparatorPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/separator/SuffixRecordSeparatorPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventReaderWrapperTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/AbstractEventWriterWrapperTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultFragmentEventReaderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/DefaultTransactionalEventReaderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/EventSequenceTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/stax/NoStartEndDocumentWriterTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/CommonLineTokenizerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineAggregatorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/DelimitedLineTokenizerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthLineAggregatorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/FixedLengthTokenizerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/LineAggregatorStub.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/PrefixMatchingCompositeLineTokenizerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/support/transform/RangeArrayPropertyEditorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Customer.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Customer.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Customer.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Customer.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Foo.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Foo.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Foo.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Foo.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sample/domain/FooService.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/FooService.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sample/domain/FooService.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/FooService.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sample/domain/LineItem.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/LineItem.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sample/domain/LineItem.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/LineItem.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Order.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Order.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Order.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Order.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Shipper.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Shipper.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Shipper.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sample/domain/Shipper.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sql/AbstractJdbcInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sql/AbstractJdbcInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/sql/AbstractJdbcInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/sql/AbstractJdbcInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/support/AbstractDataSourceInputSourceIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/AbstractDataSourceInputSourceIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/support/AbstractDataSourceInputSourceIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/AbstractDataSourceInputSourceIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/support/AbstractTransactionalIoSourceTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/AbstractTransactionalIoSourceTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/support/AbstractTransactionalIoSourceTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/AbstractTransactionalIoSourceTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/FileUtilsTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/io/support/HibernateAwareItemWriterTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/exception/UnexpectedInputExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemProcessorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemProcessorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemProcessorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemTransformerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemTransformerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/CompositeItemTransformerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/processor/DelegatingItemProcessorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/DelegatingItemProcessorIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/processor/DelegatingItemProcessorIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/DelegatingItemProcessorIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/ItemWriterItemProcessorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProccessorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProccessorIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProccessorIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/PropertyExtractingDelegatingItemProccessorIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/processor/TransformerWriterItemProcessorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/AggregateItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemProviderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemProviderIntegrationTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemProviderIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/DelegatingItemProviderIntegrationTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/InputSourceItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/InputSourceItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/InputSourceItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/InputSourceItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/JmsItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ListItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/TransactionAwareListItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemProviderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemProviderTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemProviderTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/provider/ValidatingItemProviderTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/ExitStatusTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/aop/RepeatOperationsInterceptorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallbackTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallbackTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/ItemProviderRepeatCallbackTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextCounterTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/AbstractExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/RepeatExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/CompositeExceptionHandlerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/DefaultExceptionHandlerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/LogOrRethrowExceptionHandlerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/RethrowOnThresholdExceptionHandlerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/handler/SimpleLimitExceptionHandlerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/ApplicationEventPublisherRepeatInterceptorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatInterceptorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/policy/TimeoutCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/TimeoutCompletionPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/policy/TimeoutCompletionPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/TimeoutCompletionPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AsynchronousRepeatTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManagerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/BatchTransactionSynchronizationManagerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/aop/RetryOperationsInterceptorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/backoff/ExponentialBackOffPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/backoff/FixedBackOffPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/backoff/FixedBackOffPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/backoff/FixedBackOffPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/backoff/FixedBackOffPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemProviderRetryCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemProviderRetryCallbackTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemProviderRetryCallbackTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/callback/ItemProviderRetryCallbackTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/AbstractExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/BackOffInterruptedExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/ExhaustedRetryExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/RetryExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/exception/TerminatedRetryExceptionTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupportTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupportTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorSupportTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/RetryInterceptorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/interceptor/StatisticsRetryInterceptorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExternalRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemProviderRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/MapRetryContextCacheTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/MapRetryContextCacheTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/MapRetryContextCacheTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/MapRetryContextCacheTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/MockRetryPolicySupport.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/MockRetryPolicySupport.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/MockRetryPolicySupport.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/MockRetryPolicySupport.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/AbstractDelegatorTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PropertiesConverterTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java diff --git a/infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java similarity index 100% rename from infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java diff --git a/infrastructure/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java similarity index 100% rename from infrastructure/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java rename to spring-batch-infrastructure/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java diff --git a/infrastructure/src/test/resources/clover.license b/spring-batch-infrastructure/src/test/resources/clover.license similarity index 100% rename from infrastructure/src/test/resources/clover.license rename to spring-batch-infrastructure/src/test/resources/clover.license diff --git a/infrastructure/src/test/resources/log4j.properties b/spring-batch-infrastructure/src/test/resources/log4j.properties similarity index 100% rename from infrastructure/src/test/resources/log4j.properties rename to spring-batch-infrastructure/src/test/resources/log4j.properties diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo-write.hbm.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo-write.hbm.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo-write.hbm.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo-write.hbm.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo.hbm.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo.hbm.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo.hbm.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/cursor/Foo.hbm.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-config.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-foo.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-foo.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-foo.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/driving/ibatis-foo.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/file/support/mapping/bean-wrapper.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/sql/data-source-context.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/sql/data-source-context.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/sql/data-source-context.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/sql/data-source-context.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/sql/destroy-foo-schema-hsqldb.sql b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/sql/destroy-foo-schema-hsqldb.sql similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/sql/destroy-foo-schema-hsqldb.sql rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/sql/destroy-foo-schema-hsqldb.sql diff --git a/infrastructure/src/test/resources/org/springframework/batch/io/sql/init-foo-schema-hsqldb.sql b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/sql/init-foo-schema-hsqldb.sql similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/io/sql/init-foo-schema-hsqldb.sql rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/io/sql/init-foo-schema-hsqldb.sql diff --git a/infrastructure/src/test/resources/org/springframework/batch/item/processor/delegating-item-processor.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/processor/delegating-item-processor.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/item/processor/delegating-item-processor.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/processor/delegating-item-processor.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/item/processor/pe-delegating-item-processor.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/processor/pe-delegating-item-processor.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/item/processor/pe-delegating-item-processor.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/processor/pe-delegating-item-processor.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/item/provider/delegating-item-provider.xml diff --git a/infrastructure/src/test/resources/org/springframework/batch/repeat/support/trades.csv b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/repeat/support/trades.csv similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/repeat/support/trades.csv rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/repeat/support/trades.csv diff --git a/infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml b/spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml similarity index 100% rename from infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml rename to spring-batch-infrastructure/src/test/resources/org/springframework/batch/retry/aop/retry-transaction-test.xml diff --git a/spring-batch-integration/.classpath b/spring-batch-integration/.classpath new file mode 100644 index 000000000..a10767971 --- /dev/null +++ b/spring-batch-integration/.classpath @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/.project b/spring-batch-integration/.project similarity index 55% rename from core/.project rename to spring-batch-integration/.project index 4884a205f..caa9db6b6 100644 --- a/core/.project +++ b/spring-batch-integration/.project @@ -1,11 +1,9 @@ - core - Simple container application for batch processing, using the - Spring Batch Framework to express a domain of Jobs, Steps, - Chunks, etc. + spring-batch-integration + Integration tests for the Spring Batch Infrastructure - batch-infrastructure + spring-batch-infrastructure @@ -18,15 +16,9 @@ - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature org.springframework.ide.eclipse.core.springnature diff --git a/integration/.settings/org.eclipse.mylyn.tasks.ui.prefs b/spring-batch-integration/.settings/org.eclipse.mylyn.tasks.ui.prefs similarity index 100% rename from integration/.settings/org.eclipse.mylyn.tasks.ui.prefs rename to spring-batch-integration/.settings/org.eclipse.mylyn.tasks.ui.prefs diff --git a/integration/.springBeans b/spring-batch-integration/.springBeans similarity index 100% rename from integration/.springBeans rename to spring-batch-integration/.springBeans diff --git a/integration/pom.xml b/spring-batch-integration/pom.xml similarity index 100% rename from integration/pom.xml rename to spring-batch-integration/pom.xml diff --git a/integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java b/spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java similarity index 100% rename from integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java rename to spring-batch-integration/src/main/java/org/springframework/batch/container/jms/BatchMessageListenerContainer.java diff --git a/integration/src/site/site.xml b/spring-batch-integration/src/site/site.xml similarity index 100% rename from integration/src/site/site.xml rename to spring-batch-integration/src/site/site.xml diff --git a/integration/src/test/java/org/springframework/batch/config/DatasourceTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/config/DatasourceTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/config/DatasourceTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/config/DatasourceTests.java diff --git a/integration/src/test/java/org/springframework/batch/config/MessagingTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/config/MessagingTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/config/MessagingTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/config/MessagingTests.java diff --git a/integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/container/jms/BatchMessageListenerContainerTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderInputSourceTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderInputSourceTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderInputSourceTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderInputSourceTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorMarshallingTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/CastorUnmarshallingTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamMarshallingTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/XStreamUnmarshallingTests.java diff --git a/integration/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java rename to spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/domain/Trade.java diff --git a/integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/jms/ExternalRetryInBatchTests.java diff --git a/integration/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/AsynchronousTests.java diff --git a/integration/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/repeat/jms/SynchronousTests.java diff --git a/integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/ExternalRetryTests.java diff --git a/integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java similarity index 100% rename from integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java rename to spring-batch-integration/src/test/java/org/springframework/batch/retry/jms/SynchronousTests.java diff --git a/integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java b/spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java similarity index 100% rename from integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java rename to spring-batch-integration/src/test/java/org/springframework/retry/jms/SynchronousTests.java diff --git a/integration/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-integration/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java similarity index 100% rename from integration/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java rename to spring-batch-integration/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java diff --git a/integration/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-integration/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java similarity index 100% rename from integration/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java rename to spring-batch-integration/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java diff --git a/integration/src/test/resources/data-source.xml b/spring-batch-integration/src/test/resources/data-source.xml similarity index 100% rename from integration/src/test/resources/data-source.xml rename to spring-batch-integration/src/test/resources/data-source.xml diff --git a/integration/src/test/resources/log4j.properties b/spring-batch-integration/src/test/resources/log4j.properties similarity index 100% rename from integration/src/test/resources/log4j.properties rename to spring-batch-integration/src/test/resources/log4j.properties diff --git a/integration/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml similarity index 100% rename from integration/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml rename to spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/expected-output.xml diff --git a/integration/src/test/resources/org/springframework/batch/io/oxm/input.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/input.xml similarity index 100% rename from integration/src/test/resources/org/springframework/batch/io/oxm/input.xml rename to spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/input.xml diff --git a/integration/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml similarity index 100% rename from integration/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml rename to spring-batch-integration/src/test/resources/org/springframework/batch/io/oxm/mapping-castor.xml diff --git a/integration/src/test/resources/org/springframework/batch/jms/destroy.sql b/spring-batch-integration/src/test/resources/org/springframework/batch/jms/destroy.sql similarity index 100% rename from integration/src/test/resources/org/springframework/batch/jms/destroy.sql rename to spring-batch-integration/src/test/resources/org/springframework/batch/jms/destroy.sql diff --git a/integration/src/test/resources/org/springframework/batch/jms/init.sql b/spring-batch-integration/src/test/resources/org/springframework/batch/jms/init.sql similarity index 100% rename from integration/src/test/resources/org/springframework/batch/jms/init.sql rename to spring-batch-integration/src/test/resources/org/springframework/batch/jms/init.sql diff --git a/integration/src/test/resources/org/springframework/batch/jms/jms-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/jms/jms-context.xml similarity index 100% rename from integration/src/test/resources/org/springframework/batch/jms/jms-context.xml rename to spring-batch-integration/src/test/resources/org/springframework/batch/jms/jms-context.xml diff --git a/spring-batch-samples/.classpath b/spring-batch-samples/.classpath new file mode 100644 index 000000000..49979a9e9 --- /dev/null +++ b/spring-batch-samples/.classpath @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/.project b/spring-batch-samples/.project similarity index 83% rename from samples/.project rename to spring-batch-samples/.project index a04bbc772..a0e200e80 100644 --- a/samples/.project +++ b/spring-batch-samples/.project @@ -1,8 +1,11 @@ - samples + spring-batch-samples Example batch jobs using Spring Batch Core and Execution. + spring-batch-infrastructure + spring-batch-core + spring-batch-execution @@ -30,15 +33,9 @@ - - org.maven.ide.eclipse.maven2Builder - - - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature org.springframework.ide.eclipse.core.springnature org.eclipse.wst.common.project.facet.core.nature org.eclipse.wst.common.modulecore.ModuleCoreNature diff --git a/samples/.settings/hsql-manager.launch b/spring-batch-samples/.settings/hsql-manager.launch similarity index 100% rename from samples/.settings/hsql-manager.launch rename to spring-batch-samples/.settings/hsql-manager.launch diff --git a/samples/.settings/hsql-server.launch b/spring-batch-samples/.settings/hsql-server.launch similarity index 100% rename from samples/.settings/hsql-server.launch rename to spring-batch-samples/.settings/hsql-server.launch diff --git a/samples/.settings/jobLauncher.launch b/spring-batch-samples/.settings/jobLauncher.launch similarity index 100% rename from samples/.settings/jobLauncher.launch rename to spring-batch-samples/.settings/jobLauncher.launch diff --git a/samples/.settings/org.eclipse.wst.validation.prefs b/spring-batch-samples/.settings/org.eclipse.wst.validation.prefs similarity index 100% rename from samples/.settings/org.eclipse.wst.validation.prefs rename to spring-batch-samples/.settings/org.eclipse.wst.validation.prefs diff --git a/samples/.springBeans b/spring-batch-samples/.springBeans similarity index 100% rename from samples/.springBeans rename to spring-batch-samples/.springBeans diff --git a/samples/docs/job_matrix.xls b/spring-batch-samples/docs/job_matrix.xls similarity index 100% rename from samples/docs/job_matrix.xls rename to spring-batch-samples/docs/job_matrix.xls diff --git a/samples/jalopy_customized.xml b/spring-batch-samples/jalopy_customized.xml similarity index 100% rename from samples/jalopy_customized.xml rename to spring-batch-samples/jalopy_customized.xml diff --git a/samples/maven_checks_customized.xml b/spring-batch-samples/maven_checks_customized.xml similarity index 100% rename from samples/maven_checks_customized.xml rename to spring-batch-samples/maven_checks_customized.xml diff --git a/samples/pom.xml b/spring-batch-samples/pom.xml similarity index 100% rename from samples/pom.xml rename to spring-batch-samples/pom.xml diff --git a/samples/server.properties b/spring-batch-samples/server.properties similarity index 100% rename from samples/server.properties rename to spring-batch-samples/server.properties diff --git a/samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/FieldSetResultSetExtractor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/advice/MethodExecutionLogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/MethodExecutionLogAdvice.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/advice/MethodExecutionLogAdvice.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/MethodExecutionLogAdvice.java diff --git a/samples/src/main/java/org/springframework/batch/sample/advice/ProcessorLogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/ProcessorLogAdvice.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/advice/ProcessorLogAdvice.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/ProcessorLogAdvice.java diff --git a/samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/advice/TradeWriterLogAdvice.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerCreditWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/CustomerDebitWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/HibernateCreditWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/IbatisCustomerCreditWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/JdbcTradeWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/OrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/OrderWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/PlayerDao.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlGameDao.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerDao.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDao.java diff --git a/samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/TradeWriter.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Address.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Address.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Address.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Address.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/BillingInfo.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Child.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Child.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Child.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Child.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Customer.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Customer.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerCredit.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/CustomerDebit.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Game.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Game.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Game.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/LineItem.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Order.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Person.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Person.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PersonService.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Player.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Player.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Player.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Player.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/PlayerSummary.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/ShippingInfo.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/Trade.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Trade.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/Trade.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/Trade.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Customer.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/LineItem.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Order.java diff --git a/samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/xml/Shipper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/exception/handler/FootballExceptionHandler.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/exception/handler/FootballExceptionHandler.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/exception/handler/FootballExceptionHandler.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/exception/handler/FootballExceptionHandler.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/DummyProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DummyProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/DummyProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/DummyProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/OrderProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/OrderProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/OrderProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/OrderProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/PersonProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/PersonProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/PersonProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/PersonProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/PlayerItemProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/PlayerItemProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/PlayerItemProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/PlayerItemProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/processor/TradeProcessor.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/TradeProcessor.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/processor/TradeProcessor.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/processor/TradeProcessor.java diff --git a/samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemProvider.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemProvider.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemProvider.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/item/provider/OrderItemProvider.java diff --git a/samples/src/main/java/org/springframework/batch/sample/launch/QuartzBatchLauncher.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/QuartzBatchLauncher.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/launch/QuartzBatchLauncher.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/launch/QuartzBatchLauncher.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/AddressFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/BillingFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/CustomerUpdateMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerUpdateMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/CustomerUpdateMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/CustomerUpdateMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/GameMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/GameMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/GameMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/GameMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/PassThroughFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PassThroughFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/PassThroughFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PassThroughFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/PlayerMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/PlayerMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/PlayerSummaryMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeFieldSetMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/mapping/TradeRowMapper.java diff --git a/samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTasklet.java diff --git a/samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/InfiniteLoopTasklet.java diff --git a/samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/tasklet/SimpleTradeTasklet.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunction.java diff --git a/samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java similarity index 100% rename from samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunction.java diff --git a/samples/src/main/resources/CustomerCredit.hbm.xml b/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml similarity index 100% rename from samples/src/main/resources/CustomerCredit.hbm.xml rename to spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml diff --git a/samples/src/main/resources/batch.properties b/spring-batch-samples/src/main/resources/batch.properties similarity index 100% rename from samples/src/main/resources/batch.properties rename to spring-batch-samples/src/main/resources/batch.properties diff --git a/samples/src/main/resources/beanRefContext.xml b/spring-batch-samples/src/main/resources/beanRefContext.xml similarity index 100% rename from samples/src/main/resources/beanRefContext.xml rename to spring-batch-samples/src/main/resources/beanRefContext.xml diff --git a/samples/src/main/resources/business-schema-db2.sql b/spring-batch-samples/src/main/resources/business-schema-db2.sql similarity index 100% rename from samples/src/main/resources/business-schema-db2.sql rename to spring-batch-samples/src/main/resources/business-schema-db2.sql diff --git a/samples/src/main/resources/business-schema-derby.sql b/spring-batch-samples/src/main/resources/business-schema-derby.sql similarity index 100% rename from samples/src/main/resources/business-schema-derby.sql rename to spring-batch-samples/src/main/resources/business-schema-derby.sql diff --git a/samples/src/main/resources/business-schema-hsqldb.sql b/spring-batch-samples/src/main/resources/business-schema-hsqldb.sql similarity index 96% rename from samples/src/main/resources/business-schema-hsqldb.sql rename to spring-batch-samples/src/main/resources/business-schema-hsqldb.sql index 98ff2ebdf..c969380ab 100644 --- a/samples/src/main/resources/business-schema-hsqldb.sql +++ b/spring-batch-samples/src/main/resources/business-schema-hsqldb.sql @@ -44,7 +44,8 @@ CREATE TABLE PLAYERS ( FIRST_NAME varchar(25) not null, POS varchar(10), YEAR_OF_BIRTH BIGINT not null, - YEAR_DRAFTED BIGINT not null); + YEAR_DRAFTED BIGINT not null +); CREATE TABLE GAMES ( PLAYER_ID char(8) not null PRIMARY KEY, @@ -76,4 +77,5 @@ CREATE TABLE PLAYER_SUMMARY ( RUSH_YARDS BIGINT NOT NULL , RECEPTIONS BIGINT NOT NULL , RECEPTIONS_YARDS BIGINT NOT NULL , - TOTAL_TD BIGINT NOT NULL ); \ No newline at end of file + TOTAL_TD BIGINT NOT NULL +); \ No newline at end of file diff --git a/samples/src/main/resources/business-schema-oracle10g.sql b/spring-batch-samples/src/main/resources/business-schema-oracle10g.sql similarity index 100% rename from samples/src/main/resources/business-schema-oracle10g.sql rename to spring-batch-samples/src/main/resources/business-schema-oracle10g.sql diff --git a/samples/src/main/resources/business-schema-postgresql.sql b/spring-batch-samples/src/main/resources/business-schema-postgresql.sql similarity index 100% rename from samples/src/main/resources/business-schema-postgresql.sql rename to spring-batch-samples/src/main/resources/business-schema-postgresql.sql diff --git a/samples/src/main/resources/data-source-context-init.xml b/spring-batch-samples/src/main/resources/data-source-context-init.xml similarity index 100% rename from samples/src/main/resources/data-source-context-init.xml rename to spring-batch-samples/src/main/resources/data-source-context-init.xml diff --git a/samples/src/main/resources/data-source-context.xml b/spring-batch-samples/src/main/resources/data-source-context.xml similarity index 100% rename from samples/src/main/resources/data-source-context.xml rename to spring-batch-samples/src/main/resources/data-source-context.xml diff --git a/samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt b/spring-batch-samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt similarity index 100% rename from samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt rename to spring-batch-samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportPersonDataStep.txt diff --git a/samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/beanWrapperMapperSampleJob/input/20070122.teststream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/footballjob/input/games.csv b/spring-batch-samples/src/main/resources/data/footballjob/input/games.csv similarity index 100% rename from samples/src/main/resources/data/footballjob/input/games.csv rename to spring-batch-samples/src/main/resources/data/footballjob/input/games.csv diff --git a/samples/src/main/resources/data/footballjob/input/player.csv b/spring-batch-samples/src/main/resources/data/footballjob/input/player.csv similarity index 100% rename from samples/src/main/resources/data/footballjob/input/player.csv rename to spring-batch-samples/src/main/resources/data/footballjob/input/player.csv diff --git a/samples/src/main/resources/data/multilineJob/input/20070122.teststream.multilineStep.txt b/spring-batch-samples/src/main/resources/data/multilineJob/input/20070122.teststream.multilineStep.txt similarity index 100% rename from samples/src/main/resources/data/multilineJob/input/20070122.teststream.multilineStep.txt rename to spring-batch-samples/src/main/resources/data/multilineJob/input/20070122.teststream.multilineStep.txt diff --git a/samples/src/main/resources/data/multilineJob/input/problematic.txt b/spring-batch-samples/src/main/resources/data/multilineJob/input/problematic.txt similarity index 100% rename from samples/src/main/resources/data/multilineJob/input/problematic.txt rename to spring-batch-samples/src/main/resources/data/multilineJob/input/problematic.txt diff --git a/samples/src/main/resources/data/multilineOrderJob/input/20070122.teststream.multilineOrderStep.txt b/spring-batch-samples/src/main/resources/data/multilineOrderJob/input/20070122.teststream.multilineOrderStep.txt similarity index 100% rename from samples/src/main/resources/data/multilineOrderJob/input/20070122.teststream.multilineOrderStep.txt rename to spring-batch-samples/src/main/resources/data/multilineOrderJob/input/20070122.teststream.multilineOrderStep.txt diff --git a/samples/src/main/resources/data/multilineOrderJob/order_sample.txt b/spring-batch-samples/src/main/resources/data/multilineOrderJob/order_sample.txt similarity index 100% rename from samples/src/main/resources/data/multilineOrderJob/order_sample.txt rename to spring-batch-samples/src/main/resources/data/multilineOrderJob/order_sample.txt diff --git a/samples/src/main/resources/data/restartSample/input/20070122.teststream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/restartSample/input/20070122.teststream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/restartSample/input/20070122.teststream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/restartSample/input/20070122.teststream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/simpleSkipSample/input/20070122.teststream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/simpleSkipSample/input/20070122.teststream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/simpleSkipSample/input/20070122.teststream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/simpleSkipSample/input/20070122.teststream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/simpleTaskletJob/input/20070122.teststream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/simpleTaskletJob/input/20070207.testStream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/simpleTaskletJob/input/20070207.testStream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/simpleTaskletJob/input/20070207.testStream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/simpleTaskletJob/input/20070207.testStream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml b/spring-batch-samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml similarity index 100% rename from samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml rename to spring-batch-samples/src/main/resources/data/staxJob/input/20070918.testStream.xmlFileStep.xml diff --git a/samples/src/main/resources/data/staxJob/input/trade.xsd b/spring-batch-samples/src/main/resources/data/staxJob/input/trade.xsd similarity index 100% rename from samples/src/main/resources/data/staxJob/input/trade.xsd rename to spring-batch-samples/src/main/resources/data/staxJob/input/trade.xsd diff --git a/samples/src/main/resources/data/staxJob/output/expected-output.xml b/spring-batch-samples/src/main/resources/data/staxJob/output/expected-output.xml similarity index 100% rename from samples/src/main/resources/data/staxJob/output/expected-output.xml rename to spring-batch-samples/src/main/resources/data/staxJob/output/expected-output.xml diff --git a/samples/src/main/resources/data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt b/spring-batch-samples/src/main/resources/data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt similarity index 100% rename from samples/src/main/resources/data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt rename to spring-batch-samples/src/main/resources/data/tradeJob/input/20070122.teststream.ImportTradeDataStep.txt diff --git a/samples/src/main/resources/data/tradeJob/input/TradeJob.csv b/spring-batch-samples/src/main/resources/data/tradeJob/input/TradeJob.csv similarity index 100% rename from samples/src/main/resources/data/tradeJob/input/TradeJob.csv rename to spring-batch-samples/src/main/resources/data/tradeJob/input/TradeJob.csv diff --git a/samples/src/main/resources/ibatis-config.xml b/spring-batch-samples/src/main/resources/ibatis-config.xml similarity index 100% rename from samples/src/main/resources/ibatis-config.xml rename to spring-batch-samples/src/main/resources/ibatis-config.xml diff --git a/samples/src/main/resources/ibatis-customer-credit.xml b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml similarity index 100% rename from samples/src/main/resources/ibatis-customer-credit.xml rename to spring-batch-samples/src/main/resources/ibatis-customer-credit.xml diff --git a/samples/src/main/resources/jobs/adhocLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml similarity index 100% rename from samples/src/main/resources/jobs/adhocLoopJob.xml rename to spring-batch-samples/src/main/resources/jobs/adhocLoopJob.xml diff --git a/samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml similarity index 100% rename from samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml rename to spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml diff --git a/samples/src/main/resources/jobs/compositeProcessorSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml similarity index 100% rename from samples/src/main/resources/jobs/compositeProcessorSampleJob.xml rename to spring-batch-samples/src/main/resources/jobs/compositeProcessorSampleJob.xml diff --git a/samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml similarity index 100% rename from samples/src/main/resources/jobs/delegatingJob.xml rename to spring-batch-samples/src/main/resources/jobs/delegatingJob.xml diff --git a/samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml similarity index 100% rename from samples/src/main/resources/jobs/fixedLengthImportJob.xml rename to spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml diff --git a/samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml similarity index 100% rename from samples/src/main/resources/jobs/footballJob.xml rename to spring-batch-samples/src/main/resources/jobs/footballJob.xml diff --git a/samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml similarity index 100% rename from samples/src/main/resources/jobs/hibernateJob.xml rename to spring-batch-samples/src/main/resources/jobs/hibernateJob.xml diff --git a/samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml similarity index 100% rename from samples/src/main/resources/jobs/ibatisJob.xml rename to spring-batch-samples/src/main/resources/jobs/ibatisJob.xml diff --git a/samples/src/main/resources/jobs/infiniteLoopJob.xml b/spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml similarity index 100% rename from samples/src/main/resources/jobs/infiniteLoopJob.xml rename to spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml diff --git a/samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml similarity index 100% rename from samples/src/main/resources/jobs/multilineJob.xml rename to spring-batch-samples/src/main/resources/jobs/multilineJob.xml diff --git a/samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml similarity index 100% rename from samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml rename to spring-batch-samples/src/main/resources/jobs/multilineOrderInputDescriptors.xml diff --git a/samples/src/main/resources/jobs/multilineOrderIo.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml similarity index 100% rename from samples/src/main/resources/jobs/multilineOrderIo.xml rename to spring-batch-samples/src/main/resources/jobs/multilineOrderIo.xml diff --git a/samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml similarity index 100% rename from samples/src/main/resources/jobs/multilineOrderJob.xml rename to spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml diff --git a/samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml similarity index 100% rename from samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml rename to spring-batch-samples/src/main/resources/jobs/multilineOrderOutputDescriptors.xml diff --git a/samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml similarity index 100% rename from samples/src/main/resources/jobs/restartSample.xml rename to spring-batch-samples/src/main/resources/jobs/restartSample.xml diff --git a/samples/src/main/resources/jobs/rollbackJob.xml b/spring-batch-samples/src/main/resources/jobs/rollbackJob.xml similarity index 100% rename from samples/src/main/resources/jobs/rollbackJob.xml rename to spring-batch-samples/src/main/resources/jobs/rollbackJob.xml diff --git a/samples/src/main/resources/jobs/simpleTaskletJob.xml b/spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml similarity index 100% rename from samples/src/main/resources/jobs/simpleTaskletJob.xml rename to spring-batch-samples/src/main/resources/jobs/simpleTaskletJob.xml diff --git a/samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml similarity index 100% rename from samples/src/main/resources/jobs/tradeJob.xml rename to spring-batch-samples/src/main/resources/jobs/tradeJob.xml diff --git a/samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml similarity index 100% rename from samples/src/main/resources/jobs/tradeJobIo.xml rename to spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml diff --git a/samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml similarity index 100% rename from samples/src/main/resources/jobs/xmlStaxJob.xml rename to spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml diff --git a/samples/src/main/resources/log4j.properties b/spring-batch-samples/src/main/resources/log4j.properties similarity index 100% rename from samples/src/main/resources/log4j.properties rename to spring-batch-samples/src/main/resources/log4j.properties diff --git a/samples/src/main/resources/simple-container-definition.xml b/spring-batch-samples/src/main/resources/simple-container-definition.xml similarity index 89% rename from samples/src/main/resources/simple-container-definition.xml rename to spring-batch-samples/src/main/resources/simple-container-definition.xml index 50e67c826..0ea28fdc0 100644 --- a/samples/src/main/resources/simple-container-definition.xml +++ b/spring-batch-samples/src/main/resources/simple-container-definition.xml @@ -10,7 +10,6 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd"> - - - - - - - - - - + + + + diff --git a/samples/src/main/resources/xstream-config.xml b/spring-batch-samples/src/main/resources/xstream-config.xml similarity index 100% rename from samples/src/main/resources/xstream-config.xml rename to spring-batch-samples/src/main/resources/xstream-config.xml diff --git a/samples/src/main/sql/business-schema.sql.vpp b/spring-batch-samples/src/main/sql/business-schema.sql.vpp similarity index 100% rename from samples/src/main/sql/business-schema.sql.vpp rename to spring-batch-samples/src/main/sql/business-schema.sql.vpp diff --git a/samples/src/main/sql/db2.properties b/spring-batch-samples/src/main/sql/db2.properties similarity index 100% rename from samples/src/main/sql/db2.properties rename to spring-batch-samples/src/main/sql/db2.properties diff --git a/samples/src/main/sql/db2.vpp b/spring-batch-samples/src/main/sql/db2.vpp similarity index 100% rename from samples/src/main/sql/db2.vpp rename to spring-batch-samples/src/main/sql/db2.vpp diff --git a/samples/src/main/sql/derby.properties b/spring-batch-samples/src/main/sql/derby.properties similarity index 100% rename from samples/src/main/sql/derby.properties rename to spring-batch-samples/src/main/sql/derby.properties diff --git a/samples/src/main/sql/derby.vpp b/spring-batch-samples/src/main/sql/derby.vpp similarity index 100% rename from samples/src/main/sql/derby.vpp rename to spring-batch-samples/src/main/sql/derby.vpp diff --git a/samples/src/main/sql/destroy.sql.vpp b/spring-batch-samples/src/main/sql/destroy.sql.vpp similarity index 100% rename from samples/src/main/sql/destroy.sql.vpp rename to spring-batch-samples/src/main/sql/destroy.sql.vpp diff --git a/samples/src/main/sql/hsqldb.properties b/spring-batch-samples/src/main/sql/hsqldb.properties similarity index 100% rename from samples/src/main/sql/hsqldb.properties rename to spring-batch-samples/src/main/sql/hsqldb.properties diff --git a/samples/src/main/sql/hsqldb.vpp b/spring-batch-samples/src/main/sql/hsqldb.vpp similarity index 100% rename from samples/src/main/sql/hsqldb.vpp rename to spring-batch-samples/src/main/sql/hsqldb.vpp diff --git a/samples/src/main/sql/init.sql.vpp b/spring-batch-samples/src/main/sql/init.sql.vpp similarity index 96% rename from samples/src/main/sql/init.sql.vpp rename to spring-batch-samples/src/main/sql/init.sql.vpp index e49020041..9a177f317 100644 --- a/samples/src/main/sql/init.sql.vpp +++ b/spring-batch-samples/src/main/sql/init.sql.vpp @@ -24,14 +24,14 @@ INSERT INTO customer (id, version, name, credit) VALUES (2, 0, 'customer2', 1000 INSERT INTO customer (id, version, name, credit) VALUES (3, 0, 'customer3', 100000); INSERT INTO customer (id, version, name, credit) VALUES (4, 0, 'customer4', 100000); - CREATE TABLE PLAYERS ( PLAYER_ID char(8) NOT NULL PRIMARY KEY, LAST_NAME varchar(35) not null, FIRST_NAME varchar(25) not null, POS varchar(10), YEAR_OF_BIRTH ${BIGINT} not null, - YEAR_DRAFTED ${BIGINT} not null); + YEAR_DRAFTED ${BIGINT} not null +); CREATE TABLE GAMES ( PLAYER_ID char(8) not null PRIMARY KEY, @@ -63,4 +63,5 @@ CREATE TABLE PLAYER_SUMMARY ( RUSH_YARDS ${BIGINT} NOT NULL , RECEPTIONS ${BIGINT} NOT NULL , RECEPTIONS_YARDS ${BIGINT} NOT NULL , - TOTAL_TD ${BIGINT} NOT NULL ); \ No newline at end of file + TOTAL_TD ${BIGINT} NOT NULL +); \ No newline at end of file diff --git a/samples/src/main/sql/oracle10g.properties b/spring-batch-samples/src/main/sql/oracle10g.properties similarity index 100% rename from samples/src/main/sql/oracle10g.properties rename to spring-batch-samples/src/main/sql/oracle10g.properties diff --git a/samples/src/main/sql/oracle10g.vpp b/spring-batch-samples/src/main/sql/oracle10g.vpp similarity index 100% rename from samples/src/main/sql/oracle10g.vpp rename to spring-batch-samples/src/main/sql/oracle10g.vpp diff --git a/samples/src/main/sql/postgresql.properties b/spring-batch-samples/src/main/sql/postgresql.properties similarity index 100% rename from samples/src/main/sql/postgresql.properties rename to spring-batch-samples/src/main/sql/postgresql.properties diff --git a/samples/src/main/sql/postgresql.vpp b/spring-batch-samples/src/main/sql/postgresql.vpp similarity index 100% rename from samples/src/main/sql/postgresql.vpp rename to spring-batch-samples/src/main/sql/postgresql.vpp diff --git a/samples/src/site/apt/changelog.apt b/spring-batch-samples/src/site/apt/changelog.apt similarity index 100% rename from samples/src/site/apt/changelog.apt rename to spring-batch-samples/src/site/apt/changelog.apt diff --git a/samples/src/site/site.xml b/spring-batch-samples/src/site/site.xml similarity index 100% rename from samples/src/site/site.xml rename to spring-batch-samples/src/site/site.xml diff --git a/samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractBatchLauncherTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractValidatingBatchLauncherTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/BeanWrapperMapperSampleJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeProcessorSampleFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/FootballJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTest.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTest.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTest.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTest.java diff --git a/samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/IbatisJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/LineAggregatorStub.java diff --git a/samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/MultilineOrderJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/RollbackJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/SimpleTaskletJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskExecutorLauncher.java diff --git a/samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/XmlStaxJobFunctionalTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditWriterTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitWriterTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderConverterTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlGameDaoIntegrationTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerDaoIntegrationTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/SqlPlayerSummaryDaoIntegrationTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditIncreaseProcessorTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessorTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerCreditUpdateProcessorTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessorTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/CustomerUpdateProcessorTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/DefaultFlatFileProcessorTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/processor/OrderProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/OrderProcessorTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/processor/OrderProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/OrderProcessorTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/processor/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/TradeProcessorTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/processor/TradeProcessorTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/processor/TradeProcessorTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemProviderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemProviderTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemProviderTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/item/provider/OrderItemProviderTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AbstractRowMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionRestartableTaskletTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/SimpleTradeTaskletTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/FutureDateFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/TotalOrderItemsFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateDiscountsFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateHandlingPricesFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateIdsFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidatePricesFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateQuantitiesFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateShippingPricesFunctionTests.java diff --git a/samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java similarity index 100% rename from samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/validation/valang/custom/ValidateTotalPricesFunctionTests.java diff --git a/samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java similarity index 99% rename from samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java rename to spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java index ff6b0bc9a..7feb22f8e 100644 --- a/samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java +++ b/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java @@ -112,7 +112,7 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean { for (int i = 0; i < scripts.length; i++) { String script = scripts[i].trim(); if (StringUtils.hasText(script)) { - jdbcTemplate.execute(scripts[i]); + jdbcTemplate.execute(script); } } return null; diff --git a/samples/src/test/resources/clover.license b/spring-batch-samples/src/test/resources/clover.license similarity index 100% rename from samples/src/test/resources/clover.license rename to spring-batch-samples/src/test/resources/clover.license diff --git a/samples/src/test/resources/log4j.properties b/spring-batch-samples/src/test/resources/log4j.properties similarity index 100% rename from samples/src/test/resources/log4j.properties rename to spring-batch-samples/src/test/resources/log4j.properties diff --git a/src/site/apt/getting-started.apt b/src/site/apt/getting-started.apt index 4e9df6590..851191e36 100644 --- a/src/site/apt/getting-started.apt +++ b/src/site/apt/getting-started.apt @@ -39,7 +39,7 @@ Spring Batch Getting Started * Import the samples project from the samples directory. - * Add all the jar files in the distribution as library dependencies (except spring-batch-samples-.jar). There are jars in samples/lib and in sources/lib including some duplicates. + * Add all the jar files in the distribution as library dependencies (except <<.jar>>>). There are jars in <<>> and in <<>>, including some duplicates. * Add the additional jars as a library dependencies @@ -47,9 +47,9 @@ Spring Batch Getting Started * Run the unit tests in your project under src/test/java. N.B. the FootbalJobFunctionTests takes quite a long time to run. - You can get a pretty good idea about how to set up a job by examining the unit tests in the org.springframework.batch.sample package (src/main/java) and the configuration in src/main/resources/jobs. + You can get a pretty good idea about how to set up a job by examining the unit tests in the <<>> package (in <<>>) and the configuration in <<>>. - To launch a job from the command line instead of a unit test use the BatchCommandLineLauncher.main method (see Javadocs included in that class). + To launch a job from the command line instead of a unit test use the <<>> method (see Javadocs included in that class). ** With Maven on the Command Line