Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2ED89FB20 for ; Thu, 21 Mar 2013 16:33:45 +0000 (UTC) Received: (qmail 48320 invoked by uid 500); 21 Mar 2013 16:33:44 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 48295 invoked by uid 500); 21 Mar 2013 16:33:44 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 48287 invoked by uid 99); 21 Mar 2013 16:33:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 16:33:44 +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; Thu, 21 Mar 2013 16:33:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 979DD2388978; Thu, 21 Mar 2013 16:33:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459388 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java Date: Thu, 21 Mar 2013 16:33:21 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130321163321.979DD2388978@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Mar 21 16:33:21 2013 New Revision: 1459388 URL: http://svn.apache.org/r1459388 Log: OAK-709: Automatic property type conversion Use the more relaxed Jackrabbit definition matching mechanism until we have better consensus. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java?rev=1459388&r1=1459387&r2=1459388&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java Thu Mar 21 16:33:21 2013 @@ -123,10 +123,11 @@ class EffectiveType { } if (definition != null) { return definition; - } else { - throw new ConstraintViolationException( - "No matching definition found for property " - + propertyName); +// TODO: Fall back to residual definitions until we have consensus on OAK-709 +// } else { +// throw new ConstraintViolationException( +// "No matching definition found for property " +// + propertyName); } } } @@ -189,8 +190,9 @@ class EffectiveType { } } - throw new ConstraintViolationException( - "Incorrect node type of child node " + nodeName); +// TODO: Fall back to residual definitions until we have consensus on OAK-709 +// throw new ConstraintViolationException( +// "Incorrect node type of child node " + nodeName); } } }