Rename samples base package to org.springframework.batch.samples

spring-batch-samples/src/main/java/org/springframework/batch/samples/adapter/tasklet/Task.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.adapter.tasklet;
+package org.springframework.batch.samples.adapter.tasklet;
 
 import org.springframework.batch.core.scope.context.ChunkContext;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpJobConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.amqp;
+package org.springframework.batch.samples.amqp;
 
 import javax.sql.DataSource;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/AmqpMessageProducer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.amqp;
+package org.springframework.batch.samples.amqp;
 
 import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -35,7 +35,7 @@ public final class AmqpMessageProducer {
 	private static final int SEND_MESSAGE_COUNT = 10;
 
 	private static final String[] BEAN_CONFIG = {
-			"classpath:org/springframework/batch/sample/amqp/job/rabbitmq-beans.xml" };
+			"classpath:org/springframework/batch/samples/amqp/job/rabbitmq-beans.xml" };
 
 	public static void main(String[] args) {
 		ApplicationContext applicationContext = new ClassPathXmlApplicationContext(BEAN_CONFIG);

spring-batch-samples/src/main/java/org/springframework/batch/samples/amqp/MessageProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.amqp;
+package org.springframework.batch.samples.amqp;
 
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.lang.Nullable;

spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/DataSourceConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.chunking;
+package org.springframework.batch.samples.chunking;
 
 import javax.sql.DataSource;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/ManagerConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.chunking;
+package org.springframework.batch.samples.chunking;
 
 import java.util.Arrays;
 
@@ -51,7 +51,7 @@ import org.springframework.integration.jms.dsl.Jms;
 @EnableBatchProcessing
 @EnableBatchIntegration
 @EnableIntegration
-@PropertySource("classpath:org/springframework/batch/sample/chunking/remote-chunking.properties")
+@PropertySource("classpath:org/springframework/batch/samples/chunking/remote-chunking.properties")
 @Import(DataSourceConfiguration.class)
 public class ManagerConfiguration {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/chunking/WorkerConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.chunking;
+package org.springframework.batch.samples.chunking;
 
 import jakarta.jms.JMSException;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
@@ -50,7 +50,7 @@ import org.springframework.integration.jms.dsl.Jms;
 @EnableBatchProcessing
 @EnableBatchIntegration
 @EnableIntegration
-@PropertySource("classpath:org/springframework/batch/sample/chunking/remote-chunking.properties")
+@PropertySource("classpath:org/springframework/batch/samples/chunking/remote-chunking.properties")
 @Import(DataSourceConfiguration.class)
 public class WorkerConfiguration {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ColumnRangePartitioner.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import java.util.HashMap;
 import java.util.Map;

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ErrorLogTasklet.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import javax.sql.DataSource;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/LogAdvice.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.batch.core.StepExecution;

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/OutputFileNameListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 public class OutputFileNameListener {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/ProcessIndicatorItemWrapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 /**
  * Item wrapper useful in "process indicator" usecase, where input is marked as processed

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingDecider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/SkipCheckingListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -23,7 +23,7 @@ import org.springframework.batch.core.annotation.AfterStep;
 import org.springframework.batch.core.annotation.BeforeStep;
 import org.springframework.batch.core.annotation.OnSkipInProcess;
 import org.springframework.batch.core.annotation.OnSkipInWrite;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import javax.sql.DataSource;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemProcessor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import javax.sql.DataSource;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StagingItemWriter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

spring-batch-samples/src/main/java/org/springframework/batch/samples/common/StepExecutionApplicationEventAdvice.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.common;
+package org.springframework.batch.samples.common;
 
 import org.aspectj.lang.JoinPoint;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.sample.misc.jmx.SimpleMessageApplicationEvent;
+import org.springframework.batch.samples.misc.jmx.SimpleMessageApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/config/DataSourceConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.config;
+package org.springframework.batch.samples.config;
 
 import jakarta.annotation.PostConstruct;
 import javax.sql.DataSource;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Child.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.person;
+package org.springframework.batch.samples.domain.person;
 
 public class Child {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/Person.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.person;
+package org.springframework.batch.samples.domain.person;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.sample.file.patternmatching.Address;
+import org.springframework.batch.samples.file.patternmatching.Address;
 
 public class Person {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/PersonService.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.person;
+package org.springframework.batch.samples.domain.person;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.sample.file.patternmatching.Address;
+import org.springframework.batch.samples.file.patternmatching.Address;
 
 /**
  * Custom class that contains logic that would normally be be contained in

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/person/internal/PersonWriter.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.person.internal;
+package org.springframework.batch.samples.domain.person.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.person.Person;
+import org.springframework.batch.samples.domain.person.Person;
 
 public class PersonWriter implements ItemWriter<Person> {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CompositeCustomerUpdateLineTokenizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.StepExecutionListener;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCredit.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerCreditDao.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 /**
  * Interface for writing customer's credit information to output.

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDao.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebit.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerDebitDao.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 /**
  * Interface for writing {@link CustomerDebitDao} object to arbitrary output.

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerOperation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.util.HashMap;
 import java.util.Map;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateProcessor.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
-import static org.springframework.batch.sample.domain.trade.CustomerOperation.*;
+import static org.springframework.batch.samples.domain.trade.CustomerOperation.*;
 
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.lang.Nullable;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/CustomerUpdateWriter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/InvalidCustomerLogger.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 /**
  * Interface for logging invalid customers. Customers may need to be logged because they

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/Trade.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/TradeDao.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade;
+package org.springframework.batch.samples.domain.trade;
 
 /**
  * Interface for writing a Trade object to an arbitrary output.

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CommonsLoggingInvalidCustomerLogger.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.launch.support.CommandLineJobRunner;
-import org.springframework.batch.sample.domain.trade.CustomerUpdate;
-import org.springframework.batch.sample.domain.trade.InvalidCustomerLogger;
+import org.springframework.batch.samples.domain.trade.CustomerUpdate;
+import org.springframework.batch.samples.domain.trade.InvalidCustomerLogger;
 
 /**
  * @author Lucas Ward
@@ -33,7 +33,7 @@ public class CommonsLoggingInvalidCustomerLogger implements InvalidCustomerLogge
 	/*
 	 * (non-Javadoc)
 	 *
-	 * @see org.springframework.batch.sample.domain.trade.InvalidCustomerLogger#log(org.
+	 * @see org.springframework.batch.samples.domain.trade.InvalidCustomerLogger#log(org.
 	 * springframework.batch.sample.domain.trade.CustomerUpdate)
 	 */
 	@Override

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditFieldSetMapper.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.FieldSet;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditIncreaseProcessor.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.ItemProcessor;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditItemWriter.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCreditDao;
 
 /**
  * Delegates actual writing to a custom DAO.

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditRowMapper.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerCreditRowMapper implements RowMapper<CustomerCredit> {

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdatePreparedStatementSetter.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import org.springframework.batch.item.database.ItemPreparedStatementSetter;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
 
 /**
  * @author Dave Syer

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerCreditUpdateWriter.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCreditDao;
 
 public class CustomerCreditUpdateWriter implements ItemWriter<CustomerCredit> {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerDebitRowMapper.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.samples.domain.trade.CustomerDebit;
 import org.springframework.jdbc.core.RowMapper;
 
 public class CustomerDebitRowMapper implements RowMapper<CustomerDebit> {

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/CustomerUpdateWriter.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.trade.CustomerDebit;
-import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.CustomerDebit;
+import org.springframework.batch.samples.domain.trade.CustomerDebitDao;
+import org.springframework.batch.samples.domain.trade.Trade;
 
 /**
  * Transforms Trade to a CustomerDebit and asks DAO delegate to write the result.

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/FlatFileCustomerCreditDao.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCreditDao;
 import org.springframework.beans.factory.DisposableBean;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/GeneratingTradeItemReader.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.ItemReader;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateAwareCustomerCreditItemWriter.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.hibernate.SessionFactory;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCreditDao;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.Assert;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/HibernateCreditDao.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,8 +22,8 @@ import org.hibernate.SessionFactory;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatListener;
 import org.springframework.batch.repeat.RepeatStatus;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerCreditDao;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerCreditDao;
 
 /**
  * @author Lucas Ward
@@ -55,8 +55,8 @@ public class HibernateCreditDao implements CustomerCreditDao, RepeatListener {
 	 * (non-Javadoc)
 	 *
 	 * @see
-	 * org.springframework.batch.sample.domain.trade.internal.CustomerCreditWriter#write(
-	 * org.springframework.batch.sample.domain.CustomerCredit)
+	 * org.springframework.batch.samples.domain.trade.internal.CustomerCreditWriter#write(
+	 * org.springframework.batch.samples.domain.CustomerCredit)
 	 */
 	@Override
 	public void writeCredit(CustomerCredit customerCredit) {

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/ItemTrackingTradeItemWriter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,7 +23,7 @@ import javax.sql.DataSource;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDao.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.CustomerDao;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.CustomerDao;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcCustomerDebitDao.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.domain.trade.CustomerDebit;
-import org.springframework.batch.sample.domain.trade.CustomerDebitDao;
+import org.springframework.batch.samples.domain.trade.CustomerDebit;
+import org.springframework.batch.samples.domain.trade.CustomerDebitDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/JdbcTradeDao.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.sample.domain.trade.Trade;
-import org.springframework.batch.sample.domain.trade.TradeDao;
+import org.springframework.batch.samples.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.TradeDao;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeFieldSetMapper.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.FieldSet;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 
 public class TradeFieldSetMapper implements FieldSetMapper<Trade> {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeProcessor.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.validator.ValidationException;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeRowMapper.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 import org.springframework.jdbc.core.RowMapper;
 
 public class TradeRowMapper implements RowMapper<Trade> {

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/TradeWriter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.domain.trade.internal;
+package org.springframework.batch.samples.domain.trade.internal;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -28,8 +28,8 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStreamSupport;
 import org.springframework.batch.item.ItemWriter;
 import org.springframework.batch.item.WriteFailedException;
-import org.springframework.batch.sample.domain.trade.Trade;
-import org.springframework.batch.sample.domain.trade.TradeDao;
+import org.springframework.batch.samples.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.TradeDao;
 import org.springframework.util.Assert;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/samples/domain/trade/internal/validator/TradeValidator.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.domain.trade.internal.validator;
+package org.springframework.batch.samples.domain.trade.internal.validator;
 
 import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 
 /**
  * @author Michael Minella

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/delimited/DelimitedJobConfiguration.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.file.delimited;
+package org.springframework.batch.samples.file.delimited;
 
 import javax.sql.DataSource;
 
@@ -14,8 +14,8 @@ import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.FlatFileItemWriter;
 import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
 import org.springframework.batch.item.file.builder.FlatFileItemWriterBuilder;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/FixedLengthJobConfiguration.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.file.fixed;
+package org.springframework.batch.samples.file.fixed;
 
 import javax.sql.DataSource;
 
@@ -15,8 +15,8 @@ import org.springframework.batch.item.file.FlatFileItemWriter;
 import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
 import org.springframework.batch.item.file.builder.FlatFileItemWriterBuilder;
 import org.springframework.batch.item.file.transform.Range;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/fixed/README.md

@@ -7,7 +7,7 @@ from a fixed length file, processing it and writing it to another file.
 
 In this example we are using a simple fixed length record structure
 that can be found in the project at
-`src/main/resources/org/springframework/batch/sample/file/fixed/data`.
+`src/main/resources/org/springframework/batch/samples/file/fixed/data`.
 The fixed length records look like this:
 
 ```

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/json/JsonJobConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.json;
+package org.springframework.batch.samples.file.json;
 
 import javax.sql.DataSource;
 
@@ -30,7 +30,7 @@ import org.springframework.batch.item.json.JsonFileItemWriter;
 import org.springframework.batch.item.json.JsonItemReader;
 import org.springframework.batch.item.json.builder.JsonFileItemWriterBuilder;
 import org.springframework.batch.item.json.builder.JsonItemReaderBuilder;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.Trade;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineJobConfiguration.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.file.multiline;
+package org.springframework.batch.samples.file.multiline;
 
 import javax.sql.DataSource;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.multiline;
+package org.springframework.batch.samples.file.multiline;
 
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemReader;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/MultiLineTradeItemWriter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.multiline;
+package org.springframework.batch.samples.file.multiline;
 
 import org.springframework.batch.item.Chunk;
 import org.springframework.batch.item.ExecutionContext;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiline/Trade.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.multiline;
+package org.springframework.batch.samples.file.multiline;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItem.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.multilineaggregate;
+package org.springframework.batch.samples.file.multilineaggregate;
 
 /**
  * A wrapper type for an item that is used by {@link AggregateItemReader} to identify the

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemFieldSetMapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.multilineaggregate;
+package org.springframework.batch.samples.file.multilineaggregate;
 
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.FieldSet;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multilineaggregate/AggregateItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.multilineaggregate;
+package org.springframework.batch.samples.file.multilineaggregate;
 
 import java.util.ArrayList;
 import java.util.List;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/DelegatingTradeLineAggregator.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.multirecordtype;
+package org.springframework.batch.samples.file.multirecordtype;
 
 import org.springframework.batch.item.file.transform.LineAggregator;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.Trade;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multirecordtype/MultiRecordTypeJobConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.multirecordtype;
+package org.springframework.batch.samples.file.multirecordtype;
 
 import java.util.Map;
 
@@ -34,10 +34,10 @@ import org.springframework.batch.item.file.transform.BeanWrapperFieldExtractor;
 import org.springframework.batch.item.file.transform.FixedLengthTokenizer;
 import org.springframework.batch.item.file.transform.FormatterLineAggregator;
 import org.springframework.batch.item.file.transform.Range;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.Trade;
-import org.springframework.batch.sample.domain.trade.internal.CustomerCreditFieldSetMapper;
-import org.springframework.batch.sample.domain.trade.internal.TradeFieldSetMapper;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.Trade;
+import org.springframework.batch.samples.domain.trade.internal.CustomerCreditFieldSetMapper;
+import org.springframework.batch.samples.domain.trade.internal.TradeFieldSetMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/multiresource/MultiResourceJobConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.multiresource;
+package org.springframework.batch.samples.file.multiresource;
 
 import javax.sql.DataSource;
 
@@ -33,8 +33,8 @@ import org.springframework.batch.item.file.builder.FlatFileItemReaderBuilder;
 import org.springframework.batch.item.file.builder.FlatFileItemWriterBuilder;
 import org.springframework.batch.item.file.builder.MultiResourceItemReaderBuilder;
 import org.springframework.batch.item.file.builder.MultiResourceItemWriterBuilder;
-import org.springframework.batch.sample.domain.trade.CustomerCredit;
-import org.springframework.batch.sample.domain.trade.internal.CustomerCreditIncreaseProcessor;
+import org.springframework.batch.samples.domain.trade.CustomerCredit;
+import org.springframework.batch.samples.domain.trade.internal.CustomerCreditIncreaseProcessor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Address.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching;
+package org.springframework.batch.samples.file.patternmatching;
 
 public class Address {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/BillingInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching;
+package org.springframework.batch.samples.file.patternmatching;
 
 public class BillingInfo {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Customer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching;
+package org.springframework.batch.samples.file.patternmatching;
 
 public class Customer {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/LineItem.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching;
+package org.springframework.batch.samples.file.patternmatching;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/Order.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching;
+package org.springframework.batch.samples.file.patternmatching;
 
 import java.math.BigDecimal;
 import java.util.Date;

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/ShippingInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching;
+package org.springframework.batch.samples.file.patternmatching;
 
 public class ShippingInfo {
 

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching.internal;
+package org.springframework.batch.samples.file.patternmatching.internal;
 
 import java.util.ArrayList;
 
@@ -23,12 +23,12 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.FieldSet;
-import org.springframework.batch.sample.file.patternmatching.Address;
-import org.springframework.batch.sample.file.patternmatching.BillingInfo;
-import org.springframework.batch.sample.file.patternmatching.Customer;
-import org.springframework.batch.sample.file.patternmatching.LineItem;
-import org.springframework.batch.sample.file.patternmatching.Order;
-import org.springframework.batch.sample.file.patternmatching.ShippingInfo;
+import org.springframework.batch.samples.file.patternmatching.Address;
+import org.springframework.batch.samples.file.patternmatching.BillingInfo;
+import org.springframework.batch.samples.file.patternmatching.Customer;
+import org.springframework.batch.samples.file.patternmatching.LineItem;
+import org.springframework.batch.samples.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.ShippingInfo;
 import org.springframework.lang.Nullable;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.file.patternmatching.internal;
+package org.springframework.batch.samples.file.patternmatching.internal;
 
 import java.util.Map;
 
 import org.springframework.batch.item.file.transform.LineAggregator;
-import org.springframework.batch.sample.file.patternmatching.LineItem;
-import org.springframework.batch.sample.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.LineItem;
+import org.springframework.batch.samples.file.patternmatching.Order;
 
 /**
  * Converts <code>Order</code> object to a list of strings.

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/AddressFieldExtractor.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.patternmatching.internal.extractor;
+package org.springframework.batch.samples.file.patternmatching.internal.extractor;
 
 import org.springframework.batch.item.file.transform.FieldExtractor;
-import org.springframework.batch.sample.file.patternmatching.Address;
-import org.springframework.batch.sample.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.Address;
+import org.springframework.batch.samples.file.patternmatching.Order;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/BillingInfoFieldExtractor.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.patternmatching.internal.extractor;
+package org.springframework.batch.samples.file.patternmatching.internal.extractor;
 
 import org.springframework.batch.item.file.transform.FieldExtractor;
-import org.springframework.batch.sample.file.patternmatching.BillingInfo;
-import org.springframework.batch.sample.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.BillingInfo;
+import org.springframework.batch.samples.file.patternmatching.Order;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/CustomerFieldExtractor.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.patternmatching.internal.extractor;
+package org.springframework.batch.samples.file.patternmatching.internal.extractor;
 
 import org.springframework.batch.item.file.transform.FieldExtractor;
-import org.springframework.batch.sample.file.patternmatching.Customer;
-import org.springframework.batch.sample.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.Customer;
+import org.springframework.batch.samples.file.patternmatching.Order;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/FooterFieldExtractor.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.patternmatching.internal.extractor;
+package org.springframework.batch.samples.file.patternmatching.internal.extractor;
 
 import org.springframework.batch.item.file.transform.FieldExtractor;
-import org.springframework.batch.sample.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.Order;
 
 /**
  * @author Dan Garrette

spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/extractor/HeaderFieldExtractor.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.file.patternmatching.internal.extractor;
+package org.springframework.batch.samples.file.patternmatching.internal.extractor;
 
 import java.text.SimpleDateFormat;
 
 import org.springframework.batch.item.file.transform.FieldExtractor;
-import org.springframework.batch.sample.file.patternmatching.Order;
+import org.springframework.batch.samples.file.patternmatching.Order;
 
 /**
  * @author Dan Garrette