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 @@
<cmis:queryable>true</cmis:queryable>
<cmis:orderable>false</cmis:orderable>
<cmis:openChoice>false</cmis:openChoice>
- <cmis:choiceString cmis:displayName="Company private">
+ <cmis:choiceString displayName="Company private">
<cmis:value>Company private</cmis:value>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="Public">
+ <cmis:choiceString displayName="Public">
<cmis:value>Public</cmis:value>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="Confidential">
+ <cmis:choiceString displayName="Confidential">
<cmis:value>Confidential</cmis:value>
</cmis:choiceString>
</cmis:propertyStringDefinition>
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 @@
<cmis:queryable>true</cmis:queryable>
<cmis:orderable>false</cmis:orderable>
<cmis:openChoice>false</cmis:openChoice>
- <cmis:choiceString cmis:displayName="Europe">
+ <cmis:choiceString displayName="Europe">
<cmis:value>EU</cmis:value>
- <cmis:choiceString cmis:displayName="Europe">
+ <cmis:choiceString displayName="Italy">
<cmis:value>IT</cmis:value>
</cmis:choiceString>
- <cmis:choiceString
cmis:displayName="Netherlands">
+ <cmis:choiceString displayName="Netherlands">
<cmis:value>NL</cmis:value>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="United
Kingdom">
+ <cmis:choiceString displayName="United Kingdom">
<cmis:value>UK</cmis:value>
</cmis:choiceString>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="Australia">
+ <cmis:choiceString displayName="Australia">
<cmis:value>AU</cmis:value>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="America">
+ <cmis:choiceString displayName="America">
<cmis:value>AM</cmis:value>
- <cmis:choiceString cmis:displayName="North
America">
+ <cmis:choiceString displayName="North America">
<cmis:value>NA</cmis:value>
- <cmis:choiceString
cmis:displayName="United States of America">
+ <cmis:choiceString displayName="United
States of America">
<cmis:value>USA</cmis:value>
</cmis:choiceString>
- <cmis:choiceString
cmis:displayName="Mexico">
+ <cmis:choiceString displayName="Mexico">
<cmis:value>MX</cmis:value>
</cmis:choiceString>
- <cmis:choiceString
cmis:displayName="Jamaica">
+ <cmis:choiceString
displayName="Jamaica">
<cmis:value>JA</cmis:value>
</cmis:choiceString>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="South
America">
+ <cmis:choiceString displayName="South America">
<cmis:value>SA</cmis:value>
- <cmis:choiceString cmis:displayName="Brasil">
+ <cmis:choiceString displayName="Brasil">
<cmis:value>BR</cmis:value>
</cmis:choiceString>
- <cmis:choiceString cmis:displayName="Argentina">
+ <cmis:choiceString displayName="Argentina">
<cmis:value>AR</cmis:value>
</cmis:choiceString>
</cmis:choiceString>
