Return-Path: X-Original-To: apmail-cayenne-commits-archive@www.apache.org Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC8C46174 for ; Tue, 2 Aug 2011 07:37:49 +0000 (UTC) Received: (qmail 44086 invoked by uid 500); 2 Aug 2011 07:37:48 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 44015 invoked by uid 500); 2 Aug 2011 07:37:40 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 43980 invoked by uid 99); 2 Aug 2011 07:37:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 07:37:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 07:37:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BBDC923889B2 for ; Tue, 2 Aug 2011 07:37:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153056 - in /cayenne/main/trunk: docs/doc/src/main/resources/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/ framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ Date: Tue, 02 Aug 2011 07:37:12 -0000 To: commits@cayenne.apache.org From: dkazimirchyk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110802073712.BBDC923889B2@eris.apache.org> Author: dkazimirchyk Date: Tue Aug 2 07:37:10 2011 New Revision: 1153056 URL: http://svn.apache.org/viewvc?rev=1153056&view=rev Log: CAY-1594 DI extension point: turning on/off cross-ObjectContext synchronization removed unnecessary api from ObjectStoreFactory Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1153056&r1=1153055&r2=1153056&view=diff ============================================================================== --- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original) +++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Tue Aug 2 07:37:10 2011 @@ -27,6 +27,7 @@ CAY-1573 QueryLogger to DI JdbcEventLogg CAY-1584 Improve Cayenne modeler re-ordering named query in the cayenne map xml CAY-1586 New extension point: a strategy for retaining objects in the ObjectStore CAY-1590 DDL generation without a live datasource +CAY-1594 DI extension point: turning on/off cross-ObjectContext synchronization Bug Fixes Since 3.1M2: Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java?rev=1153056&r1=1153055&r2=1153056&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/NoSyncObjectStore.java Tue Aug 2 07:37:10 2011 @@ -36,18 +36,8 @@ public class NoSyncObjectStore extends O @Override public void setDataRowCache(DataRowStore dataRowCache) { - if (dataRowCache == this.dataRowCache) { - return; - } - - if (this.dataRowCache != null && this.dataRowCache.getEventManager() != null) { - this.dataRowCache.getEventManager().removeListener( - this, - this.dataRowCache.getSnapshotEventSubject()); - } this.dataRowCache = dataRowCache; - dataRowCacheSet = dataRowCache != null; } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java?rev=1153056&r1=1153055&r2=1153056&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/DefaultObjectStoreFactory.java Tue Aug 2 07:37:10 2011 @@ -18,9 +18,6 @@ ****************************************************************/ package org.apache.cayenne.configuration; -import java.util.Map; - -import org.apache.cayenne.Persistent; import org.apache.cayenne.access.DataRowStore; import org.apache.cayenne.access.NoSyncObjectStore; import org.apache.cayenne.access.ObjectMapRetainStrategy; @@ -43,13 +40,9 @@ public class DefaultObjectStoreFactory i protected ObjectMapRetainStrategy retainStrategy; public ObjectStore createObjectStore(DataRowStore dataRowCache) { - return createObjectStore(dataRowCache, retainStrategy.createObjectMap()); - } - - public ObjectStore createObjectStore(DataRowStore dataRowCache, Map objectMap) { boolean sync = runtimeProperties.getBoolean(SYNC_PROPERTY, true); - return sync ? new ObjectStore(dataRowCache, objectMap) - : new NoSyncObjectStore(dataRowCache, objectMap); + return sync ? new ObjectStore(dataRowCache, retainStrategy.createObjectMap()) + : new NoSyncObjectStore(dataRowCache, retainStrategy.createObjectMap()); } } Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java?rev=1153056&r1=1153055&r2=1153056&view=diff ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/configuration/ObjectStoreFactory.java Tue Aug 2 07:37:10 2011 @@ -18,9 +18,6 @@ ****************************************************************/ package org.apache.cayenne.configuration; -import java.util.Map; - -import org.apache.cayenne.Persistent; import org.apache.cayenne.access.DataRowStore; import org.apache.cayenne.access.ObjectStore; @@ -37,10 +34,5 @@ public interface ObjectStoreFactory { * Creates an {@link ObjectStore} with provided dataRowCache */ ObjectStore createObjectStore(DataRowStore dataRowCache); - - /** - * Creates an {@link ObjectStore} with provided dataRowCache and objectMap - */ - ObjectStore createObjectStore(DataRowStore dataRowCache, Map objectMap); }