Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 32005 invoked from network); 15 Aug 2007 12:50:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2007 12:50:05 -0000 Received: (qmail 45855 invoked by uid 500); 15 Aug 2007 12:50:03 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 45838 invoked by uid 500); 15 Aug 2007 12:50:03 -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 45829 invoked by uid 99); 15 Aug 2007 12:50:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2007 05:50:03 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2007 12:50:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ACE7F1A981A; Wed, 15 Aug 2007 05:49:44 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r566133 - /cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java Date: Wed, 15 Aug 2007 12:49:44 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070815124944.ACE7F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Wed Aug 15 05:49:43 2007 New Revision: 566133 URL: http://svn.apache.org/viewvc?view=rev&rev=566133 Log: CAY-843 Remove arbitrary reverse relationship mapping limitations (excluding runtime relationships on the client) Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java?view=diff&rev=566133&r1=566132&r2=566133 ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/map/ObjEntity.java Wed Aug 15 05:49:43 2007 @@ -188,11 +188,14 @@ entity.addAttribute(attribute.getClientAttribute()); } - // copy relationships + // copy relationships; skip runtime generated relationships Iterator relationships = getDeclaredRelationships().iterator(); while (relationships.hasNext()) { ObjRelationship relationship = (ObjRelationship) relationships.next(); - entity.addRelationship(relationship.getClientRelationship()); + + if (!relationship.isRuntime()) { + entity.addRelationship(relationship.getClientRelationship()); + } } // TODO: andrus 2/5/2007 - copy embeddables