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

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

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

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

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

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

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.item.writer;
+package org.springframework.batch.sample.person;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.domain.Person;
 
 
 

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

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

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

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
-import org.springframework.batch.sample.trade.CustomerCredit;
 
 /**
  * Interface for writing customer's credit information to output.

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

@@ -3,7 +3,6 @@ package org.springframework.batch.sample.trade;
 import java.math.BigDecimal;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.CustomerCreditDao;
 
 /**
  * Increases customer's credit by fixed amount.

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

@@ -17,7 +17,6 @@
 package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.CustomerCreditDao;
 
 
 

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

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
-import org.springframework.batch.sample.trade.CustomerDebit;
 
 /**
  * Interface for writing {@link CustomerDebitDao} object to arbitrary output.

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

@@ -17,7 +17,6 @@
 package org.springframework.batch.sample.trade;
 
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.CustomerDebitDao;
 
 
 /**

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

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 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.beans.factory.DisposableBean;
 
 /**

spring-batch-samples/src/main/java/org/springframework/batch/sample/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.dao;
+package org.springframework.batch.sample.trade;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,7 +21,6 @@ import java.util.List;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.repeat.RepeatContext;
 import org.springframework.batch.repeat.RepeatListener;
-import org.springframework.batch.sample.trade.CustomerCredit;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**

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

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

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

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 import javax.sql.DataSource;
 
-import org.springframework.batch.sample.trade.CustomerDebit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.simple.SimpleJdbcOperations;
 import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;

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

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.batch.sample.dao;
+package org.springframework.batch.sample.trade;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.batch.sample.trade.Trade;
 import org.springframework.jdbc.core.JdbcOperations;
 import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 

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

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

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

@@ -19,7 +19,6 @@ package org.springframework.batch.sample.trade;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.item.support.AbstractItemWriter;
-import org.springframework.batch.sample.dao.TradeDao;
 
 /**
  * Delegates the actual writing to custom DAO delegate. Allows configurable