Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 56989 invoked from network); 31 Mar 2010 09:09:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 31 Mar 2010 09:09:49 -0000 Received: (qmail 14468 invoked by uid 500); 31 Mar 2010 09:09:49 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 14415 invoked by uid 500); 31 Mar 2010 09:09:48 -0000 Mailing-List: contact chemistry-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chemistry-dev@incubator.apache.org Delivered-To: mailing list chemistry-commits@incubator.apache.org Received: (qmail 14398 invoked by uid 99); 31 Mar 2010 09:09:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 09:09:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 31 Mar 2010 09:09:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E6F323888EC; Wed, 31 Mar 2010 09:09:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r929440 - in /incubator/chemistry/trunk/chemistry/chemistry-abdera/src: main/java/org/apache/chemistry/abdera/ext/ test/resources/org/apache/chemistry/abdera/ext/test/ Date: Wed, 31 Mar 2010 09:09:22 -0000 To: chemistry-commits@incubator.apache.org From: gabriele@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100331090922.8E6F323888EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gabriele Date: Wed Mar 31 09:09:22 2010 New Revision: 929440 URL: http://svn.apache.org/viewvc?rev=929440&view=rev Log: displayName attribute on choices is without namespace, also aligned test atom entries Modified: incubator/chemistry/trunk/chemistry/chemistry-abdera/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-entry.xml incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-nested-choices-entry.xml Modified: incubator/chemistry/trunk/chemistry/chemistry-abdera/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-abdera/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java?rev=929440&r1=929439&r2=929440&view=diff ============================================================================== --- incubator/chemistry/trunk/chemistry/chemistry-abdera/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java (original) +++ incubator/chemistry/trunk/chemistry/chemistry-abdera/src/main/java/org/apache/chemistry/abdera/ext/CMISConstants.java Wed Mar 31 09:09:22 2010 @@ -168,7 +168,7 @@ public interface CMISConstants { public static final QName PROPDEF_ORDERABLE = new QName(CMIS_NS, "orderable"); // Property definition choices constants - public static final QName PROPDEF_CHOICE_DISPLAY_NAME = new QName(CMIS_NS, "displayName"); + public static final QName PROPDEF_CHOICE_DISPLAY_NAME = new QName(null, "displayName"); public static final QName PROPDEF_CHOICE_VALUE = new QName(CMIS_NS, "value"); public static final QName PROPDEF_STRING_CHOICE = new QName(CMIS_NS, "choiceString"); public static final QName PROPDEF_INTEGER_CHOICE = new QName(CMIS_NS, "choiceInteger"); Modified: incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-entry.xml URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-entry.xml?rev=929440&r1=929439&r2=929440&view=diff ============================================================================== --- incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-entry.xml (original) +++ incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-entry.xml Wed Mar 31 09:09:22 2010 @@ -330,14 +330,14 @@ true false false - + Company private - + Public - + Confidential Modified: incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-nested-choices-entry.xml URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-nested-choices-entry.xml?rev=929440&r1=929439&r2=929440&view=diff ============================================================================== --- incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-nested-choices-entry.xml (original) +++ incubator/chemistry/trunk/chemistry/chemistry-abdera/src/test/resources/org/apache/chemistry/abdera/ext/test/D_mycm_doc-type-definition-nested-choices-entry.xml Wed Mar 31 09:09:22 2010 @@ -397,41 +397,41 @@ true false false - + EU - + IT - + NL - + UK - + AU - + AM - + NA - + USA - + MX - + JA - + SA - + BR - + AR