Author: aadamchik
Date: Sun Nov 17 09:05:20 2013
New Revision: 1542663
URL: http://svn.apache.org/r1542663
Log:
cleaning up cross-layer dependencies
Added:
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CollectionResultIterator.java
- copied, changed from r1542660,
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/access/jdbc/CollectionResultIterator.java
Removed:
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/access/jdbc/CollectionResultIterator.java
Modified:
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CayenneContext.java
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
Modified:
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CayenneContext.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CayenneContext.java?rev=1542663&r1=1542662&r2=1542663&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CayenneContext.java
(original)
+++
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CayenneContext.java
Sun Nov 17 09:05:20 2013
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.cayenne.access.jdbc.CollectionResultIterator;
import org.apache.cayenne.event.EventManager;
import org.apache.cayenne.graph.CompoundDiff;
import org.apache.cayenne.graph.GraphDiff;
Copied:
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CollectionResultIterator.java
(from r1542660,
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/access/jdbc/CollectionResultIterator.java)
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CollectionResultIterator.java?p2=cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CollectionResultIterator.java&p1=cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/access/jdbc/CollectionResultIterator.java&r1=1542660&r2=1542663&rev=1542663&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/access/jdbc/CollectionResultIterator.java
(original)
+++
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/CollectionResultIterator.java
Sun Nov 17 09:05:20 2013
@@ -16,21 +16,19 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.access.jdbc;
+package org.apache.cayenne;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import org.apache.cayenne.ResultIterator;
-
/**
* A ResultIterator over a collection of objects.
*
* @since 3.2
*/
-public class CollectionResultIterator<T> implements ResultIterator<T> {
+class CollectionResultIterator<T> implements ResultIterator<T> {
protected Iterator<T> iterator;
Modified:
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java?rev=1542663&r1=1542662&r2=1542663&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
(original)
+++
cayenne/main/trunk/cayenne-core/src/main/java/org/apache/cayenne/configuration/CayenneRuntime.java
Sun Nov 17 09:05:20 2013
@@ -22,7 +22,6 @@ import java.util.Collection;
import org.apache.cayenne.DataChannel;
import org.apache.cayenne.ObjectContext;
-import org.apache.cayenne.configuration.web.CayenneFilter;
import org.apache.cayenne.di.BeforeScopeEnd;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
@@ -51,11 +50,6 @@ public abstract class CayenneRuntime {
/**
* Binds a DI {@link Injector} bound to the current thread. It is primarily
* intended for deserialization of ObjectContexts.
- * <p>
- * {@link CayenneFilter} will automatically bind the right injector to each
- * request thread. If you are not using CayenneFilter, your application is
- * responsible for calling this method at appropriate points of the
- * lifecycle.
*
* @since 3.1
*/
