cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r423749 [1/4] - in /incubator/cayenne/main/trunk/cayenne/cayenne-java/src: cayenne/java/org/apache/cayenne/ cayenne/java/org/apache/cayenne/access/ cayenne/java/org/apache/cayenne/access/event/ cayenne/java/org/apache/cayenne/access/jdbc/ c...
Date Thu, 20 Jul 2006 04:04:10 GMT
Author: aadamchik
Date: Wed Jul 19 21:04:04 2006
New Revision: 423749

URL: http://svn.apache.org/viewvc?rev=423749&view=rev
Log:
killing deprecated API

Removed:
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/TempObjectId.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DefaultResultIterator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DeleteDenyException.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SQLSelectStatement.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/InsertTranslator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/SelectQueryTranslator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/BatchQueryUtils.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/ConnectionEventLogger.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/ContextCommitObserver.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DataNodeCommitHelper.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DependencySorter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/PrefetchHelper.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/PrimaryKeyHelper.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/QueryUtils.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/ResultDescriptor.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/SelectObserver.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/BasicServletConfiguration.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/WebApplicationContextProvider.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/WebApplicationListener.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/oracle/OracleDataNode.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/ASTCompiler.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/ASTNode.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/ASTStack.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/BinaryExpression.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/ListExpression.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/TernaryExpression.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/UnaryExpression.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/gen/AbsFileResourceLoader.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/DataMapException.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapObject.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/GenericSelectQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/InsertQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/util/AbstractHandler.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/util/PropertyComparator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/QueryResultTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/trans/InsertTranslatorTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/util/BatchQueryUtilsTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/util/PrefetchHelperTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/util/SelectObserverTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/conf/WebApplicationContextProviderTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/conf/WebApplicationListenerTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/exp/BinaryExpressionTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/exp/ListExpressionTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/exp/TernaryExpressionTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/exp/UnaryExpressionTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/query/PrefetchSelectQueryQualifiedEntityTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/query/PrefetchSelectQueryTst.java
Modified:
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/CayenneDataObject.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataObject.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataRow.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/ObjectId.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContext.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDelegate.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomain.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainFlushObserver.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainQueryAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNode.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNodeQueryAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataRowStore.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/NoopDelegate.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ObjectStore.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OperationHints.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OptimisticLockException.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryEngine.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryLogger.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryTranslator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ToManyList.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/Transaction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/event/SnapshotEvent.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/ColumnDescriptor.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SQLTemplateProcessor.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/SelectAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/jdbc/UpdateAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/BatchQueryBuilder.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/ProcedureTranslator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/QualifierTranslator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/trans/SelectTranslator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/util/DefaultOperationObserver.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/Configuration.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DBCPDataSourceFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DataSourceFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/conf/RuntimeLoadDelegate.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/AutoAdapter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/DbAdapter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcAdapter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/JdbcPkGenerator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/PkGenerator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/sqlserver/SQLServerProcedureAction.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridge.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/EventBridgeFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JMSBridgeFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/JavaGroupsBridgeFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/event/XMPPBridgeFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/exp/Expression.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/gen/ClassGenerator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/gen/DefaultClassGenerator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/gen/MapClassGenerator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/AshwoodEntitySorter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/DataMap.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/EntityResolver.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/MapLoader.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/ObjAttribute.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/ObjEntity.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/ProcedureParameter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/map/QueryBuilder.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/ApplicationProject.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/Project.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/project/validator/SQLTemplateValidator.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/AbstractQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/BatchQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/IndirectQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/InvalidateListCacheQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/ObjectIdQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/PrefetchSelectQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/ProcedureQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/Query.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/QueryChain.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/SQLTemplate.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/query/SelectQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/IncrementalQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/remote/RangeQuery.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/util/NameConverter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/util/Util.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/PreferencesDataSourceFactory.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/pref/HSQLEmbeddedPreferenceService.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/CayenneDataObjectInCtxtTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/ObjectIdTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/DataContextDelegateTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/DataContextObjectTrackingTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/DataContextTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/MockDataContextDelegate.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/MockOperationObserver.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/OptimisticLockingTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/UnitTestDomain.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/access/trans/SelectTranslatorTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/dba/JdbcAdapterTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/dba/MockDbAdapter.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/event/EventBridgeTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/event/JGroupsBridgeFactoryTst.java
    incubator/cayenne/main/trunk/cayenne/cayenne-java/src/tests/java/org/apache/cayenne/query/MockQuery.java

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/CayenneDataObject.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/CayenneDataObject.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/CayenneDataObject.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/CayenneDataObject.java Wed Jul 19 21:04:04 2006
@@ -52,7 +52,7 @@
  * A default implementation of DataObject interface. It is normally used as a superclass
  * of Cayenne persistent objects.
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public class CayenneDataObject implements DataObject, Validating, XMLSerializable {
 
@@ -185,16 +185,6 @@
         }
 
         return object;
-    }
-
-    /**
-     * @since 1.1
-     * @deprecated since 1.2 use 'getObjectContext().prepareForAccess(object)'
-     */
-    public void resolveFault() {
-        if (objectContext != null) {
-            objectContext.prepareForAccess(this, null);
-        }
     }
 
     public Object readProperty(String propName) {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataObject.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataObject.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataObject.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataObject.java Wed Jul 19 21:04:04 2006
@@ -24,7 +24,7 @@
 /**
  * Defines basic methods for a persistent object in Cayenne.
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public interface DataObject extends Persistent {
 
@@ -156,13 +156,4 @@
      * @since 1.1
      */
     public void setSnapshotVersion(long snapshotVersion);
-
-    /**
-     * Initializes object with data from cache or from the database, if this object is not
-     * fully resolved.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 use 'getObjectContext().prepareForAccess(object)'
-     */
-    public void resolveFault();
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataRow.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataRow.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataRow.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/DataRow.java Wed Jul 19 21:04:04 2006
@@ -129,28 +129,6 @@
         return createObjectId(entity.getName(), entity.getDbEntity());
     }
 
-    /**
-     * @deprecated since 1.2, as new portable ObjectIds can't store Java Class and store
-     *             entity name instead. Now this method relies on default CayenneModeler
-     *             naming convention to figure out entity name from class name. This may
-     *             not work if the classes where mapped differently.
-     */
-    public ObjectId createObjectId(Class objectClass, DbEntity entity) {
-        return createObjectId(ObjectId.entityNameFromClass(objectClass), entity);
-    }
-
-    /**
-     * @deprecated since 1.2, as new portable ObjectIds can't store Java Class and store
-     *             entity name instead. Now this method relies on default CayenneModeler
-     *             naming convention to figure out entity name from class name. This may
-     *             not work if the classes where mapped differently.
-     */
-    public ObjectId createTargetObjectId(Class targetClass, DbRelationship relationship) {
-        return createTargetObjectId(
-                ObjectId.entityNameFromClass(targetClass),
-                relationship);
-    }
-
     // TODO: andrus, 5/25/2006 - deprecate this method - it is unused
     public ObjectId createObjectId(String entityName, DbEntity entity) {
         return createObjectId(entityName, entity, null);

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/ObjectId.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/ObjectId.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/ObjectId.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/ObjectId.java Wed Jul 19 21:04:04 2006
@@ -26,10 +26,10 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.cayenne.util.IDUtil;
 import org.apache.cayenne.util.Util;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * A portable global identifier for persistent objects. ObjectId can be temporary (used
@@ -44,10 +44,9 @@
 
     protected String entityName;
     protected Map objectIdKeys;
-    
+
     private String singleKey;
-    private Object singleValue; 
-    
+    private Object singleValue;
 
     protected byte[] key;
 
@@ -56,24 +55,6 @@
     // hash code is transient to make sure id is portable across VM
     transient int hashCode;
 
-    /**
-     * Converts class to the entity name using default naming convention used by the
-     * Modeler. I.e. package name stripped from class. A utility method simplifying
-     * migration from class-based ObjectIds to the entity-based.
-     * 
-     * @since 1.2
-     * @deprecated since 1.2
-     */
-    static final String entityNameFromClass(Class javaClass) {
-        if (javaClass == null) {
-            return null;
-        }
-
-        String fqn = javaClass.getName();
-        int dot = fqn.lastIndexOf('.');
-        return dot > 0 ? fqn.substring(dot + 1) : fqn;
-    }
-
     // exists for deserialization with Hessian and similar
     private ObjectId() {
     }
@@ -145,46 +126,6 @@
         }
     }
 
-    /**
-     * @deprecated since 1.2, as new portable ObjectIds can't store Java Class and store
-     *             entity name instead. This constructor relies on default CayenneModeler
-     *             naming convention to figure out entity name from class name. This may
-     *             not work if the classes where mapped differently.
-     */
-    public ObjectId(Class objectClass) {
-        this(entityNameFromClass(objectClass));
-    }
-
-    /**
-     * @deprecated since 1.2, as new portable ObjectIds can't store Java Class and store
-     *             entity name instead. This constructor relies on default CayenneModeler
-     *             naming convention to figure out entity name from class name. This may
-     *             not work if the classes where mapped differently.
-     */
-    public ObjectId(Class objectClass, String keyName, int id) {
-        this(entityNameFromClass(objectClass), keyName, new Integer(id));
-    }
-
-    /**
-     * @deprecated since 1.2, as new portable ObjectIds can't store Java Class and store
-     *             entity name instead. This constructor relies on default CayenneModeler
-     *             naming convention to figure out entity name from class name. This may
-     *             not work if the classes where mapped differently.
-     */
-    public ObjectId(Class objectClass, String keyName, Object id) {
-        this(entityNameFromClass(objectClass), keyName, id);
-    }
-
-    /**
-     * @deprecated since 1.2, as new portable ObjectIds can't store Java Class and store
-     *             entity name instead. This constructor relies on default CayenneModeler
-     *             naming convention to figure out entity name from class name. This may
-     *             not work if the classes where mapped differently.
-     */
-    public ObjectId(Class objectClass, Map idKeys) {
-        this(entityNameFromClass(objectClass), idKeys);
-    }
-
     public boolean isTemporary() {
         return key != null;
     }
@@ -201,20 +142,6 @@
     }
 
     /**
-     * @deprecated since 1.2
-     */
-    protected void setIdKeys(Map idKeys) {
-        if (idKeys != null && idKeys.size() == 1) {
-            Map.Entry e = (Map.Entry) idKeys.entrySet().iterator().next();
-            this.singleKey = String.valueOf(e.getKey());
-            this.singleValue = e.getValue();
-        }
-        else {
-            this.objectIdKeys = idKeys;
-        }
-    }
-
-    /**
      * Returns an unmodifiable Map of persistent id values, essentailly a primary key map.
      * For temporary id returns replacement id, if it was already created. Otherwise
      * returns an empty map.
@@ -225,25 +152,15 @@
                     .unmodifiableMap(replacementIdMap);
         }
 
-        if(singleKey != null) {
+        if (singleKey != null) {
             return Collections.singletonMap(singleKey, singleValue);
         }
-        
+
         return objectIdKeys != null
                 ? Collections.unmodifiableMap(objectIdKeys)
                 : Collections.EMPTY_MAP;
     }
 
-    /**
-     * Returns a value of id attribute identified by the name of DbAttribute.
-     * 
-     * @deprecated since 1.2. This method is redundant. Use
-     *             <code>getIdSnapshot().get(attrName)</code> instead.
-     */
-    public Object getValueForAttribute(String attrName) {
-        return getIdSnapshot().get(attrName);
-    }
-
     public boolean equals(Object object) {
         if (this == object) {
             return true;
@@ -297,7 +214,7 @@
 
         return true;
     }
-    
+
     private final boolean valueEquals(Object o1, Object o2) {
         if (o1 == o2) {
             return true;
@@ -329,7 +246,7 @@
             if (key != null) {
                 builder.append(key);
             }
-            else if(singleKey != null) {
+            else if (singleKey != null) {
                 builder.append(singleKey.hashCode());
 
                 // must reconcile all possible numeric types
@@ -372,33 +289,6 @@
         }
 
         return hashCode;
-    }
-
-    /**
-     * Returns a replacement ObjectId associated with this id. Replacement ObjectId is
-     * either a permananent ObjectId for an uncommitted object or a new id for object
-     * whose id depends on its relationships.
-     * 
-     * @deprecated Since 1.2 replacement id is built by appending to replacementIdMap.
-     */
-    public ObjectId getReplacementId() {
-        return (isReplacementIdAttached()) ? createReplacementId() : null;
-    }
-
-    /**
-     * Initializes a replacement ObjectId.
-     * 
-     * @deprecated Since 1.2 replacement id is built by appending to replacementIdMap.
-     */
-    public void setReplacementId(ObjectId replacementId) {
-        if (replacementId == null) {
-            replacementIdMap = null;
-        }
-        else {
-            Map map = getReplacementIdMap();
-            map.clear();
-            map.putAll(replacementId.getIdSnapshot());
-        }
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContext.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContext.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContext.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContext.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import java.io.IOException;
@@ -32,7 +31,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataChannel;
@@ -56,7 +54,6 @@
 import org.apache.cayenne.graph.GraphDiff;
 import org.apache.cayenne.graph.GraphEvent;
 import org.apache.cayenne.graph.GraphManager;
-import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbJoin;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.EntityResolver;
@@ -70,10 +67,8 @@
 import org.apache.cayenne.property.SingleObjectArcProperty;
 import org.apache.cayenne.query.NamedQuery;
 import org.apache.cayenne.query.ObjectIdQuery;
-import org.apache.cayenne.query.PrefetchTreeNode;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.QueryMetadata;
-import org.apache.cayenne.query.SelectQuery;
 import org.apache.cayenne.util.EventUtil;
 import org.apache.cayenne.util.GenericResponse;
 import org.apache.cayenne.util.Util;
@@ -109,7 +104,7 @@
  * 
  * @author Andrus Adamchik
  */
-public class DataContext implements ObjectContext, DataChannel, QueryEngine, Serializable {
+public class DataContext implements ObjectContext, DataChannel, Serializable {
 
     // DataContext events
     public static final EventSubject WILL_COMMIT = EventSubject.getSubject(
@@ -257,22 +252,6 @@
     }
 
     /**
-     * Creates a DataContext with parent QueryEngine and a DataRowStore that should be
-     * used by the ObjectStore.
-     * 
-     * @since 1.1
-     * @param parent parent QueryEngine used to communicate with the data source.
-     * @param objectStore ObjectStore used by DataContext.
-     * @deprecated since 1.2 - use {@link #DataContext(DataChannel, ObjectStore)}
-     *             constructor instead. Note that DataDomain is both a DataChannel and a
-     *             QueryEngine, so you may need to do a cast:
-     *             <code>new DataContext((DataChannel) domain, objectStore)</code>.
-     */
-    public DataContext(QueryEngine parent, ObjectStore objectStore) {
-        this((DataChannel) parent, objectStore);
-    }
-
-    /**
      * Creates a new DataContext with parent DataChannel and ObjectStore.
      * 
      * @since 1.2
@@ -352,31 +331,6 @@
     }
 
     /**
-     * Returns parent QueryEngine object. In most cases returned object is an instance of
-     * DataDomain.
-     * 
-     * @deprecated since 1.2. Use 'getParentDataDomain()' or 'getChannel()' instead.
-     */
-    public QueryEngine getParent() {
-        return getParentDataDomain();
-    }
-
-    /**
-     * Sets direct parent of this DataContext.
-     * 
-     * @deprecated since 1.2, use setChannel instead.
-     */
-    public void setParent(QueryEngine parent) {
-        if (parent == null || parent instanceof DataChannel) {
-            setChannel((DataChannel) parent);
-        }
-        else {
-            throw new CayenneRuntimeException(
-                    "Only parents that implement DataChannel are supported.");
-        }
-    }
-
-    /**
      * Returns parent DataChannel, that is normally a DataDomain or another DataContext.
      * 
      * @since 1.2
@@ -546,28 +500,6 @@
     }
 
     /**
-     * Returns an object for a given ObjectId. When an object is not yet registered with
-     * this context's ObjectStore, the behavior of this method depends on whether ObjectId
-     * is permanent or temporary and whether a DataContext is a part of a nested context
-     * hierarchy or not. More specifically the following rules are applied in order:
-     * <ul>
-     * <li>If a matching registered object is found in this DataContext, it is
-     * immediately returned.</li>
-     * <li>If a context is nested (i.e. it has another DataContext as its parent
-     * channel), an attempt is made to locate a registered object up the hierarchy chain,
-     * until it is found. Such object is transferred to this DataContext and returned to
-     * the caller.</li>
-     * <li>If the ObjectId is temporary, null is returned; if it is permanent, a HOLLOW
-     * object (aka fault) is created and returned.</li>
-     * </ul>
-     * 
-     * @deprecated since 1.2 use 'localObject(id, null)'
-     */
-    public DataObject registeredObject(ObjectId id) {
-        return (DataObject) localObject(id, null);
-    }
-
-    /**
      * Returns a DataRow reflecting current, possibly uncommitted, object state.
      * <p>
      * <strong>Warning:</strong> This method will return a partial snapshot if an object
@@ -677,38 +609,6 @@
     }
 
     /**
-     * Creates a list of DataObjects local to this DataContext from a list of DataObjects
-     * coming from a different DataContext. This method is a way to <b>map</b> objects
-     * from one context into the other (as opposed to "synchronize"). This means that the
-     * state of modified objects will be reflected only if this context is a child of an
-     * original DataObject context. If it is a peer or parent, you won't see any
-     * uncommitted changes from the original context.
-     * <p>
-     * Note that the objects in the list do not have to be of the same type or even from
-     * the same DataContext.
-     * 
-     * @since 1.0.3
-     * @deprecated since 1.2 - use {@link #localObject(ObjectId, Persistent)} to specify
-     *             how each local object should be handled.
-     */
-    public List localObjects(List objects) {
-        List localObjects = new ArrayList(objects.size());
-
-        Iterator it = objects.iterator();
-        while (it.hasNext()) {
-            DataObject object = (DataObject) it.next();
-
-            if (object == null) {
-                throw new CayenneRuntimeException("Null object");
-            }
-
-            localObjects.add(localObject(object.getObjectId(), null));
-        }
-
-        return localObjects;
-    }
-
-    /**
      * Converts a list of data rows to a list of DataObjects.
      * 
      * @since 1.1
@@ -1049,24 +949,6 @@
     }
 
     /**
-     * Returns a DataNode that should handle queries for all DataMap components.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 DataContext's QueryEngine implementation is replaced by
-     *             DataChannel. Use "getParentDataDomain().lookupDataNode(..)".
-     */
-    public DataNode lookupDataNode(DataMap dataMap) {
-
-        DataDomain domain = getParentDataDomain();
-        if (domain == null) {
-            throw new CayenneRuntimeException(
-                    "DataContext is not attached to a DataDomain ");
-        }
-
-        return domain.lookupDataNode(dataMap);
-    }
-
-    /**
      * If the parent channel is a DataContext, reverts local changes to make this context
      * look like the parent, if the parent channel is a DataDomain, reverts all changes.
      * 
@@ -1115,13 +997,6 @@
     }
 
     /**
-     * @deprecated Since 1.2, use {@link #commitChanges()} instead.
-     */
-    public void commitChanges(Level logLevel) throws CayenneRuntimeException {
-        commitChanges();
-    }
-
-    /**
      * Synchronizes object graph with the database. Executes needed insert, update and
      * delete queries (generated internally).
      */
@@ -1366,12 +1241,6 @@
             return new ArrayList(1);
         }
 
-        // this filter should go away when we remove deprecated api from the Delegate.
-        query = filterThroughDelegateDeprecated(query);
-        if (query == null) {
-            return new ArrayList(1);
-        }
-
         List result = onQuery(this, query).firstList();
         return result != null ? result : new ArrayList(1);
     }
@@ -1418,123 +1287,6 @@
     }
 
     /**
-     * Executes all queries in collection.
-     * 
-     * @deprecated since 1.2 DataContext's QueryEngine implementation is replaced by
-     *             DataChannel.
-     */
-    public void performQueries(Collection queries, OperationObserver callback) {
-
-        // filter through the delegate
-
-        List finalQueries = new ArrayList(queries.size());
-
-        Iterator it = queries.iterator();
-        while (it.hasNext()) {
-            Query query = (Query) it.next();
-
-            query = filterThroughDelegateDeprecated(query);
-
-            if (query != null) {
-                finalQueries.add(query);
-            }
-        }
-
-        if (!finalQueries.isEmpty()) {
-            getParentDataDomain().performQueries(queries, callback);
-        }
-    }
-
-    /**
-     * @since 1.2
-     * @deprecated since 1.2
-     */
-    // deprecated code is extracted in a separate method to avoid Eclipse warnings...
-    Query filterThroughDelegateDeprecated(Query query) {
-        if (query instanceof org.apache.cayenne.query.GenericSelectQuery) {
-            org.apache.cayenne.query.GenericSelectQuery genericSelect = (org.apache.cayenne.query.GenericSelectQuery) query;
-            return nonNullDelegate().willPerformSelect(this, genericSelect);
-        }
-        return query;
-    }
-
-    /**
-     * Binds provided transaction to the current thread, and then runs queries.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2. Use Transaction.bindThreadTransaction(..) to provide custom
-     *             transactions, besides DataContext's QueryEngine implementation is
-     *             replaced by DataChannel.
-     */
-    public void performQueries(
-            Collection queries,
-            OperationObserver callback,
-            Transaction transaction) {
-
-        Transaction.bindThreadTransaction(transaction);
-
-        try {
-            performQueries(queries, callback);
-        }
-        finally {
-            Transaction.bindThreadTransaction(null);
-        }
-    }
-
-    /**
-     * Performs prefetching. Prefetching would resolve a set of relationships for a list
-     * of DataObjects in the most optimized way (preferrably in a single query per
-     * relationship).
-     * <p>
-     * <i>WARNING: Currently supports only "one-step" to one relationships. This is an
-     * arbitrary limitation and will be removed eventually. </i>
-     * </p>
-     * 
-     * @deprecated Since 1.2. This is a utility method that handles a very specific case.
-     *             It shouldn't be in DataContext.
-     */
-    public void prefetchRelationships(SelectQuery query, List objects) {
-        QueryMetadata metadata = query.getMetaData(getEntityResolver());
-        Collection prefetches = metadata.getPrefetchTree() != null ? query
-                .getPrefetchTree()
-                .nonPhantomNodes() : Collections.EMPTY_LIST;
-
-        if (objects == null || objects.size() == 0 || prefetches.size() == 0) {
-            return;
-        }
-
-        ObjEntity entity = metadata.getObjEntity();
-        Iterator prefetchesIt = prefetches.iterator();
-        while (prefetchesIt.hasNext()) {
-            PrefetchTreeNode prefetch = (PrefetchTreeNode) prefetchesIt.next();
-            String path = prefetch.getPath();
-            if (path.indexOf('.') >= 0) {
-                throw new CayenneRuntimeException("Only one-step relationships are "
-                        + "supported at the moment, this will be fixed soon. "
-                        + "Unsupported path : "
-                        + path);
-            }
-
-            ObjRelationship relationship = (ObjRelationship) entity.getRelationship(path);
-            if (relationship == null) {
-                throw new CayenneRuntimeException("Invalid relationship: " + path);
-            }
-
-            if (relationship.isToMany()) {
-                throw new CayenneRuntimeException(
-                        "Only to-one relationships are supported at the moment. "
-                                + "Can't prefetch to-many: "
-                                + path);
-            }
-
-            org.apache.cayenne.access.util.PrefetchHelper.resolveToOneRelations(
-                    this,
-                    objects,
-                    path);
-        }
-    }
-
-    /**
      * Returns a list of objects or DataRows for a named query stored in one of the
      * DataMaps. Internally Cayenne uses a caching policy defined in the named query. If
      * refresh flag is true, a refresh is forced no matter what the caching policy is.
@@ -1624,15 +1376,6 @@
      */
     public void setValidatingObjectsOnCommit(boolean flag) {
         this.validatingObjectsOnCommit = flag;
-    }
-
-    /**
-     * @deprecated since 1.2. Use 'getEntityResolver().getDataMaps()' instead.
-     */
-    public Collection getDataMaps() {
-        return (getEntityResolver() != null)
-                ? getEntityResolver().getDataMaps()
-                : Collections.EMPTY_LIST;
     }
 
     void fireWillCommit() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDelegate.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDelegate.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDelegate.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataContextDelegate.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import org.apache.cayenne.DataObject;
@@ -37,21 +36,6 @@
  * @since 1.1
  */
 public interface DataContextDelegate {
-
-    /**
-     * Invoked before a <code>GenericSelectQuery</code> is executed. The delegate may
-     * modify the <code>GenericSelectQuery</code> by returning a different
-     * <code>GenericSelectQuery</code>, or may return null to discard the query.
-     * 
-     * @return the original or modified <code>GenericSelectQuery</code> or null to
-     *         discard the query.
-     * @deprecated since 1.2 implement either
-     *             {@link #willPerformQuery(DataContext, Query)} or
-     *             {@link #willPerformGenericQuery(DataContext, Query)}.
-     */
-    org.apache.cayenne.query.GenericSelectQuery willPerformSelect(
-            DataContext context,
-            org.apache.cayenne.query.GenericSelectQuery query);
 
     /**
      * Invoked before a Query is executed via <em>DataContext.performQuery</em>. The

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomain.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomain.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomain.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomain.java Wed Jul 19 21:04:04 2006
@@ -628,31 +628,6 @@
     }
 
     /**
-     * @since 1.1
-     * @deprecated since 1.2, as the corresponding interface method is deprecated.
-     */
-    public void performQueries(
-            Collection queries,
-            OperationObserver callback,
-            Transaction transaction) {
-
-        if (queries.isEmpty()) {
-            return;
-        }
-
-        Transaction old = Transaction.getThreadTransaction();
-        Transaction.bindThreadTransaction(transaction);
-
-        try {
-            new DataDomainLegacyQueryAction(this, new QueryChain(queries), callback)
-                    .execute();
-        }
-        finally {
-            Transaction.bindThreadTransaction(old);
-        }
-    }
-
-    /**
      * Sets EntityResolver. If not set explicitly, DataDomain creates a default
      * EntityResolver internally on demand.
      * 
@@ -669,14 +644,6 @@
             // to it as they are added to the DataDomain
             entityResolver = new EntityResolver();
         }
-    }
-
-    /**
-     * @return PrimaryKeyHelper
-     * @deprecated unused since 1.2
-     */
-    public synchronized org.apache.cayenne.access.util.PrimaryKeyHelper getPrimaryKeyHelper() {
-        return new org.apache.cayenne.access.util.PrimaryKeyHelper(this);
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainFlushObserver.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainFlushObserver.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainFlushObserver.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainFlushObserver.java Wed Jul 19 21:04:04 2006
@@ -22,7 +22,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataRow;
@@ -137,13 +136,6 @@
     public void nextDataRows(Query q, ResultIterator it) {
         throw new UnsupportedOperationException(
                 "'nextDataRows(Query,ResultIterator)' is unsupported (and unexpected) on commit.");
-    }
-
-    /**
-     * @deprecated since 1.2, as super is also deprecated
-     */
-    public Level getLoggingLevel() {
-        return Level.INFO;
     }
 
     public boolean isIteratedResult() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainLegacyQueryAction.java Wed Jul 19 21:04:04 2006
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.query.Query;
@@ -34,12 +33,14 @@
 import org.apache.cayenne.query.QueryRouter;
 
 /**
- * DataDomain query action that relies on expernally provided OperationObserver to process
+ * DataDomain query action that relies on externally provided OperationObserver to process
  * the results.
  * 
  * @since 1.2
  * @author Andrus Adamchik
  */
+// TODO: andrus, 7/19/2006 - why is this public? should probably be deprecated and/or
+// removed.
 public class DataDomainLegacyQueryAction implements QueryRouter, OperationObserver {
 
     static final boolean DONE = true;
@@ -152,13 +153,6 @@
 
     public void nextGlobalException(Exception e) {
         callback.nextGlobalException(e);
-    }
-
-    /**
-     * @deprecated since 1.2, as corresponding interface method is deprecated too.
-     */
-    public Level getLoggingLevel() {
-        return callback.getLoggingLevel();
     }
 
     public boolean isIteratedResult() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainQueryAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainQueryAction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainQueryAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataDomainQueryAction.java Wed Jul 19 21:04:04 2006
@@ -27,8 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.Transformer;
-import org.apache.log4j.Level;
 import org.apache.cayenne.CayenneException;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataRow;
@@ -40,16 +38,17 @@
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.query.InvalidateListCacheQuery;
+import org.apache.cayenne.query.ObjectIdQuery;
 import org.apache.cayenne.query.PrefetchSelectQuery;
 import org.apache.cayenne.query.PrefetchTreeNode;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.QueryMetadata;
 import org.apache.cayenne.query.QueryRouter;
 import org.apache.cayenne.query.RelationshipQuery;
-import org.apache.cayenne.query.ObjectIdQuery;
 import org.apache.cayenne.util.GenericResponse;
 import org.apache.cayenne.util.ListResponse;
 import org.apache.cayenne.util.Util;
+import org.apache.commons.collections.Transformer;
 
 /**
  * Performs query routing and execution. During execution phase intercepts callbacks to
@@ -262,7 +261,7 @@
 
         return !DONE;
     }
-    
+
     /*
      * Wraps execution in shared cache checks
      */
@@ -480,13 +479,6 @@
 
     public void nextGlobalException(Exception e) {
         throw new CayenneRuntimeException("Global exception.", Util.unwindException(e));
-    }
-
-    /**
-     * @deprecated since 1.2, as corresponding interface method is deprecated too.
-     */
-    public Level getLoggingLevel() {
-        return QueryLogger.DEFAULT_LOG_LEVEL;
     }
 
     public boolean isIteratedResult() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNode.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNode.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNode.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNode.java Wed Jul 19 21:04:04 2006
@@ -17,13 +17,10 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import java.io.PrintWriter;
-import java.sql.CallableStatement;
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Collections;
@@ -34,23 +31,13 @@
 import javax.sql.DataSource;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.jdbc.BatchAction;
-import org.apache.cayenne.access.jdbc.ProcedureAction;
-import org.apache.cayenne.access.jdbc.RowDescriptor;
-import org.apache.cayenne.access.jdbc.SelectAction;
-import org.apache.cayenne.access.jdbc.UpdateAction;
-import org.apache.cayenne.access.trans.BatchQueryBuilder;
 import org.apache.cayenne.conn.PoolManager;
 import org.apache.cayenne.dba.DbAdapter;
-import org.apache.cayenne.dba.JdbcAdapter;
 import org.apache.cayenne.map.AshwoodEntitySorter;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.EntitySorter;
-import org.apache.cayenne.query.BatchQuery;
-import org.apache.cayenne.query.ProcedureQuery;
 import org.apache.cayenne.query.Query;
-import org.apache.cayenne.query.SelectQuery;
 
 /**
  * Describes a single physical data source. This can be a database server, LDAP server,
@@ -64,11 +51,6 @@
  */
 public class DataNode implements QueryEngine {
 
-    /**
-     * @deprecated since 1.2 unused.
-     */
-    public static final Class DEFAULT_ADAPTER_CLASS = JdbcAdapter.class;
-
     protected String name;
     protected DataSource dataSource;
     protected DbAdapter adapter;
@@ -202,25 +184,6 @@
     }
 
     /**
-     * @deprecated since 1.2 as the corresponding interface method is deprecated.
-     */
-    public void performQueries(
-            Collection queries,
-            OperationObserver observer,
-            Transaction transaction) {
-
-        Transaction old = Transaction.getThreadTransaction();
-        Transaction.bindThreadTransaction(transaction);
-
-        try {
-            performQueries(queries, observer);
-        }
-        finally {
-            Transaction.bindThreadTransaction(old);
-        }
-    }
-
-    /**
      * Runs queries using Connection obtained from internal DataSource.
      * 
      * @since 1.1
@@ -298,132 +261,6 @@
     }
 
     /**
-     * Executes a SelectQuery.
-     * 
-     * @deprecated since 1.2
-     */
-    protected void runSelect(
-            Connection connection,
-            Query query,
-            OperationObserver observer) throws SQLException, Exception {
-
-        new SelectAction((SelectQuery) query, getAdapter(), getEntityResolver())
-                .performAction(connection, observer);
-    }
-
-    /**
-     * Executes a non-batched updating query.
-     * 
-     * @deprecated since 1.2
-     */
-    protected void runUpdate(Connection con, Query query, OperationObserver delegate)
-            throws SQLException, Exception {
-
-        new UpdateAction(query, getAdapter(), getEntityResolver()).performAction(
-                con,
-                delegate);
-    }
-
-    /**
-     * Executes a batch updating query.
-     * 
-     * @deprecated since 1.2
-     */
-    protected void runBatchUpdate(
-            Connection connection,
-            BatchQuery query,
-            OperationObserver observer) throws SQLException, Exception {
-
-        // check run strategy...
-
-        // optimistic locking is not supported in batches due to JDBC driver limitations
-        boolean useOptimisticLock = query.isUsingOptimisticLocking();
-
-        boolean runningAsBatch = !useOptimisticLock && adapter.supportsBatchUpdates();
-        BatchAction action = new BatchAction(query, getAdapter(), getEntityResolver());
-        action.setBatch(runningAsBatch);
-        action.performAction(connection, observer);
-    }
-
-    /**
-     * Executes batch query using JDBC Statement batching features.
-     * 
-     * @deprecated since 1.2 SQLActions are used.
-     */
-    protected void runBatchUpdateAsBatch(
-            Connection con,
-            BatchQuery query,
-            BatchQueryBuilder queryBuilder,
-            OperationObserver delegate) throws SQLException, Exception {
-        new TempBatchAction(query, true).runAsBatch(con, queryBuilder, delegate);
-    }
-
-    /**
-     * Executes batch query without using JDBC Statement batching features, running
-     * individual statements in the batch one by one.
-     * 
-     * @deprecated since 1.2 SQLActions are used.
-     */
-    protected void runBatchUpdateAsIndividualQueries(
-            Connection con,
-            BatchQuery query,
-            BatchQueryBuilder queryBuilder,
-            OperationObserver delegate) throws SQLException, Exception {
-
-        new TempBatchAction(query, false).runAsBatch(con, queryBuilder, delegate);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    protected void runStoredProcedure(
-            Connection con,
-            Query query,
-            OperationObserver delegate) throws SQLException, Exception {
-
-        new ProcedureAction((ProcedureQuery) query, getAdapter(), getEntityResolver())
-                .performAction(con, delegate);
-    }
-
-    /**
-     * Helper method that reads OUT parameters of a CallableStatement.
-     * 
-     * @deprecated Since 1.2 this logic is moved to SQLAction.
-     */
-    protected void readStoredProcedureOutParameters(
-            CallableStatement statement,
-            org.apache.cayenne.access.util.ResultDescriptor descriptor,
-            Query query,
-            OperationObserver delegate) throws SQLException, Exception {
-
-        // method is deprecated, so keep this ugly piece here as a placeholder
-        new TempProcedureAction((ProcedureQuery) query).readProcedureOutParameters(
-                statement,
-                delegate);
-    }
-
-    /**
-     * Helper method that reads a ResultSet.
-     * 
-     * @deprecated Since 1.2 this logic is moved to SQLAction.
-     */
-    protected void readResultSet(
-            ResultSet resultSet,
-            org.apache.cayenne.access.util.ResultDescriptor descriptor,
-            org.apache.cayenne.query.GenericSelectQuery query,
-            OperationObserver delegate) throws SQLException, Exception {
-
-        // method is deprecated, so keep this ugly piece here as a placeholder
-        RowDescriptor rowDescriptor = new RowDescriptor(resultSet, getAdapter()
-                .getExtendedTypes());
-        new TempProcedureAction((ProcedureQuery) query).readResultSet(
-                resultSet,
-                rowDescriptor,
-                query,
-                delegate);
-    }
-
-    /**
      * Returns EntityResolver that handles DataMaps of this node.
      */
     public EntityResolver getEntityResolver() {
@@ -437,8 +274,7 @@
      * 
      * @since 1.1
      */
-    public void setEntityResolver(
-            org.apache.cayenne.map.EntityResolver entityResolver) {
+    public void setEntityResolver(org.apache.cayenne.map.EntityResolver entityResolver) {
         this.entityResolver = entityResolver;
     }
 
@@ -472,59 +308,6 @@
             }
         }
         catch (SQLException ex) {
-        }
-    }
-
-    // this class exists to provide deprecated DataNode methods with access to
-    // various SQLAction implementations. It will be removed once corresponding
-    // DataNode methods are removed
-    final class TempProcedureAction extends ProcedureAction {
-
-        public TempProcedureAction(ProcedureQuery query) {
-            super(query, DataNode.this.adapter, DataNode.this.entityResolver);
-        }
-
-        // changing access to public
-        public void readProcedureOutParameters(
-                CallableStatement statement,
-                OperationObserver delegate) throws SQLException, Exception {
-            super.readProcedureOutParameters(statement, delegate);
-        }
-
-        // changing access to public
-        public void readResultSet(
-                ResultSet resultSet,
-                RowDescriptor descriptor,
-                Query query,
-                OperationObserver delegate) throws SQLException, Exception {
-            super.readResultSet(resultSet, descriptor, query, delegate);
-        }
-    }
-
-    // this class exists to provide deprecated DataNode methods with access to
-    // various SQLAction implementations. It will be removed once corresponding
-    // DataNode methods are removed
-    final class TempBatchAction extends BatchAction {
-
-        public TempBatchAction(BatchQuery batchQuery, boolean runningAsBatch) {
-            super(batchQuery, DataNode.this.adapter, DataNode.this.entityResolver);
-            setBatch(runningAsBatch);
-        }
-
-        // making public to access from DataNode
-        protected void runAsBatch(
-                Connection con,
-                BatchQueryBuilder queryBuilder,
-                OperationObserver delegate) throws SQLException, Exception {
-            super.runAsBatch(con, queryBuilder, delegate);
-        }
-
-        // making public to access from DataNode
-        public void runAsIndividualQueries(
-                Connection con,
-                BatchQueryBuilder queryBuilder,
-                OperationObserver delegate) throws SQLException, Exception {
-            super.runAsIndividualQueries(con, queryBuilder, delegate, false);
         }
     }
 

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNodeQueryAction.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNodeQueryAction.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNodeQueryAction.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataNodeQueryAction.java Wed Jul 19 21:04:04 2006
@@ -17,14 +17,12 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLAction;
 
@@ -85,13 +83,6 @@
 
     public void nextQueryException(Query query, Exception ex) {
         observer.nextQueryException(currentQuery, ex);
-    }
-
-    /**
-     * @deprecated Unused since 1.2
-     */
-    public Level getLoggingLevel() {
-        return observer.getLoggingLevel();
     }
 
     public boolean isIteratedResult() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataRowStore.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataRowStore.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataRowStore.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/DataRowStore.java Wed Jul 19 21:04:04 2006
@@ -29,11 +29,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections.ExtendedProperties;
-import org.apache.commons.collections.map.LRUMap;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataChannel;
 import org.apache.cayenne.DataObject;
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectId;
@@ -44,8 +40,9 @@
 import org.apache.cayenne.event.EventBridgeFactory;
 import org.apache.cayenne.event.EventManager;
 import org.apache.cayenne.event.EventSubject;
-import org.apache.cayenne.query.ObjectIdQuery;
-import org.apache.cayenne.query.Query;
+import org.apache.commons.collections.ExtendedProperties;
+import org.apache.commons.collections.map.LRUMap;
+import org.apache.log4j.Logger;
 
 /**
  * A fixed size cache of DataRows keyed by ObjectId.
@@ -352,64 +349,6 @@
     }
 
     /**
-     * Returns a snapshot for ObjectId. If snapshot is currently cached, it is returned.
-     * If not, a provided QueryEngine is used to fetch it from the database. If there is
-     * no database row for a given id, null is returned.
-     * 
-     * @deprecated since 1.2 unused, as DataRowStore no longer performs queries on its
-     *             own.
-     */
-    public synchronized DataRow getSnapshot(ObjectId oid, QueryEngine engine) {
-        if (engine instanceof DataChannel) {
-            return getSnapshot(oid, (DataChannel) engine);
-        }
-        else if (engine instanceof DataContext) {
-            return getSnapshot(oid, ((DataContext) engine).getChannel());
-        }
-
-        throw new CayenneRuntimeException(
-                "QueryEngine is not an DataChannel or DataContext: " + engine);
-    }
-
-    /**
-     * @deprecated as the only caller {@link #getSnapshot(ObjectId, QueryEngine)} is
-     *             deprecated as well.
-     */
-    private DataRow getSnapshot(ObjectId oid, DataChannel channel) {
-
-        // try cache
-        DataRow cachedSnapshot = getCachedSnapshot(oid);
-        if (cachedSnapshot != null) {
-            return cachedSnapshot;
-        }
-
-        if (logObj.isDebugEnabled()) {
-            logObj.debug("no cached snapshot for ObjectId: " + oid);
-        }
-
-        // try getting it from database
-
-        Query query = new ObjectIdQuery(oid, true, ObjectIdQuery.CACHE_REFRESH);
-        List results = channel.onQuery(null, query).firstList();
-
-        if (results.size() > 1) {
-            throw new CayenneRuntimeException("More than 1 object found for ObjectId "
-                    + oid
-                    + ". Fetch matched "
-                    + results.size()
-                    + " objects.");
-        }
-        else if (results.size() == 0) {
-            return null;
-        }
-        else {
-            DataRow snapshot = (DataRow) results.get(0);
-            snapshots.put(oid, snapshot);
-            return snapshot;
-        }
-    }
-    
-    /**
      * @since 3.0
      */
     Map getCachedSnapshots() {
@@ -493,26 +432,6 @@
                     invalidatedSnapshotIds,
                     indirectlyModifiedIds);
         }
-    }
-
-    /**
-     * Processes changes made to snapshots. Modifies internal cache state, and then sends
-     * the event to all listeners. Source of these changes is usually an ObjectStore.
-     * 
-     * @deprecated
-     */
-    public void processSnapshotChanges(
-            Object source,
-            Map updatedSnapshots,
-            Collection deletedSnapshotIds,
-            Collection indirectlyModifiedIds) {
-
-        this.processSnapshotChanges(
-                source,
-                updatedSnapshots,
-                deletedSnapshotIds,
-                Collections.EMPTY_LIST,
-                indirectlyModifiedIds);
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/NoopDelegate.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/NoopDelegate.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/NoopDelegate.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/NoopDelegate.java Wed Jul 19 21:04:04 2006
@@ -33,15 +33,6 @@
 
     static DataContextDelegate noopDelegate = new NoopDelegate();
 
-    /**
-     * @deprecated since 1.2, as the corresponding interface method is deprecated.
-     */
-    public org.apache.cayenne.query.GenericSelectQuery willPerformSelect(
-            DataContext context,
-            org.apache.cayenne.query.GenericSelectQuery query) {
-        return query;
-    }
-
     public Query willPerformGenericQuery(DataContext context, Query query) {
         return query;
     }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ObjectStore.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ObjectStore.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ObjectStore.java Wed Jul 19 21:04:04 2006
@@ -38,7 +38,6 @@
 import org.apache.cayenne.access.ObjectDiff.ArcOperation;
 import org.apache.cayenne.access.event.SnapshotEvent;
 import org.apache.cayenne.access.event.SnapshotEventListener;
-import org.apache.cayenne.graph.CompoundDiff;
 import org.apache.cayenne.graph.GraphChangeHandler;
 import org.apache.cayenne.graph.GraphDiff;
 import org.apache.cayenne.graph.GraphManager;
@@ -417,39 +416,6 @@
     }
 
     /**
-     * Performs tracking of object relationship changes.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 use {@link #recordArcDeleted(Persistent, ObjectId, String)}.
-     */
-    public void objectRelationshipUnset(
-            DataObject source,
-            DataObject target,
-            ObjRelationship relationship,
-            boolean processFlattened) {
-
-        ObjectId targetId = (target != null) ? target.getObjectId() : null;
-
-        recordArcDeleted(source, targetId, relationship.getName());
-    }
-
-    /**
-     * Performs tracking of object relationship changes.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 use {@link #recordArcCreated(Persistent, ObjectId, String)}.
-     */
-    public void objectRelationshipSet(
-            DataObject source,
-            DataObject target,
-            ObjRelationship relationship,
-            boolean processFlattened) {
-
-        ObjectId targetId = (target != null) ? target.getObjectId() : null;
-        recordArcCreated(source, targetId, relationship.getName());
-    }
-
-    /**
      * Updates snapshots in the underlying DataRowStore. If <code>refresh</code> is
      * true, all snapshots in <code>snapshots</code> will be loaded into DataRowStore,
      * regardless of the existing cache state. If <code>refresh</code> is false, only
@@ -475,17 +441,6 @@
     }
 
     /**
-     * Processes internal objects after the parent DataContext was committed. Changes
-     * object persistence state and handles snapshot updates.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 unused.
-     */
-    public synchronized void objectsCommitted() {
-        postprocessAfterCommit(new CompoundDiff());
-    }
-
-    /**
      * Builds and returns GraphDiff reflecting all uncommitted object changes.
      * 
      * @since 1.2
@@ -586,15 +541,6 @@
     }
 
     /**
-     * Adds a new object to the ObjectStore.
-     * 
-     * @deprecated since 1.2 as a different change tracking algorithm is used.
-     */
-    public synchronized void addObject(DataObject object) {
-        recordObjectCreated(object);
-    }
-
-    /**
      * Starts tracking the registration of new objects from this ObjectStore. Used in
      * conjunction with unregisterNewObjects() to control garbage collection when an
      * instance of ObjectStore is used over a longer time for batch processing.
@@ -620,17 +566,6 @@
     }
 
     /**
-     * Returns a DataObject registered for a given ObjectId, or null if no such object
-     * exists. This method does not do a database fetch.
-     * 
-     * @deprecated since 1.2 a GraphManager {@link #getNode(Object)} method should be
-     *             used.
-     */
-    public DataObject getObject(ObjectId id) {
-        return (DataObject) getNode(id);
-    }
-
-    /**
      * Returns a snapshot for ObjectId from the underlying snapshot cache. If cache
      * contains no snapshot, a null is returned.
      * 
@@ -660,7 +595,7 @@
         // they were originally cached... do no conversions here
         return (List) queryResultMap.get(name);
     }
-    
+
     /**
      * @since 3.0
      */
@@ -683,19 +618,6 @@
      * fetch attempt fails or inconsistent data is returned, underlying cache will throw a
      * CayenneRuntimeException.
      * 
-     * @since 1.1
-     * @deprecated since 1.2. Use {@link #getSnapshot(ObjectId)} instead.
-     */
-    public synchronized DataRow getSnapshot(ObjectId oid, QueryEngine engine) {
-        return getDataRowCache().getSnapshot(oid, engine);
-    }
-
-    /**
-     * Returns a snapshot for ObjectId from the underlying snapshot cache. If cache
-     * contains no snapshot, it will attempt fetching it using provided QueryEngine. If
-     * fetch attempt fails or inconsistent data is returned, underlying cache will throw a
-     * CayenneRuntimeException.
-     * 
      * @since 1.2
      */
     public synchronized DataRow getSnapshot(ObjectId oid) {
@@ -708,17 +630,6 @@
         else {
             return null;
         }
-    }
-
-    /**
-     * Returns a list of objects that are registered with this DataContext, regardless of
-     * their persistence state. List is returned by copy and can be modified by the
-     * caller.
-     * 
-     * @deprecated since 1.2 use GraphManager method {@link #registeredNodes()}.
-     */
-    public synchronized List getObjects() {
-        return new ArrayList(objectMap.values());
     }
 
     /**

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OperationHints.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OperationHints.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OperationHints.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OperationHints.java Wed Jul 19 21:04:04 2006
@@ -17,23 +17,15 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
-import org.apache.log4j.Level;
-
 /**
  * Defines API that allows QueryEngine to obtain information about query execution
  * strategy.
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public interface OperationHints {
-
-    /**
-     * @deprecated Unused since 1.2
-     */
-    public Level getLoggingLevel();
 
     /**
      * Returns <code>true</code> to indicate that any results of a select operation

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OptimisticLockException.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OptimisticLockException.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OptimisticLockException.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/OptimisticLockException.java Wed Jul 19 21:04:04 2006
@@ -25,7 +25,6 @@
 import java.util.Map;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.DataChannel;
 import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.exp.ExpressionFactory;
 import org.apache.cayenne.map.DbAttribute;

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryEngine.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryEngine.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryEngine.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryEngine.java Wed Jul 19 21:04:04 2006
@@ -17,39 +17,20 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import java.util.Collection;
 
-import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.EntityResolver;
 
 /**
  * Defines methods used to run Cayenne queries.
- * <p>
- * <i>For more information see <a href="../../../../../../userguide/index.html"
- * target="_top">Cayenne User Guide. </a> </i>
- * </p>
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public interface QueryEngine {
 
     /**
-     * Executes queries in the transactional context provided by the caller. It is
-     * caller's responsibility to commit or rollback the Transaction and close any
-     * connections that were added to it.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 as thread-bound transactions are used.
-     */
-    public void performQueries(
-            Collection queries,
-            OperationObserver resultConsumer,
-            Transaction transaction);
-
-    /**
      * Executes a list of queries wrapping them in its own transaction. Results of
      * execution are passed to {@link OperationObserver}object via its callback methods.
      * 
@@ -58,24 +39,8 @@
     public void performQueries(Collection queries, OperationObserver resultConsumer);
 
     /**
-     * Returns a DataNode that should handle queries for all DataMap components.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 not a part of the interface. Only DataDomain has meaningful
-     *             implementation.
-     */
-    public DataNode lookupDataNode(DataMap dataMap);
-
-    /**
      * Returns a resolver for this query engine that is capable of resolving between
      * classes, entity names, and obj/db entities
      */
     public EntityResolver getEntityResolver();
-
-    /**
-     * Returns a collection of DataMaps associated with this QueryEngine.
-     * 
-     * @deprecated since 1.2. Use 'getEntityResolver().getDataMaps()' instead.
-     */
-    public Collection getDataMaps();
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryLogger.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryLogger.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryLogger.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryLogger.java Wed Jul 19 21:04:04 2006
@@ -22,12 +22,12 @@
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 import org.apache.cayenne.access.jdbc.ParameterBinding;
 import org.apache.cayenne.conn.DataSourceInfo;
 import org.apache.cayenne.util.IDUtil;
 import org.apache.cayenne.util.Util;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 
 /**
  * QueryLogger is intended to log special events that happen whenever Cayenne interacts
@@ -45,11 +45,6 @@
 
     private static final Logger logObj = Logger.getLogger(QueryLogger.class);
 
-    /**
-     * @deprecated unused since 1.2
-     */
-    public static final Level DEFAULT_LOG_LEVEL = Level.INFO;
-
     public static final int TRIM_VALUES_THRESHOLD = 300;
 
     /**
@@ -150,15 +145,6 @@
     }
 
     /**
-     * Prints a byte value to a StringBuffer as a double digit hex value.
-     * 
-     * @deprecated since 1.2 use a namesake method from IDUtil.
-     */
-    protected static void appendFormattedByte(StringBuffer buffer, byte byteValue) {
-        IDUtil.appendFormattedByte(buffer, byteValue);
-    }
-
-    /**
      * Returns current logging level.
      */
     public static Level getLoggingLevel() {
@@ -434,133 +420,4 @@
         return logObj.isEnabledFor(getLoggingLevel());
     }
 
-    /**
-     * Logs database connection event using container data source.
-     * 
-     * @deprecated since 1.2
-     */
-    public static void logConnect(Level logLevel, String dataSource) {
-        logConnect(dataSource);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logConnect(
-            Level logLevel,
-            String url,
-            String userName,
-            String password) {
-        logConnect(url, userName, password);
-    }
-
-    /**
-     * Logs database connection event.
-     * 
-     * @deprecated since 1.2
-     */
-    public static void logPoolCreated(Level logLevel, DataSourceInfo dsi) {
-        logPoolCreated(dsi);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logConnectSuccess(Level logLevel) {
-        logConnectSuccess();
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logConnectFailure(Level logLevel, Throwable th) {
-        logConnectFailure(th);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logQuery(Level logLevel, String queryStr, List params) {
-        logQuery(queryStr, params);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logQuery(Level logLevel, String queryStr, List params, long time) {
-        logQuery(queryStr, params, time);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logQueryParameters(Level logLevel, String label, List parameters) {
-        logQueryParameters(label, parameters);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logSelectCount(Level logLevel, int count) {
-        logSelectCount(count);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logSelectCount(Level logLevel, int count, long time) {
-        logSelectCount(count, time);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logUpdateCount(Level logLevel, int count) {
-        logUpdateCount(count);
-    }
-
-    /**
-     * @since 1.1
-     * @deprecated since 1.2
-     */
-    public static void logBeginTransaction(Level logLevel, String transactionLabel) {
-        logBeginTransaction(transactionLabel);
-    }
-
-    /**
-     * @since 1.1
-     * @deprecated since 1.2
-     */
-    public static void logCommitTransaction(Level logLevel, String transactionLabel) {
-        logCommitTransaction(transactionLabel);
-    }
-
-    /**
-     * @since 1.1
-     * @deprecated since 1.2
-     */
-    public static void logRollbackTransaction(Level logLevel, String transactionLabel) {
-        logRollbackTransaction(transactionLabel);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logQueryError(Level logLevel, Throwable th) {
-        logQueryError(th);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static void logQueryStart(Level logLevel, int count) {
-        logQueryStart(count);
-    }
-
-    /**
-     * @deprecated since 1.2
-     */
-    public static boolean isLoggable(Level logLevel) {
-        return isLoggable();
-    }
 }

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryTranslator.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryTranslator.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryTranslator.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/QueryTranslator.java Wed Jul 19 21:04:04 2006
@@ -22,7 +22,6 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 
-import org.apache.log4j.Level;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.EntityInheritanceTree;
@@ -37,7 +36,7 @@
  * target="_top">Cayenne User Guide. </a> </i>
  * </p>
  * 
- * @author Andrei Adamchik
+ * @author Andrus Adamchik
  */
 public abstract class QueryTranslator {
 
@@ -50,13 +49,6 @@
      */
     protected Connection connection;
 
-    /**
-     * Used mainly for name resolution.
-     * 
-     * @deprecated Since 1.2 entityResolver property is used.
-     */
-    protected QueryEngine engine;
-
     /** Adapter helping to do SQL literal conversions, etc. */
     protected DbAdapter adapter;
 
@@ -73,13 +65,6 @@
      */
     public abstract PreparedStatement createStatement() throws Exception;
 
-    /**
-     * @deprecated since 1.2
-     */
-    public final PreparedStatement createStatement(Level logLevel) throws Exception {
-        return createStatement();
-    }
-
     /** Returns query object being processed. */
     public Query getQuery() {
         return query;
@@ -103,36 +88,6 @@
      */
     public void setConnection(Connection connection) {
         this.connection = connection;
-    }
-
-    /**
-     * @deprecated Since 1.2 use getConnection().
-     */
-    public Connection getCon() {
-        return getConnection();
-    }
-
-    /**
-     * @deprecated since 1.2 use setConnection().
-     */
-    public void setCon(Connection con) {
-        setConnection(con);
-    }
-
-    /**
-     * Returns QueryEngine used by this translator.
-     * 
-     * @deprecated Since 1.2 use "getEntityResolver()"
-     */
-    public QueryEngine getEngine() {
-        return engine;
-    }
-
-    /**
-     * @deprecated Since 1.2 use "setEntityResolver()"
-     */
-    public void setEngine(QueryEngine engine) {
-        this.engine = engine;
     }
 
     public DbAdapter getAdapter() {

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ToManyList.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ToManyList.java?rev=423749&r1=423748&r2=423749&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ToManyList.java (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/access/ToManyList.java Wed Jul 19 21:04:04 2006
@@ -17,7 +17,6 @@
  *  under the License.
  ****************************************************************/
 
-
 package org.apache.cayenne.access;
 
 import java.io.Serializable;
@@ -81,16 +80,6 @@
     }
 
     /**
-     * Returns a source object of this relationship.
-     * 
-     * @since 1.1
-     * @deprecated since 1.2 use 'getRelationshipOwner()'
-     */
-    public DataObject getSource() {
-        return (DataObject) source;
-    }
-
-    /**
      * @since 1.2
      */
     public Persistent getRelationshipOwner() {
@@ -106,24 +95,6 @@
         return relationship;
     }
 
-    /**
-     * Returns whether this list is not yet resolved and requires a fetch.
-     * 
-     * @deprecated since 1.2 - use 'isFault'
-     */
-    public boolean needsFetch() {
-        return isFault();
-    }
-
-    /**
-     * Will force refresh on the next access.
-     * 
-     * @deprecated since 1.2 use {@link #invalidate()}
-     */
-    public void invalidateObjectList() {
-        setObjectList(null);
-    }
-
     public void setObjectList(List objectList) {
         this.objectList = objectList;
     }
@@ -139,7 +110,7 @@
     public boolean isFault() {
         return objectList == null;
     }
-    
+
     public Object getValueDirectly() throws CayenneRuntimeException {
         return objectList;
     }



Mime
View raw message