diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/FootballExceptionHandler.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/FootballExceptionHandler.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/FootballExceptionHandler.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/FootballExceptionHandler.java index 5dcde3f16..f90c47cff 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/FootballExceptionHandler.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/Game.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/Game.java index c4107ac03..cd7b56e20 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Game.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/GameFieldSetMapper.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/GameFieldSetMapper.java index 09041e28f..f112cbd03 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/GameFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcGameDao.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcGameDao.java index d8f1830eb..80e1ede78 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcGameDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerDao.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerDao.java index 9118cfd5d..cf309ccc1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDao.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/JdbcPlayerSummaryDao.java index 9c1eebdb4..fe131d126 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/JdbcPlayerSummaryDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/Player.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/Player.java index 3644fc244..69f4e6c85 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/Player.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerDao.java similarity index 71% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerDao.java index 1474e103c..806950dfe 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerDao.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerFieldSetMapper.java similarity index 91% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerFieldSetMapper.java index c6bc086b1..8a3178535 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerItemWriter.java similarity index 85% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerItemWriter.java index dd802e7a4..229dbb38c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerItemWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummary.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummary.java index 24b4bb4fb..df850d8c7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummary.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryMapper.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryMapper.java index ffcfb313f..66624f0a3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryRowMapper.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/PlayerSummaryRowMapper.java index e31dbcf8d..adc58f0ea 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/football/PlayerSummaryRowMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Address.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Address.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Address.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Address.java index 918194d65..b81ea720c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Address.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/AddressFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapper.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/AddressFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/AddressFieldSetMapper.java index 55d4df615..d1ae190fe 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/AddressFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingFieldSetMapper.java index cebb1b6b5..520af860e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingInfo.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/BillingInfo.java index cd58a9ccc..cbec4f447 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/BillingInfo.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Customer.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Customer.java index bc7bdf000..91b3dc9d8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Customer.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/CustomerFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapper.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/CustomerFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/CustomerFieldSetMapper.java index 2c305a624..1300bc55f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/CustomerFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/HeaderFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/HeaderFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/HeaderFieldSetMapper.java index 12a61f276..5c3782514 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/HeaderFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/LineItem.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/LineItem.java index 537705b34..17247e994 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/LineItem.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Order.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/Order.java index 176a24ed8..f8f58378c 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/Order.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderDao.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderDao.java index 5cffce75e..2d7a279a5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderDao.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapper.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemFieldSetMapper.java index 6148ff00b..bb9fb09fb 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemReader.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderItemReader.java index 63c5df6d0..fcc1d8cdc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderItemReader.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderTransformer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderTransformer.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderTransformer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/OrderTransformer.java index 24a17cbe9..8000178ff 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/OrderTransformer.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapper.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingFieldSetMapper.java index 0dc943279..2126338cb 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingInfo.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingInfo.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingInfo.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/ShippingInfo.java index f0cc55ec2..e254c0d82 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/ShippingInfo.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/FutureDateFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunction.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/FutureDateFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunction.java index 01120f4ba..9686a9b12 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/FutureDateFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunction.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunction.java index 8e5e2f24d..233c206eb 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunction.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunction.java index 8c3a91442..a0e7ac107 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunction.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunction.java index be480d88f..9a93686ae 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateIdsFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunction.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateIdsFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunction.java index 12b02ac80..a4464468d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateIdsFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidatePricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunction.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidatePricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunction.java index b7f888881..89560e8aa 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidatePricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunction.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunction.java index 632a470c6..1bde2c15d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunction.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunction.java index 69f88e9e8..0ce4cefc3 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunction.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunction.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunction.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunction.java index 12645ec2c..654afa362 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunction.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Customer.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Customer.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Customer.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Customer.java index 65eae7921..1853e9c01 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Customer.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/LineItem.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/LineItem.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/LineItem.java index 7c1a2cd0b..4c8a467cf 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/LineItem.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Order.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Order.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Order.java index f3eb243b4..33e9fb668 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Order.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Shipper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Shipper.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Shipper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/xml/Shipper.java index f72a1fdc6..51a6d5bdc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/order/xml/Shipper.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Child.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Child.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Child.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Child.java index 1ddd09274..232c3a96a 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Child.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Person.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Person.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/Person.java index a9145f12d..ec2f38620 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/Person.java +++ b/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 { diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonService.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonService.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonService.java index 92fa9d51d..ec52842af 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonService.java +++ b/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 diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonWriter.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/person/PersonWriter.java index a61962fdc..c63473535 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/person/PersonWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCredit.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCredit.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCredit.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCredit.java index a8ccfe2a0..6750cc230 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCredit.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditDao.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditDao.java index a55775e93..83f598be8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditDao.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseWriter.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditIncreaseWriter.java index ec4c15610..a5f4f6404 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditIncreaseWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapper.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditRowMapper.java index 48337821a..7d0a98b67 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditRowMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdatePreparedStatementSetter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetter.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdatePreparedStatementSetter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdatePreparedStatementSetter.java index dd5915a9f..9baaf92e7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdatePreparedStatementSetter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateWriter.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerCreditUpdateWriter.java index 53753a103..0717fd901 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerCreditUpdateWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebit.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebit.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebit.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebit.java index 5e551d190..212d221bc 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebit.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitDao.java similarity index 93% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitDao.java index ead43f241..df52bd652 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitDao.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitRowMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerDebitRowMapper.java index 03da33d76..c550a007b 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerDebitRowMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/CustomerUpdateWriter.java index 7d30f55d0..7f0502bd5 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/CustomerUpdateWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/FlatFileCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDao.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/FlatFileCustomerCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/FlatFileCustomerCreditDao.java index d136737da..b134daee1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/FlatFileCustomerCreditDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/GeneratingTradeItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/GeneratingTradeItemReader.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/GeneratingTradeItemReader.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/GeneratingTradeItemReader.java index 0950d1827..245d29106 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/GeneratingTradeItemReader.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/HibernateCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/HibernateCreditDao.java similarity index 98% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/HibernateCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/HibernateCreditDao.java index f4452db81..0be3bdb15 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/HibernateCreditDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/IbatisCustomerCreditDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/IbatisCustomerCreditDao.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/IbatisCustomerCreditDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/IbatisCustomerCreditDao.java index e8bf3f675..962270234 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/IbatisCustomerCreditDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcCustomerDebitDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDao.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcCustomerDebitDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcCustomerDebitDao.java index 750bf4ea2..6a18655a7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcCustomerDebitDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcTradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcTradeDao.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcTradeDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/JdbcTradeDao.java index c8929b97e..0cf64e6da 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/JdbcTradeDao.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/Trade.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/Trade.java similarity index 97% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/Trade.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/Trade.java index 53ca6a046..dc4b23e0d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/Trade.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java similarity index 94% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeDao.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeDao.java index 552c5aae3..ad9f95787 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeDao.java +++ b/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; /** diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapper.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeFieldSetMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeFieldSetMapper.java index 54b119a5b..c734ea2a1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeFieldSetMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeRowMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeRowMapper.java similarity index 95% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeRowMapper.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeRowMapper.java index cdd142760..bf8461a83 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeRowMapper.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeWriter.java similarity index 96% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/TradeWriter.java index dad7a4e8e..5a312ba64 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/trade/TradeWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleItemWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/support/RetrySampleItemWriter.java similarity index 92% rename from spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleItemWriter.java rename to spring-batch-samples/src/main/java/org/springframework/batch/sample/support/RetrySampleItemWriter.java index aff2f1fdf..67fcd2f3e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/retry/RetrySampleItemWriter.java +++ b/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; diff --git a/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml b/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml index 90b7ca5c7..69b850719 100644 --- a/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml +++ b/spring-batch-samples/src/main/resources/CustomerCredit.hbm.xml @@ -4,7 +4,7 @@ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - diff --git a/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml index 44b7047c1..6c1f9d78c 100644 --- a/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml +++ b/spring-batch-samples/src/main/resources/ibatis-customer-credit.xml @@ -4,7 +4,7 @@ - + @@ -17,7 +17,7 @@ select NAME, CREDIT from CUSTOMER where ID = #value# - + update CUSTOMER set CREDIT = #credit# where NAME = #name# diff --git a/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml b/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml index 3a1a9454a..8f397720c 100644 --- a/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/batchUpdateJob.xml @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml index 101c61551..4235323d0 100644 --- a/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/beanWrapperMapperSampleJob.xml @@ -25,7 +25,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeWriter"> @@ -35,7 +35,7 @@ ref="personFileItemReader" /> + class="org.springframework.batch.sample.domain.person.PersonWriter" /> @@ -91,7 +91,7 @@ + class="org.springframework.batch.sample.domain.trade.JdbcTradeDao"> @@ -111,11 +111,11 @@ diff --git a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml index 2d2a3507e..919f3c8c7 100644 --- a/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/compositeItemWriterSampleJob.xml @@ -38,7 +38,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeWriter"> @@ -77,7 +77,7 @@ + class="org.springframework.batch.sample.domain.trade.JdbcTradeDao"> @@ -98,6 +98,6 @@ + class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" /> \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml index d787d9e3a..d2327849e 100644 --- a/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/delegatingJob.xml @@ -47,6 +47,6 @@ + class="org.springframework.batch.sample.domain.person.PersonService" /> \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml index a566c8c1c..210271855 100644 --- a/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/fixedLengthImportJob.xml @@ -18,7 +18,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -67,6 +67,6 @@ - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/jobs/footballJob.xml b/spring-batch-samples/src/main/resources/jobs/footballJob.xml index b4fc7e967..b29f68e46 100644 --- a/spring-batch-samples/src/main/resources/jobs/footballJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/footballJob.xml @@ -19,10 +19,10 @@ ref="playerFileItemReader" /> + class="org.springframework.batch.sample.domain.football.PlayerItemWriter"> + class="org.springframework.batch.sample.domain.football.JdbcPlayerDao"> @@ -35,7 +35,7 @@ ref="gameFileItemReader" /> + class="org.springframework.batch.sample.domain.football.JdbcGameDao"> @@ -48,7 +48,7 @@ ref="playerSummarizationSource" /> + class="org.springframework.batch.sample.domain.football.JdbcPlayerSummaryDao"> @@ -71,7 +71,7 @@ + class="org.springframework.batch.sample.domain.football.PlayerFieldSetMapper" /> @@ -88,7 +88,7 @@ + class="org.springframework.batch.sample.domain.football.GameFieldSetMapper" /> @@ -97,7 +97,7 @@ + class="org.springframework.batch.sample.domain.football.PlayerSummaryMapper" /> diff --git a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml index 7bb7e8a1f..4624c0a73 100644 --- a/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/hibernateJob.xml @@ -33,12 +33,12 @@ + class="org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter"> + class="org.springframework.batch.sample.domain.trade.HibernateCreditDao"> diff --git a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml index 47235c7ea..555aa9d57 100644 --- a/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/ibatisJob.xml @@ -17,10 +17,10 @@ + class="org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter"> + class="org.springframework.batch.sample.domain.trade.IbatisCustomerCreditDao"> - + diff --git a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml index 6b6a87779..b3bfd20d7 100644 --- a/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multiResourceJob.xml @@ -23,7 +23,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeWriter"> @@ -75,7 +75,7 @@ + class="org.springframework.batch.sample.domain.trade.JdbcTradeDao"> @@ -86,6 +86,6 @@ + class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" /> \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml index f9ca8ff79..40ca9612e 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineJob.xml @@ -42,7 +42,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" /> diff --git a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml index d47702ef9..f6efe5d92 100644 --- a/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/multilineOrderJob.xml @@ -25,7 +25,7 @@ class="org.springframework.batch.item.validator.ValidatingItemReader"> + class="org.springframework.batch.sample.domain.order.OrderItemReader"> + class="org.springframework.batch.sample.domain.order.OrderTransformer"> + class="org.springframework.batch.sample.domain.order.HeaderFieldSetMapper" /> + class="org.springframework.batch.sample.domain.order.CustomerFieldSetMapper" /> + class="org.springframework.batch.sample.domain.order.AddressFieldSetMapper" /> + class="org.springframework.batch.sample.domain.order.BillingFieldSetMapper" /> + class="org.springframework.batch.sample.domain.order.OrderItemFieldSetMapper" /> + class="org.springframework.batch.sample.domain.order.ShippingFieldSetMapper" /> @@ -131,23 +131,23 @@ + value="org.springframework.batch.sample.domain.order.valang.FutureDateFunction" /> + value="org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction" /> + value="org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction" /> diff --git a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml index dd072f708..f549bdaf9 100644 --- a/spring-batch-samples/src/main/resources/jobs/parallelJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/parallelJob.xml @@ -57,7 +57,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeWriter"> @@ -104,7 +104,7 @@ + class="org.springframework.batch.sample.domain.trade.JdbcTradeDao"> @@ -115,7 +115,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" /> diff --git a/spring-batch-samples/src/main/resources/jobs/restartSample.xml b/spring-batch-samples/src/main/resources/jobs/restartSample.xml index 70c85f657..87e69d1e8 100644 --- a/spring-batch-samples/src/main/resources/jobs/restartSample.xml +++ b/spring-batch-samples/src/main/resources/jobs/restartSample.xml @@ -22,7 +22,7 @@ + class="org.springframework.batch.sample.domain.trade.TradeWriter"> @@ -70,7 +70,7 @@ + class="org.springframework.batch.sample.domain.trade.JdbcTradeDao"> @@ -81,6 +81,6 @@ + class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" /> \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/jobs/retrySample.xml b/spring-batch-samples/src/main/resources/jobs/retrySample.xml index 1b05fbb29..423fc5b74 100644 --- a/spring-batch-samples/src/main/resources/jobs/retrySample.xml +++ b/spring-batch-samples/src/main/resources/jobs/retrySample.xml @@ -19,10 +19,10 @@ - + - + \ No newline at end of file diff --git a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml index aef5600ce..6ca986125 100644 --- a/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/skipSampleJob.xml @@ -27,7 +27,7 @@ @@ -57,7 +57,7 @@ value="SELECT id, quantity, price, customer from TRADE" /> + class="org.springframework.batch.sample.domain.trade.TradeRowMapper" /> @@ -68,7 +68,7 @@ value="SELECT id, name, credit FROM customer " /> + class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" /> diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml index 660f3775b..7e8660d35 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJob.xml @@ -27,7 +27,7 @@ @@ -36,7 +36,7 @@ ref="tradeSqlItemReader" /> @@ -45,7 +45,7 @@ ref="customerSqlItemReader" /> @@ -60,7 +60,7 @@ value="SELECT id, quantity, price, customer from TRADE" /> + class="org.springframework.batch.sample.domain.trade.TradeRowMapper" /> @@ -71,7 +71,7 @@ value="SELECT id, name, credit FROM customer " /> + class="org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper" /> diff --git a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml index 212a2054a..f25900f5a 100644 --- a/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml +++ b/spring-batch-samples/src/main/resources/jobs/tradeJobIo.xml @@ -9,7 +9,7 @@ http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> - @@ -19,11 +19,11 @@ + class="org.springframework.batch.sample.domain.trade.TradeFieldSetMapper" /> diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml index 0fd04608a..608a2b392 100644 --- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml @@ -62,7 +62,7 @@ + value="org.springframework.batch.sample.domain.trade.Trade" /> diff --git a/spring-batch-samples/src/main/resources/xstream-config.xml b/spring-batch-samples/src/main/resources/xstream-config.xml index 2360aa35b..65cf6158c 100644 --- a/spring-batch-samples/src/main/resources/xstream-config.xml +++ b/spring-batch-samples/src/main/resources/xstream-config.xml @@ -22,13 +22,13 @@ - org.springframework.batch.sample.order.xml.Customer - org.springframework.batch.sample.order.xml.Order + org.springframework.batch.sample.domain.order.xml.Customer + org.springframework.batch.sample.domain.order.xml.Order customer - org.springframework.batch.sample.order.xml.Shipper - org.springframework.batch.sample.order.xml.Order + org.springframework.batch.sample.domain.order.xml.Shipper + org.springframework.batch.sample.domain.order.xml.Order shipper @@ -51,25 +51,25 @@ http://adsj.accenture.com/purchaseorders order - org.springframework.batch.sample.order.xml.Order + org.springframework.batch.sample.domain.order.xml.Order http://adsj.accenture.com/purchaseorders customer - org.springframework.batch.sample.order.xml.Customer + org.springframework.batch.sample.domain.order.xml.Customer http://adsj.accenture.com/purchaseorders shipper - org.springframework.batch.sample.order.xml.Shipper + org.springframework.batch.sample.domain.order.xml.Shipper http://adsj.accenture.com/purchaseorders lineItem - org.springframework.batch.sample.order.xml.LineItem + org.springframework.batch.sample.domain.order.xml.LineItem diff --git a/spring-batch-samples/src/site/apt/index.apt b/spring-batch-samples/src/site/apt/index.apt index a6ea05f7d..5527d056c 100644 --- a/spring-batch-samples/src/site/apt/index.apt +++ b/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" /> + class="org.springframework.batch.sample.domain.football.PlayerItemWriter"> + class="org.springframework.batch.sample.domain.football.JdbcPlayerDao"> @@ -504,7 +504,7 @@ AbduKa00,1996,mia,15,nyg,0,0,0,0,0,17,96,,14,0 + class="org.springframework.batch.sample.domain.football.PlayerFieldSetMapper" /> +--- @@ -581,7 +581,7 @@ public class + class="org.springframework.batch.sample.domain.football.PlayerSummaryMapper" /> diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java index 5a1f3cad8..0f5ed05d1 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/AbstractCustomerCreditIncreaseTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java index 8e5fa52aa..33667cbab 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/CompositeItemWriterSampleFunctionalTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java index 3232f5be7..0a32c8f4e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/DelegatingJobFunctionalTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java index 8bb921afc..442588b4c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/FixedLengthImportJobFunctionalTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index feab27c74..5b2022ad3 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java index e5b26947d..b5db064e2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RetrySampleFunctionalTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java index 7da527f29..5dc073aab 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TradeJobFunctionalTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java index 02ed82024..e2d3b5c93 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileCustomerCreditDaoTests.java +++ b/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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java index 02e7212b4..61be70713 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/FlatFileOrderWriterTests.java @@ -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 { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java index 2e751e24e..e1ea522fc 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests.java +++ b/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; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java index 5cf3256e1..2ddf52e9c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcGameDaoIntegrationTests.java @@ -25,8 +25,8 @@ import javax.sql.DataSource; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.batch.sample.football.Game; -import org.springframework.batch.sample.football.JdbcGameDao; +import org.springframework.batch.sample.domain.football.Game; +import org.springframework.batch.sample.domain.football.JdbcGameDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.simple.ParameterizedRowMapper; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java index 8cf266429..2140ee721 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerDaoIntegrationTests.java @@ -25,8 +25,8 @@ import javax.sql.DataSource; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.batch.sample.football.JdbcPlayerDao; -import org.springframework.batch.sample.football.Player; +import org.springframework.batch.sample.domain.football.JdbcPlayerDao; +import org.springframework.batch.sample.domain.football.Player; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java index 1f7b8c792..62fd8cf8c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcPlayerSummaryDaoIntegrationTests.java @@ -22,9 +22,9 @@ import javax.sql.DataSource; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.batch.sample.football.JdbcPlayerSummaryDao; -import org.springframework.batch.sample.football.PlayerSummary; -import org.springframework.batch.sample.football.PlayerSummaryMapper; +import org.springframework.batch.sample.domain.football.JdbcPlayerSummaryDao; +import org.springframework.batch.sample.domain.football.PlayerSummary; +import org.springframework.batch.sample.domain.football.PlayerSummaryMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java index a53c49a0d..b3a228e75 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcTradeWriterTests.java @@ -25,8 +25,8 @@ import javax.sql.DataSource; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.batch.sample.trade.JdbcTradeDao; -import org.springframework.batch.sample.trade.Trade; +import org.springframework.batch.sample.domain.trade.JdbcTradeDao; +import org.springframework.batch.sample.domain.trade.Trade; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java index b064b3d43..6b5a582e4 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/OrderTransformerTests.java @@ -26,12 +26,12 @@ import java.util.HashMap; import org.junit.Test; import org.springframework.batch.item.file.transform.DelimitedLineAggregator; import org.springframework.batch.item.file.transform.LineAggregator; -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; /** * @author Dave Syer diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/FutureDateFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java similarity index 92% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/FutureDateFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java index 8803a7b4d..7569c8c71 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/FutureDateFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/FutureDateFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -11,7 +11,7 @@ import java.util.Date; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.valang.FutureDateFunction; +import org.springframework.batch.sample.domain.order.valang.FutureDateFunction; import org.springmodules.validation.valang.functions.Function; public class FutureDateFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java similarity index 90% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java index 848b87cd9..4707cac14 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/TotalOrderItemsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/TotalOrderItemsFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -12,8 +12,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.TotalOrderItemsFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.TotalOrderItemsFunction; import org.springmodules.validation.valang.functions.Function; public class TotalOrderItemsFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java similarity index 96% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java index de48b84a9..a14e09bb9 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateDiscountsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateDiscountsFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -12,8 +12,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidateDiscountsFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidateDiscountsFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateDiscountsFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java index 3f63e47aa..3ee994640 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateHandlingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateHandlingPricesFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -12,8 +12,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidateHandlingPricesFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidateHandlingPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateHandlingPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateIdsFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateIdsFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java index 4aefd95a8..146afc420 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateIdsFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateIdsFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -11,8 +11,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidateIdsFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidateIdsFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateIdsFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidatePricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidatePricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java index 5de2e4be5..22175af0a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidatePricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidatePricesFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -12,8 +12,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidatePricesFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidatePricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidatePricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java index a53b49739..758785805 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateQuantitiesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateQuantitiesFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -11,8 +11,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidateQuantitiesFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidateQuantitiesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateQuantitiesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java similarity index 91% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java index c2b2ae14e..031b50a93 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateShippingPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateShippingPricesFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -12,8 +12,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidateShippingPricesFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidateShippingPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateShippingPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunctionTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java similarity index 95% rename from spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunctionTests.java rename to spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java index 0e4421f4c..fd400431e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/order/valang/ValidateTotalPricesFunctionTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/order/valang/ValidateTotalPricesFunctionTests.java @@ -1,4 +1,4 @@ -package org.springframework.batch.sample.order.valang; +package org.springframework.batch.sample.domain.order.valang; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -13,8 +13,8 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.valang.ValidateTotalPricesFunction; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.valang.ValidateTotalPricesFunction; import org.springmodules.validation.valang.functions.Function; public class ValidateTotalPricesFunctionTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java index ffc6704ec..ab0985f18 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/GeneratingItemReaderTests.java @@ -3,7 +3,7 @@ package org.springframework.batch.sample.item.reader; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.batch.sample.trade.GeneratingTradeItemReader; +import org.springframework.batch.sample.domain.trade.GeneratingTradeItemReader; /** * Tests for {@link GeneratingTradeItemReader}. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java index 2dcdc96f1..4650ece08 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/reader/OrderItemReaderTests.java @@ -18,13 +18,13 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -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.OrderItemReader; -import org.springframework.batch.sample.order.ShippingInfo; +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.OrderItemReader; +import org.springframework.batch.sample.domain.order.ShippingInfo; public class OrderItemReaderTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java index aed57f6f4..c5ae81619 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditIncreaseProcessorTests.java @@ -5,9 +5,9 @@ import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import org.junit.Test; -import org.springframework.batch.sample.trade.CustomerCredit; -import org.springframework.batch.sample.trade.CustomerCreditDao; -import org.springframework.batch.sample.trade.CustomerCreditIncreaseWriter; +import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.sample.domain.trade.CustomerCreditIncreaseWriter; /** * Tests for {@link CustomerCreditIncreaseWriter}. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java index 67136b3b6..99a41cc51 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdatePreparedStatementSetterTests.java @@ -22,8 +22,8 @@ import java.sql.SQLException; import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.trade.CustomerCredit; -import org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter; +import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter; /** * @author Dave Syer @@ -47,7 +47,7 @@ public class CustomerCreditUpdatePreparedStatementSetterTests { } /** - * Test method for {@link org.springframework.batch.sample.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) } + * Test method for {@link org.springframework.batch.sample.domain.trade.CustomerCreditUpdatePreparedStatementSetter#setValues(CustomerCredit, PreparedStatement) } * @throws SQLException */ @Test diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java index a98909599..d938711b7 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerCreditUpdateProcessorTests.java @@ -5,9 +5,9 @@ import java.math.BigDecimal; import org.easymock.MockControl; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.trade.CustomerCredit; -import org.springframework.batch.sample.trade.CustomerCreditDao; -import org.springframework.batch.sample.trade.CustomerCreditUpdateWriter; +import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.sample.domain.trade.CustomerCreditDao; +import org.springframework.batch.sample.domain.trade.CustomerCreditUpdateWriter; public class CustomerCreditUpdateProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java index fe4403f04..c7823e4dd 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/CustomerUpdateProcessorTests.java @@ -5,10 +5,10 @@ import static org.junit.Assert.assertEquals; import java.math.BigDecimal; import org.junit.Test; -import org.springframework.batch.sample.trade.CustomerDebit; -import org.springframework.batch.sample.trade.CustomerDebitDao; -import org.springframework.batch.sample.trade.CustomerUpdateWriter; -import org.springframework.batch.sample.trade.Trade; +import org.springframework.batch.sample.domain.trade.CustomerDebit; +import org.springframework.batch.sample.domain.trade.CustomerDebitDao; +import org.springframework.batch.sample.domain.trade.CustomerUpdateWriter; +import org.springframework.batch.sample.domain.trade.Trade; public class CustomerUpdateProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java index 3d04e7adc..53b66f211 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/RetrySampleItemWriterTests.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Test; -import org.springframework.batch.sample.retry.RetrySampleItemWriter; +import org.springframework.batch.sample.support.RetrySampleItemWriter; /** * Tests for {@link RetrySampleItemWriter}. diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java index 3d033ad0a..c40ed44ae 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/item/writer/TradeProcessorTests.java @@ -3,9 +3,9 @@ package org.springframework.batch.sample.item.writer; import org.easymock.MockControl; import org.junit.Before; import org.junit.Test; -import org.springframework.batch.sample.trade.Trade; -import org.springframework.batch.sample.trade.TradeDao; -import org.springframework.batch.sample.trade.TradeWriter; +import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.sample.domain.trade.TradeDao; +import org.springframework.batch.sample.domain.trade.TradeWriter; public class TradeProcessorTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java index bbc5d33b5..b45fefed2 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/AddressFieldSetMapperTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.order.Address; -import org.springframework.batch.sample.order.AddressFieldSetMapper; +import org.springframework.batch.sample.domain.order.Address; +import org.springframework.batch.sample.domain.order.AddressFieldSetMapper; public class AddressFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java index e240533c7..cb49314ab 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/BillingFieldSetMapperTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.order.BillingFieldSetMapper; -import org.springframework.batch.sample.order.BillingInfo; +import org.springframework.batch.sample.domain.order.BillingFieldSetMapper; +import org.springframework.batch.sample.domain.order.BillingInfo; public class BillingFieldSetMapperTests extends AbstractFieldSetMapperTests{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java index 9a395a59e..7d1165a0c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerCreditRowMapperTests.java @@ -5,8 +5,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.easymock.MockControl; -import org.springframework.batch.sample.trade.CustomerCredit; -import org.springframework.batch.sample.trade.CustomerCreditRowMapper; +import org.springframework.batch.sample.domain.trade.CustomerCredit; +import org.springframework.batch.sample.domain.trade.CustomerCreditRowMapper; import org.springframework.jdbc.core.RowMapper; public class CustomerCreditRowMapperTests extends AbstractRowMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java index bf34a63a2..e6df56f66 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/CustomerFieldSetMapperTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.order.Customer; -import org.springframework.batch.sample.order.CustomerFieldSetMapper; +import org.springframework.batch.sample.domain.order.Customer; +import org.springframework.batch.sample.domain.order.CustomerFieldSetMapper; public class CustomerFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java index 9bff23d6d..3a7247e4b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/HeaderFieldSetMapperTests.java @@ -5,8 +5,8 @@ import java.util.Calendar; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.order.HeaderFieldSetMapper; -import org.springframework.batch.sample.order.Order; +import org.springframework.batch.sample.domain.order.HeaderFieldSetMapper; +import org.springframework.batch.sample.domain.order.Order; public class HeaderFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java index 19f7bf6ff..852fe8dfe 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/OrderItemFieldSetMapperTests.java @@ -5,8 +5,8 @@ import java.math.BigDecimal; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.order.LineItem; -import org.springframework.batch.sample.order.OrderItemFieldSetMapper; +import org.springframework.batch.sample.domain.order.LineItem; +import org.springframework.batch.sample.domain.order.OrderItemFieldSetMapper; public class OrderItemFieldSetMapperTests extends AbstractFieldSetMapperTests{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java index b694e54f9..7fd13102e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/ShippingFieldSetMapperTests.java @@ -3,8 +3,8 @@ package org.springframework.batch.sample.mapping; import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; -import org.springframework.batch.sample.order.ShippingFieldSetMapper; -import org.springframework.batch.sample.order.ShippingInfo; +import org.springframework.batch.sample.domain.order.ShippingFieldSetMapper; +import org.springframework.batch.sample.domain.order.ShippingInfo; public class ShippingFieldSetMapperTests extends AbstractFieldSetMapperTests{ diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java index 54fe94911..adde4f95e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeFieldSetMapperTests.java @@ -9,8 +9,8 @@ import org.springframework.batch.item.file.mapping.DefaultFieldSet; import org.springframework.batch.item.file.mapping.FieldSet; import org.springframework.batch.item.file.mapping.FieldSetMapper; import org.springframework.batch.item.support.AggregateItemReader; -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; public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java index 06dc338be..179935dee 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/mapping/TradeRowMapperTests.java @@ -5,8 +5,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.easymock.MockControl; -import org.springframework.batch.sample.trade.Trade; -import org.springframework.batch.sample.trade.TradeRowMapper; +import org.springframework.batch.sample.domain.trade.Trade; +import org.springframework.batch.sample.domain.trade.TradeRowMapper; import org.springframework.jdbc.core.RowMapper; public class TradeRowMapperTests extends AbstractRowMapperTests { diff --git a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml index f6c89efa5..599291b26 100644 --- a/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml +++ b/spring-batch-samples/src/test/resources/org/springframework/batch/sample/dao/JdbcCustomerDebitDaoTests-context.xml @@ -6,6 +6,6 @@ - + \ No newline at end of file