IN PROGRESS - BATCH-693: Refactor samples along domain contours

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/FootballExceptionHandler.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/Game.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import java.io.Serializable;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/GameFieldSetMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcGameDao.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerDao.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDao.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.springframework.batch.item.ClearFailedException;
 import org.springframework.batch.item.FlushFailedException;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/Player.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import java.io.Serializable;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerDao.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerFieldSetMapper.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerItemWriter.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummary.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryMapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryRowMapper.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.football;
+package org.springframework.batch.sample.domain.football;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Address.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Customer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/LineItem.java

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

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Order.java

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

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderDao.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemReader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import java.util.ArrayList;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderTransformer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order;
+package org.springframework.batch.sample.domain.order;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunction.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.util.Date;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunction.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunction.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunction.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.valang;
+package org.springframework.batch.sample.domain.order.valang;
 
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.springframework.batch.sample.order.LineItem;
+import org.springframework.batch.sample.domain.order.LineItem;
 import org.springmodules.validation.valang.functions.AbstractFunction;
 import org.springmodules.validation.valang.functions.Function;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Customer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.xml;
+package org.springframework.batch.sample.domain.order.xml;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/LineItem.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.xml;
+package org.springframework.batch.sample.domain.order.xml;
 
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Order.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.xml;
+package org.springframework.batch.sample.domain.order.xml;
 
 import java.util.Date;
 import java.util.List;

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Shipper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.order.xml;
+package org.springframework.batch.sample.domain.order.xml;
 
 
 /**

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.person;
+package org.springframework.batch.sample.domain.person;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.person;
+package org.springframework.batch.sample.domain.person;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,7 +22,7 @@ import java.util.List;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.springframework.batch.sample.order.Address;
+import org.springframework.batch.sample.domain.order.Address;
 
 public class Person {
 

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.math.BigDecimal;
 

spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/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.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import org.springframework.orm.ibatis.support.SqlMapClientDaoSupport;
 

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

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

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

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

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

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import org.springframework.batch.item.file.mapping.FieldSet;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.trade;
+package org.springframework.batch.sample.domain.trade;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

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

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

spring-batch-samples/src/main/java/org/springframework/batch/sample/support/RetrySampleItemWriter.java

@@ -1,4 +1,4 @@
-package org.springframework.batch.sample.retry;
+package org.springframework.batch.sample.support;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
 

spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml

@@ -4,7 +4,7 @@
         "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping>
-	<class name="org.springframework.batch.sample.trade.CustomerCredit"
+	<class name="org.springframework.batch.sample.domain.trade.CustomerCredit"
 		table="CUSTOMER">
 		<id name="id">
 			<!-- To make the job fail on flush we need assigned IDs -->

spring-batch-samples/src/main/resources/ibatis-customer-credit.xml

@@ -4,7 +4,7 @@
 
 <sqlMap namespace="Customer">
 
-  <resultMap id="result" class="org.springframework.batch.sample.trade.CustomerCredit">
+  <resultMap id="result" class="org.springframework.batch.sample.domain.trade.CustomerCredit">
     <result property="name" column="NAME" />
     <result property="credit" column="CREDIT" />
   </resultMap>
@@ -17,7 +17,7 @@
   	select NAME, CREDIT from CUSTOMER where ID = #value#
   </select>
   
-  <update id="updateCredit" parameterClass="org.springframework.batch.sample.trade.CustomerCredit" >
+  <update id="updateCredit" parameterClass="org.springframework.batch.sample.domain.trade.CustomerCredit" >
   	update CUSTOMER set CREDIT = #credit# where NAME = #name#
   </update>
 

spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml

@@ -28,7 +28,7 @@
 			<value><![CDATA[UPDATE CUSTOMER SET CREDIT=? WHERE ID=?]]></value>
 		</property>
 		<property name="itemPreparedStatementSetter">
-			<bean class="org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter" />
+			<bean class="org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter" />
 		</property>
 	</bean>
 
@@ -36,7 +36,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="sql" value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
-			<bean class="org.springframework.batch.sample.trade.CustomerCreditRowMapper" />
+			<bean class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" />
 		</property>
 	</bean>
 

spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml

@@ -25,7 +25,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.trade.TradeWriter">
+							class="org.springframework.batch.sample.domain.trade.TradeWriter">
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
@@ -35,7 +35,7 @@
 						ref="personFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.person.PersonWriter" />
+							class="org.springframework.batch.sample.domain.person.PersonWriter" />
 					</property>
 				</bean>
 
@@ -91,7 +91,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -111,11 +111,11 @@
 	</bean>
 
 	<bean id="trade"
-		class="org.springframework.batch.sample.trade.Trade"
+		class="org.springframework.batch.sample.domain.trade.Trade"
 		scope="prototype" />
 
 	<bean id="person"
-		class="org.springframework.batch.sample.person.Person"
+		class="org.springframework.batch.sample.domain.person.Person"
 		scope="prototype" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml

@@ -38,7 +38,7 @@
 		<property name="delegates">
 			<list>
 				<bean
-					class="org.springframework.batch.sample.trade.TradeWriter">
+					class="org.springframework.batch.sample.domain.trade.TradeWriter">
 					<property name="dao" ref="tradeDao" />
 				</bean>
 				<ref bean="fileItemWriter" />
@@ -77,7 +77,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -98,6 +98,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/delegatingJob.xml

@@ -47,6 +47,6 @@
 	</bean>
 
 	<bean id="delegateObject"
-		class="org.springframework.batch.sample.person.PersonService" />
+		class="org.springframework.batch.sample.domain.person.PersonService" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml

@@ -18,7 +18,7 @@
 					</bean>
 				</property>
 				<property name="itemWriter">
-					<bean class="org.springframework.batch.sample.trade.TradeWriter">
+					<bean class="org.springframework.batch.sample.domain.trade.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -57,7 +57,7 @@
 		</property>
 	</bean>
 
-	<bean id="tradeDao" class="org.springframework.batch.sample.trade.JdbcTradeDao">
+	<bean id="tradeDao" class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -67,6 +67,6 @@
 		</property>
 	</bean>
 
-	<bean id="fieldSetMapper" class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+	<bean id="fieldSetMapper" class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/footballJob.xml

@@ -19,10 +19,10 @@
 						ref="playerFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.football.PlayerItemWriter">
+							class="org.springframework.batch.sample.domain.football.PlayerItemWriter">
 							<property name="playerDao">
 								<bean
-									class="org.springframework.batch.sample.football.JdbcPlayerDao">
+									class="org.springframework.batch.sample.domain.football.JdbcPlayerDao">
 									<property name="dataSource"
 										ref="dataSource" />
 								</bean>
@@ -35,7 +35,7 @@
 						ref="gameFileItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.football.JdbcGameDao">
+							class="org.springframework.batch.sample.domain.football.JdbcGameDao">
 							<property name="dataSource"
 								ref="dataSource" />
 						</bean>
@@ -48,7 +48,7 @@
 						ref="playerSummarizationSource" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.football.JdbcPlayerSummaryDao">
+							class="org.springframework.batch.sample.domain.football.JdbcPlayerSummaryDao">
 							<property name="dataSource"
 								ref="dataSource" />
 						</bean>
@@ -71,7 +71,7 @@
 		</property>
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.football.PlayerFieldSetMapper" />
+				class="org.springframework.batch.sample.domain.football.PlayerFieldSetMapper" />
 		</property>
 	</bean>
 
@@ -88,7 +88,7 @@
 		</property>
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.football.GameFieldSetMapper" />
+				class="org.springframework.batch.sample.domain.football.GameFieldSetMapper" />
 		</property>
 	</bean>
 
@@ -97,7 +97,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.football.PlayerSummaryMapper" />
+				class="org.springframework.batch.sample.domain.football.PlayerSummaryMapper" />
 		</property>
 		<property name="sql">
 			<value>

spring-batch-samples/src/main/resources/jobs/hibernateJob.xml

@@ -33,12 +33,12 @@
 	</bean>
 
 	<bean id="hibernateCreditWriter"
-		class="org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter">
+		class="org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter">
 		<property name="customerCreditDao" ref="customerCreditDao" />
 	</bean>
 
 	<bean id="customerCreditDao"
-		class="org.springframework.batch.sample.trade.HibernateCreditDao">
+		class="org.springframework.batch.sample.domain.trade.HibernateCreditDao">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 

spring-batch-samples/src/main/resources/jobs/ibatisJob.xml

@@ -17,10 +17,10 @@
 				<property name="itemReader" ref="ibatisItemReader" />
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter">
+						class="org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter">
 						<property name="customerCreditDao">
 							<bean
-								class="org.springframework.batch.sample.trade.IbatisCustomerCreditDao">
+								class="org.springframework.batch.sample.domain.trade.IbatisCustomerCreditDao">
 								<property name="sqlMapClient"
 									ref="sqlMapClient" />
 								<property name="statementId"

spring-batch-samples/src/main/resources/jobs/infiniteLoopJob.xml

@@ -25,7 +25,7 @@
 			</bean-->
 			<bean id="infiniteStep" parent="simpleStep">
 				<property name="itemReader">
-					<bean id="reader" class="org.springframework.batch.sample.trade.GeneratingTradeItemReader">
+					<bean id="reader" class="org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader">
 						<property name="limit" value="1000000" />
 					</bean>
 				</property>

spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml

@@ -23,7 +23,7 @@
 				</property>
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.trade.TradeWriter">
+						class="org.springframework.batch.sample.domain.trade.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -75,7 +75,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -86,6 +86,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/multilineJob.xml

@@ -42,7 +42,7 @@
 	</bean>
 
 	<bean id="tradeLineMapper"
-		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 
 	<bean id="fixedFileDescriptor"
 		class="org.springframework.batch.item.file.transform.PrefixMatchingCompositeLineTokenizer">

spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml

@@ -25,7 +25,7 @@
 						class="org.springframework.batch.item.validator.ValidatingItemReader">
 						<property name="itemReader">
 							<bean
-								class="org.springframework.batch.sample.order.OrderItemReader">
+								class="org.springframework.batch.sample.domain.order.OrderItemReader">
 								<property name="fieldSetReader"
 									ref="fileItemReader" />
 								<property name="headerMapper"
@@ -55,24 +55,24 @@
 		<property name="delegate" ref="flatFileTransformerWriter" />
 		<property name="itemTransformer">
 			<bean
-				class="org.springframework.batch.sample.order.OrderTransformer">
+				class="org.springframework.batch.sample.domain.order.OrderTransformer">
 				<property name="aggregators" ref="outputAggregators" />
 			</bean>
 		</property>
 	</bean>
 
 	<bean id="headerFieldSetMapper"
-		class="org.springframework.batch.sample.order.HeaderFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.HeaderFieldSetMapper" />
 	<bean id="customerFieldSetMapper"
-		class="org.springframework.batch.sample.order.CustomerFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.CustomerFieldSetMapper" />
 	<bean id="addressFieldSetMapper"
-		class="org.springframework.batch.sample.order.AddressFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.AddressFieldSetMapper" />
 	<bean id="billingFieldSetMapper"
-		class="org.springframework.batch.sample.order.BillingFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.BillingFieldSetMapper" />
 	<bean id="orderItemFieldSetMapper"
-		class="org.springframework.batch.sample.order.OrderItemFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.OrderItemFieldSetMapper" />
 	<bean id="shippingFieldSetMapper"
-		class="org.springframework.batch.sample.order.ShippingFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.order.ShippingFieldSetMapper" />
 
 	<bean id="validator"
 		class="org.springframework.batch.item.validator.SpringValidator">
@@ -131,23 +131,23 @@
 				<property name="customFunctions">
 					<map>
 						<entry key="isFutureDate"
-							value="org.springframework.batch.sample.order.valang.FutureDateFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.FutureDateFunction" />
 						<entry key="validateTotalItemsCount"
-							value="org.springframework.batch.sample.order.valang.TotalOrderItemsFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction" />
 						<entry key="validateIds"
-							value="org.springframework.batch.sample.order.valang.ValidateIdsFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction" />
 						<entry key="validatePrices"
-							value="org.springframework.batch.sample.order.valang.ValidatePricesFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction" />
 						<entry key="validateDiscounts"
-							value="org.springframework.batch.sample.order.valang.ValidateDiscountsFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction" />
 						<entry key="validateShippingPrices"
-							value="org.springframework.batch.sample.order.valang.ValidateShippingPricesFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction" />
 						<entry key="validateHandlingPrices"
-							value="org.springframework.batch.sample.order.valang.ValidateHandlingPricesFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction" />
 						<entry key="validateQuantities"
-							value="org.springframework.batch.sample.order.valang.ValidateQuantitiesFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction" />
 						<entry key="validateTotalPrices"
-							value="org.springframework.batch.sample.order.valang.ValidateTotalPricesFunction" />
+							value="org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction" />
 					</map>
 				</property>
 			</bean>

spring-batch-samples/src/main/resources/jobs/parallelJob.xml

@@ -57,7 +57,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.trade.TradeWriter">
+							class="org.springframework.batch.sample.domain.trade.TradeWriter">
 							<property name="dao" ref="tradeDao" />
 						</bean>
 					</property>
@@ -104,7 +104,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -115,7 +115,7 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 
 	<aop:config>
 		<aop:aspect id="moduleLogging" ref="logAdvice">

spring-batch-samples/src/main/resources/jobs/restartSample.xml

@@ -22,7 +22,7 @@
 				</property>
 				<property name="itemWriter">
 					<bean
-						class="org.springframework.batch.sample.trade.TradeWriter">
+						class="org.springframework.batch.sample.domain.trade.TradeWriter">
 						<property name="dao" ref="tradeDao" />
 					</bean>
 				</property>
@@ -70,7 +70,7 @@
 	</bean>
 
 	<bean id="tradeDao"
-		class="org.springframework.batch.sample.trade.JdbcTradeDao">
+		class="org.springframework.batch.sample.domain.trade.JdbcTradeDao">
 		<property name="jdbcTemplate" ref="jdbcTemplate" />
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -81,6 +81,6 @@
 	</bean>
 
 	<bean id="fieldSetMapper"
-		class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+		class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/retrySample.xml

@@ -19,10 +19,10 @@
 		</property>
 	</bean>
 
-	<bean id="itemGenerator" class="org.springframework.batch.sample.trade.GeneratingTradeItemReader">
+	<bean id="itemGenerator" class="org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader">
 		<property name="limit" value="10" />
 	</bean>
 
-	<bean id="itemWriter" class="org.springframework.batch.sample.retry.RetrySampleItemWriter" />
+	<bean id="itemWriter" class="org.springframework.batch.sample.support.RetrySampleItemWriter" />
 
 </beans>

spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml

@@ -27,7 +27,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.trade.TradeWriter"
+							class="org.springframework.batch.sample.domain.trade.TradeWriter"
 							p:dao-ref="tradeDao" p:failure="3" />
 					</property>
 				</bean>
@@ -57,7 +57,7 @@
 			value="SELECT id, quantity, price, customer from TRADE" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.trade.TradeRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.TradeRowMapper" />
 		</property>
 	</bean>
 
@@ -68,7 +68,7 @@
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.trade.CustomerCreditRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" />
 		</property>
 	</bean>
 

spring-batch-samples/src/main/resources/jobs/tradeJob.xml

@@ -27,7 +27,7 @@
 					</property>
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.trade.TradeWriter"
+							class="org.springframework.batch.sample.domain.trade.TradeWriter"
 							p:dao-ref="tradeDao" />
 					</property>
 				</bean>
@@ -36,7 +36,7 @@
 						ref="tradeSqlItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.trade.CustomerUpdateWriter"
+							class="org.springframework.batch.sample.domain.trade.CustomerUpdateWriter"
 							p:dao-ref="customerDao" />
 					</property>
 				</bean>
@@ -45,7 +45,7 @@
 						ref="customerSqlItemReader" />
 					<property name="itemWriter">
 						<bean
-							class="org.springframework.batch.sample.trade.CustomerCreditUpdateWriter"
+							class="org.springframework.batch.sample.domain.trade.CustomerCreditUpdateWriter"
 							p:dao-ref="customerReportItemWriter" />
 					</property>
 				</bean>
@@ -60,7 +60,7 @@
 			value="SELECT id, quantity, price, customer from TRADE" />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.trade.TradeRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.TradeRowMapper" />
 		</property>
 	</bean>
 
@@ -71,7 +71,7 @@
 			value="SELECT id, name, credit FROM customer " />
 		<property name="mapper">
 			<bean
-				class="org.springframework.batch.sample.trade.CustomerCreditRowMapper" />
+				class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" />
 		</property>
 	</bean>
 

spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml

@@ -9,7 +9,7 @@
  			http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 
-	<bean class="org.springframework.batch.sample.trade.JdbcTradeDao"
+	<bean class="org.springframework.batch.sample.domain.trade.JdbcTradeDao"
 		id="tradeDao" p:jdbcTemplate-ref="jdbcTemplate">
 		<property name="incrementer">
 			<bean parent="incrementerParent">
@@ -19,11 +19,11 @@
 	</bean>
 
 	<bean
-		class="org.springframework.batch.sample.trade.JdbcCustomerDebitDao"
+		class="org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao"
 		id="customerDao" p:dataSource-ref="dataSource" />
 
 	<bean
-		class="org.springframework.batch.sample.trade.FlatFileCustomerCreditDao"
+		class="org.springframework.batch.sample.domain.trade.FlatFileCustomerCreditDao"
 		id="customerReportItemWriter">
 		<property name="itemWriter">
 			<bean
@@ -44,7 +44,7 @@
 		<property name="lineTokenizer" ref="tradeFileDescriptor" />
 		<property name="fieldSetMapper">
 			<bean
-				class="org.springframework.batch.sample.trade.TradeFieldSetMapper" />
+				class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" />
 		</property>
 	</bean>
 

spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml

@@ -62,7 +62,7 @@
 
 	<util:map id="aliases">
 		<entry key="trade"
-			value="org.springframework.batch.sample.trade.Trade" />
+			value="org.springframework.batch.sample.domain.trade.Trade" />
 		<entry key="isin" value="java.lang.String" />
 		<entry key="quantity" value="long" />
 		<entry key="price" value="java.math.BigDecimal" />

spring-batch-samples/src/main/resources/xstream-config.xml

@@ -22,13 +22,13 @@
   </type-aliases>
   <field-aliases>
     <field-alias>
-      <alias-name>org.springframework.batch.sample.order.xml.Customer</alias-name>
-      <type>org.springframework.batch.sample.order.xml.Order</type>
+      <alias-name>org.springframework.batch.sample.domain.order.xml.Customer</alias-name>
+      <type>org.springframework.batch.sample.domain.order.xml.Order</type>
       <field-name>customer</field-name>
     </field-alias>
     <field-alias>
-      <alias-name>org.springframework.batch.sample.order.xml.Shipper</alias-name>
-      <type>org.springframework.batch.sample.order.xml.Order</type>
+      <alias-name>org.springframework.batch.sample.domain.order.xml.Shipper</alias-name>
+      <type>org.springframework.batch.sample.domain.order.xml.Order</type>
       <field-name>shipper</field-name>
     </field-alias>
   </field-aliases>
@@ -51,25 +51,25 @@
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>order</localPart>
       <prefix></prefix>
-      <class-name>org.springframework.batch.sample.order.xml.Order</class-name>
+      <class-name>org.springframework.batch.sample.domain.order.xml.Order</class-name>
     </mapping>
     <mapping>
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>customer</localPart>
       <prefix></prefix>
-       <class-name>org.springframework.batch.sample.order.xml.Customer</class-name>
+       <class-name>org.springframework.batch.sample.domain.order.xml.Customer</class-name>
     </mapping>
     <mapping>
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>shipper</localPart>
       <prefix></prefix>
-       <class-name>org.springframework.batch.sample.order.xml.Shipper</class-name>
+       <class-name>org.springframework.batch.sample.domain.order.xml.Shipper</class-name>
     </mapping>
     <mapping>
       <namespaceURI>http://adsj.accenture.com/purchaseorders</namespaceURI>
       <localPart>lineItem</localPart>
       <prefix></prefix>
-       <class-name>org.springframework.batch.sample.order.xml.LineItem</class-name>
+       <class-name>org.springframework.batch.sample.domain.order.xml.LineItem</class-name>
     </mapping>
   </mappings>
 </configuration>

spring-batch-samples/src/site/apt/index.apt

@@ -425,10 +425,10 @@ AbduKa00,1996,mia,15,nyg,0,0,0,0,0,17,96,,14,0
     ref="playerFileItemReader" />
   <property name="itemWriter">
     <bean
-      class="org.springframework.batch.sample.football.PlayerItemWriter">
+      class="org.springframework.batch.sample.domain.football.PlayerItemWriter">
       <property name="playerDao">
         <bean
-          class="org.springframework.batch.sample.football.JdbcPlayerDao">
+          class="org.springframework.batch.sample.domain.football.JdbcPlayerDao">
           <property name="dataSource"
             ref="dataSource" />
         </bean>
@@ -504,7 +504,7 @@ AbduKa00,1996,mia,15,nyg,0,0,0,0,0,17,96,,14,0
   </property>
   <property name="fieldSetMapper">
     <bean
-      class="org.springframework.batch.sample.football.PlayerFieldSetMapper" />
+      class="org.springframework.batch.sample.domain.football.PlayerFieldSetMapper" />
   </property>
 </bean>
 +---
@@ -581,7 +581,7 @@ public class
   <property name="dataSource" ref="dataSource" />
   <property name="mapper">
   <bean
-      class="org.springframework.batch.sample.football.PlayerSummaryMapper" />
+      class="org.springframework.batch.sample.domain.football.PlayerSummaryMapper" />
   </property>
   <property name="sql">
     <value>

spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter;
+import org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java

@@ -14,7 +14,7 @@ import javax.sql.DataSource;
 
 import org.apache.commons.io.IOUtils;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.person.PersonService;
+import org.springframework.batch.sample.domain.person.PersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java

@@ -32,8 +32,8 @@ import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.file.FlatFileItemReader;
 import org.springframework.batch.item.file.mapping.FieldSetMapper;
 import org.springframework.batch.item.file.transform.LineTokenizer;
-import org.springframework.batch.sample.trade.Trade;
-import org.springframework.batch.sample.trade.TradeFieldSetMapper;
+import org.springframework.batch.sample.domain.trade.Trade;
+import org.springframework.batch.sample.domain.trade.TradeFieldSetMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;

spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java

@@ -11,7 +11,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
-import org.springframework.batch.sample.trade.HibernateCreditDao;
+import org.springframework.batch.sample.domain.trade.HibernateCreditDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.UncategorizedSQLException;
 import org.springframework.orm.hibernate3.HibernateJdbcException;

spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java

@@ -3,8 +3,8 @@ package org.springframework.batch.sample;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.retry.RetrySampleItemWriter;
-import org.springframework.batch.sample.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader;
+import org.springframework.batch.sample.support.RetrySampleItemWriter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java

@@ -33,7 +33,7 @@ import javax.sql.DataSource;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.trade.Trade;
+import org.springframework.batch.sample.domain.trade.Trade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java

@@ -26,8 +26,8 @@ import org.junit.Test;
 import org.springframework.batch.item.ExecutionContext;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
-import org.springframework.batch.sample.trade.CustomerCredit;
-import org.springframework.batch.sample.trade.FlatFileCustomerCreditDao;
+import org.springframework.batch.sample.domain.trade.CustomerCredit;
+import org.springframework.batch.sample.domain.trade.FlatFileCustomerCreditDao;
 
 public class FlatFileCustomerCreditDaoTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java

@@ -32,12 +32,12 @@ import org.springframework.batch.item.file.transform.LineAggregator;
 import org.springframework.batch.item.support.AbstractItemWriter;
 import org.springframework.batch.item.transform.ItemTransformerItemWriter;
 import org.springframework.batch.sample.StubLineAggregator;
-import org.springframework.batch.sample.order.Address;
-import org.springframework.batch.sample.order.BillingInfo;
-import org.springframework.batch.sample.order.Customer;
-import org.springframework.batch.sample.order.LineItem;
-import org.springframework.batch.sample.order.Order;
-import org.springframework.batch.sample.order.OrderTransformer;
+import org.springframework.batch.sample.domain.order.Address;
+import org.springframework.batch.sample.domain.order.BillingInfo;
+import org.springframework.batch.sample.domain.order.Customer;
+import org.springframework.batch.sample.domain.order.LineItem;
+import org.springframework.batch.sample.domain.order.Order;
+import org.springframework.batch.sample.domain.order.OrderTransformer;
 
 public class FlatFileOrderWriterTests {
 

spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java

@@ -25,8 +25,8 @@ import javax.sql.DataSource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.batch.sample.trade.CustomerDebit;
-import org.springframework.batch.sample.trade.JdbcCustomerDebitDao;
+import org.springframework.batch.sample.domain.trade.CustomerDebit;
+import org.springframework.batch.sample.domain.trade.JdbcCustomerDebitDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;