From 21d76df559f3bfdbf057a5112c2364109ae3f358 Mon Sep 17 00:00:00 2001 From: lucasward Date: Mon, 29 Oct 2007 14:50:50 +0000 Subject: [PATCH] BATCH-167: The io.sql package was split into io.cursor and io.driving. This is an interim change, since subversion can be flaky when renaming packages. --- .../batch/io/{sql => cursor}/SqlCursorInputSource.java | 2 +- .../CompositeKeySqlDrivingQueryInputSource.java | 2 +- .../batch/io/{sql => driving}/RestartDataConverter.java | 2 +- .../{sql => driving}/SingleKeySqlDrivingQueryInputSource.java | 2 +- .../batch/io/orm/ibatis/IbatisDrivingQueryInputSource.java | 2 +- .../CompositeKeySqlDrivingQueryInputSourceIntegrationTests.java | 2 ++ .../SingleKeySqlDrivingQueryInputSourceIntegrationTests.java | 2 +- .../batch/io/sql/SqlCursorInputSourceIntegrationTests.java | 1 + 8 files changed, 9 insertions(+), 6 deletions(-) rename infrastructure/src/main/java/org/springframework/batch/io/{sql => cursor}/SqlCursorInputSource.java (96%) rename infrastructure/src/main/java/org/springframework/batch/io/{sql => driving}/CompositeKeySqlDrivingQueryInputSource.java (96%) rename infrastructure/src/main/java/org/springframework/batch/io/{sql => driving}/RestartDataConverter.java (93%) rename infrastructure/src/main/java/org/springframework/batch/io/{sql => driving}/SingleKeySqlDrivingQueryInputSource.java (96%) diff --git a/infrastructure/src/main/java/org/springframework/batch/io/sql/SqlCursorInputSource.java b/infrastructure/src/main/java/org/springframework/batch/io/cursor/SqlCursorInputSource.java similarity index 96% rename from infrastructure/src/main/java/org/springframework/batch/io/sql/SqlCursorInputSource.java rename to infrastructure/src/main/java/org/springframework/batch/io/cursor/SqlCursorInputSource.java index 3bb6b3dc8..fd95bb237 100644 --- a/infrastructure/src/main/java/org/springframework/batch/io/sql/SqlCursorInputSource.java +++ b/infrastructure/src/main/java/org/springframework/batch/io/cursor/SqlCursorInputSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.io.sql; +package org.springframework.batch.io.cursor; import java.sql.Connection; import java.sql.ResultSet; diff --git a/infrastructure/src/main/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSource.java b/infrastructure/src/main/java/org/springframework/batch/io/driving/CompositeKeySqlDrivingQueryInputSource.java similarity index 96% rename from infrastructure/src/main/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSource.java rename to infrastructure/src/main/java/org/springframework/batch/io/driving/CompositeKeySqlDrivingQueryInputSource.java index c17fe6c2b..f611bf5a9 100644 --- a/infrastructure/src/main/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSource.java +++ b/infrastructure/src/main/java/org/springframework/batch/io/driving/CompositeKeySqlDrivingQueryInputSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.io.sql; +package org.springframework.batch.io.driving; import java.util.ArrayList; import java.util.List; diff --git a/infrastructure/src/main/java/org/springframework/batch/io/sql/RestartDataConverter.java b/infrastructure/src/main/java/org/springframework/batch/io/driving/RestartDataConverter.java similarity index 93% rename from infrastructure/src/main/java/org/springframework/batch/io/sql/RestartDataConverter.java rename to infrastructure/src/main/java/org/springframework/batch/io/driving/RestartDataConverter.java index 742a70fed..b9c040986 100644 --- a/infrastructure/src/main/java/org/springframework/batch/io/sql/RestartDataConverter.java +++ b/infrastructure/src/main/java/org/springframework/batch/io/driving/RestartDataConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.io.sql; +package org.springframework.batch.io.driving; import org.springframework.batch.restart.RestartData; diff --git a/infrastructure/src/main/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSource.java b/infrastructure/src/main/java/org/springframework/batch/io/driving/SingleKeySqlDrivingQueryInputSource.java similarity index 96% rename from infrastructure/src/main/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSource.java rename to infrastructure/src/main/java/org/springframework/batch/io/driving/SingleKeySqlDrivingQueryInputSource.java index 0fca77e91..06785c465 100644 --- a/infrastructure/src/main/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSource.java +++ b/infrastructure/src/main/java/org/springframework/batch/io/driving/SingleKeySqlDrivingQueryInputSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.io.sql; +package org.springframework.batch.io.driving; import java.util.ArrayList; import java.util.List; diff --git a/infrastructure/src/main/java/org/springframework/batch/io/orm/ibatis/IbatisDrivingQueryInputSource.java b/infrastructure/src/main/java/org/springframework/batch/io/orm/ibatis/IbatisDrivingQueryInputSource.java index d3beb2d6e..e3c66ee64 100644 --- a/infrastructure/src/main/java/org/springframework/batch/io/orm/ibatis/IbatisDrivingQueryInputSource.java +++ b/infrastructure/src/main/java/org/springframework/batch/io/orm/ibatis/IbatisDrivingQueryInputSource.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Properties; import org.springframework.batch.io.InputSource; -import org.springframework.batch.io.sql.SingleKeySqlDrivingQueryInputSource; +import org.springframework.batch.io.driving.SingleKeySqlDrivingQueryInputSource; import org.springframework.batch.io.support.AbstractDrivingQueryInputSource; import org.springframework.batch.restart.GenericRestartData; import org.springframework.batch.restart.RestartData; diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSourceIntegrationTests.java b/infrastructure/src/test/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSourceIntegrationTests.java index 4d4cfb5b0..141e78be6 100644 --- a/infrastructure/src/test/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSourceIntegrationTests.java +++ b/infrastructure/src/test/java/org/springframework/batch/io/sql/CompositeKeySqlDrivingQueryInputSourceIntegrationTests.java @@ -22,6 +22,8 @@ import java.util.List; import java.util.Properties; import org.springframework.batch.io.InputSource; +import org.springframework.batch.io.driving.CompositeKeySqlDrivingQueryInputSource; +import org.springframework.batch.io.driving.RestartDataConverter; import org.springframework.batch.restart.GenericRestartData; import org.springframework.batch.restart.RestartData; import org.springframework.jdbc.core.RowMapper; diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSourceIntegrationTests.java b/infrastructure/src/test/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSourceIntegrationTests.java index 647d9177a..7f21d203b 100644 --- a/infrastructure/src/test/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSourceIntegrationTests.java +++ b/infrastructure/src/test/java/org/springframework/batch/io/sql/SingleKeySqlDrivingQueryInputSourceIntegrationTests.java @@ -1,7 +1,7 @@ package org.springframework.batch.io.sql; import org.springframework.batch.io.InputSource; -import org.springframework.batch.io.sql.SingleKeySqlDrivingQueryInputSource; +import org.springframework.batch.io.driving.SingleKeySqlDrivingQueryInputSource; public class SingleKeySqlDrivingQueryInputSourceIntegrationTests extends AbstractSqlInputSourceIntegrationTests { diff --git a/infrastructure/src/test/java/org/springframework/batch/io/sql/SqlCursorInputSourceIntegrationTests.java b/infrastructure/src/test/java/org/springframework/batch/io/sql/SqlCursorInputSourceIntegrationTests.java index d4446e607..361961820 100644 --- a/infrastructure/src/test/java/org/springframework/batch/io/sql/SqlCursorInputSourceIntegrationTests.java +++ b/infrastructure/src/test/java/org/springframework/batch/io/sql/SqlCursorInputSourceIntegrationTests.java @@ -1,6 +1,7 @@ package org.springframework.batch.io.sql; import org.springframework.batch.io.InputSource; +import org.springframework.batch.io.cursor.SqlCursorInputSource; /** * Tests for {@link SqlCursorInputSource}