You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2014/03/13 12:09:16 UTC
svn commit: r1577110 - in /cayenne/main/trunk/cayenne-server/src:
main/java/org/apache/cayenne/access/
main/java/org/apache/cayenne/access/jdbc/
main/java/org/apache/cayenne/access/jdbc/reader/
main/java/org/apache/cayenne/configuration/server/ test/ja...
Author: aadamchik
Date: Thu Mar 13 11:09:15 2014
New Revision: 1577110
URL: http://svn.apache.org/r1577110
Log:
CAY-1907 RowReaderFactory
creating a separate package for RowReader and friends
Added:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/BaseRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/CompoundRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/CompoundRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DataRowPostProcessor.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DefaultRowReaderFactory.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/EntityRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/FullRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/IdRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/IdRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareEntityRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareEntityRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReaderFactory.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java
- copied, changed from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ScalarRowReader.java
Removed:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/CompoundRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DefaultRowReaderFactory.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/FullRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/IdRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareEntityRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareRowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReader.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReaderFactory.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ScalarRowReader.java
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BindDirectiveTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/DataNode.java Thu Mar 13 11:09:15 2014
@@ -37,8 +37,8 @@ import org.apache.cayenne.access.dbsync.
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
import org.apache.cayenne.access.jdbc.RowDescriptor;
-import org.apache.cayenne.access.jdbc.RowReader;
-import org.apache.cayenne.access.jdbc.RowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.log.JdbcEventLogger;
import org.apache.cayenne.log.NoopJdbcEventLogger;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseSQLAction.java Thu Mar 13 11:09:15 2014
@@ -25,6 +25,7 @@ import java.util.List;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.OperationObserver;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
import org.apache.cayenne.query.Query;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.SQLAction;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java Thu Mar 13 11:09:15 2014
@@ -33,6 +33,7 @@ import org.apache.cayenne.ResultIterator
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.OperationObserver;
import org.apache.cayenne.access.OptimisticLockException;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
import org.apache.cayenne.access.trans.BatchQueryBuilder;
import org.apache.cayenne.dba.TypesMapping;
import org.apache.cayenne.log.JdbcEventLogger;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/JDBCResultIterator.java Thu Mar 13 11:09:15 2014
@@ -29,6 +29,7 @@ import java.util.NoSuchElementException;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.ResultIterator;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
import org.apache.cayenne.util.ResultIteratorIterator;
/**
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java Thu Mar 13 11:09:15 2014
@@ -37,6 +37,7 @@ import org.apache.cayenne.DataRow;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.OperationObserver;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.TypesMapping;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SelectAction.java Thu Mar 13 11:09:15 2014
@@ -29,6 +29,7 @@ import org.apache.cayenne.DataRow;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.OperationObserver;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
import org.apache.cayenne.access.trans.SelectTranslator;
import org.apache.cayenne.query.PrefetchProcessor;
import org.apache.cayenne.query.PrefetchTreeNode;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/BaseRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/BaseRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/BaseRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BaseRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/BaseRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.QueryMetadata;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/CompoundRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/CompoundRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/CompoundRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/CompoundRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/CompoundRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/CompoundRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/CompoundRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DataRowPostProcessor.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DataRowPostProcessor.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DataRowPostProcessor.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DataRowPostProcessor.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DataRowPostProcessor.java Thu Mar 13 11:09:15 2014
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import java.util.Collection;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DefaultRowReaderFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DefaultRowReaderFactory.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/DefaultRowReaderFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/DefaultRowReaderFactory.java Thu Mar 13 11:09:15 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,7 +26,9 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.jdbc.DataRowPostProcessor.ColumnOverride;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
+import org.apache.cayenne.access.jdbc.reader.DataRowPostProcessor.ColumnOverride;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.dba.TypesMapping;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/EntityRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/EntityRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/EntityRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/EntityRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/EntityRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.query.EntityResultSegment;
import org.apache.cayenne.reflect.ClassDescriptor;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/FullRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/FullRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/FullRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/FullRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.util.Util;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/IdRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/IdRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/IdRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/IdRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/IdRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/IdRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/IdRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,12 +16,14 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.DataRow;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.query.QueryMetadata;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareEntityRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareEntityRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareEntityRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareEntityRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareEntityRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareEntityRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareEntityRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import org.apache.cayenne.DataRow;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.map.EntityInheritanceTree;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.EntityResultSegment;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/InheritanceAwareRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/InheritanceAwareRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import org.apache.cayenne.DataRow;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.map.EntityInheritanceTree;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.query.QueryMetadata;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReader.java Thu Mar 13 11:09:15 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReaderFactory.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReaderFactory.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/RowReaderFactory.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/RowReaderFactory.java Thu Mar 13 11:09:15 2014
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.util.Map;
+import org.apache.cayenne.access.jdbc.ColumnDescriptor;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.query.QueryMetadata;
Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java (from r1577108, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ScalarRowReader.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ScalarRowReader.java&r1=1577108&r2=1577110&rev=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/ScalarRowReader.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/reader/ScalarRowReader.java Thu Mar 13 11:09:15 2014
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne.access.jdbc.reader;
import java.sql.ResultSet;
import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.jdbc.RowDescriptor;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.query.ScalarResultSegment;
import org.apache.cayenne.util.Util;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/DataDomainProvider.java Thu Mar 13 11:09:15 2014
@@ -30,7 +30,7 @@ import org.apache.cayenne.access.DataDom
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.dbsync.SchemaUpdateStrategy;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
-import org.apache.cayenne.access.jdbc.RowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.cache.NestedQueryCache;
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.ConfigurationTree;
Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java (original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModule.java Thu Mar 13 11:09:15 2014
@@ -29,8 +29,8 @@ import org.apache.cayenne.access.dbsync.
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
import org.apache.cayenne.access.jdbc.DefaultBatchQueryBuilderFactory;
-import org.apache.cayenne.access.jdbc.DefaultRowReaderFactory;
-import org.apache.cayenne.access.jdbc.RowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.DefaultRowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.access.types.BigDecimalType;
import org.apache.cayenne.access.types.BigIntegerType;
import org.apache.cayenne.access.types.BooleanType;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionLockingTest.java Thu Mar 13 11:09:15 2014
@@ -31,6 +31,7 @@ import java.util.Map;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.MockOperationObserver;
import org.apache.cayenne.access.OptimisticLockException;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.access.trans.DeleteBatchQueryBuilder;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.dba.JdbcAdapter;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BatchActionTest.java Thu Mar 13 11:09:15 2014
@@ -22,6 +22,7 @@ package org.apache.cayenne.access.jdbc;
import static org.mockito.Mockito.mock;
import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.di.AdhocObjectFactory;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BindDirectiveTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BindDirectiveTest.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BindDirectiveTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/BindDirectiveTest.java Thu Mar 13 11:09:15 2014
@@ -35,6 +35,7 @@ import org.apache.cayenne.DataRow;
import org.apache.cayenne.ObjectContext;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.MockOperationObserver;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.dba.oracle.OracleAdapter;
import org.apache.cayenne.di.Inject;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/JDBCResultIteratorTest.java Thu Mar 13 11:09:15 2014
@@ -28,6 +28,8 @@ import java.util.Collections;
import junit.framework.TestCase;
import org.apache.cayenne.DataRow;
+import org.apache.cayenne.access.jdbc.reader.DefaultRowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.RowReader;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.map.ObjAttribute;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/jdbc/ResultDirectiveTest.java Thu Mar 13 11:09:15 2014
@@ -29,6 +29,7 @@ import java.util.Map;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.MockOperationObserver;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.configuration.server.ServerRuntime;
import org.apache.cayenne.dba.JdbcAdapter;
import org.apache.cayenne.di.Inject;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/configuration/server/DataDomainProviderTest.java Thu Mar 13 11:09:15 2014
@@ -34,7 +34,7 @@ import org.apache.cayenne.access.dbsync.
import org.apache.cayenne.access.dbsync.ThrowOnPartialOrCreateSchemaStrategy;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
import org.apache.cayenne.access.jdbc.DefaultBatchQueryBuilderFactory;
-import org.apache.cayenne.access.jdbc.RowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.ashwood.AshwoodEntitySorter;
import org.apache.cayenne.cache.QueryCache;
import org.apache.cayenne.configuration.ConfigurationNameMapper;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/SchemaBuilder.java Thu Mar 13 11:09:15 2014
@@ -37,7 +37,7 @@ import org.apache.cayenne.access.DataNod
import org.apache.cayenne.access.DbGenerator;
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
import org.apache.cayenne.access.jdbc.DefaultBatchQueryBuilderFactory;
-import org.apache.cayenne.access.jdbc.DefaultRowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.DefaultRowReaderFactory;
import org.apache.cayenne.ashwood.AshwoodEntitySorter;
import org.apache.cayenne.cache.MapQueryCache;
import org.apache.cayenne.dba.DbAdapter;
Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java?rev=1577110&r1=1577109&r2=1577110&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java (original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/ServerCaseDataDomainProvider.java Thu Mar 13 11:09:15 2014
@@ -23,7 +23,7 @@ import org.apache.cayenne.access.DataNod
import org.apache.cayenne.access.UnitTestDomain;
import org.apache.cayenne.access.dbsync.SkipSchemaUpdateStrategy;
import org.apache.cayenne.access.jdbc.BatchQueryBuilderFactory;
-import org.apache.cayenne.access.jdbc.RowReaderFactory;
+import org.apache.cayenne.access.jdbc.reader.RowReaderFactory;
import org.apache.cayenne.configuration.server.DataDomainProvider;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.di.Inject;