chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r798836 [1/2] - in /incubator/chemistry/trunk/chemistry: chemistry-api/src/main/java/org/apache/chemistry/ chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/ chemistry-atompub-client/src/main/java/org/apache/chemist...
Date Wed, 29 Jul 2009 10:21:12 GMT
Author: fguillaume
Date: Wed Jul 29 10:21:11 2009
New Revision: 798836

URL: http://svn.apache.org/viewvc?rev=798836&view=rev
Log:
CMIS-44: changed various type and property definition name/id aspects

Modified:
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/PropertyDefinition.java
    incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Type.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/TypeEntryReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/PropertyIterator.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/XmlProperty.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/java/org/apache/chemistry/atompub/client/stax/TestPropertyIterator.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feed-types.xml
    incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feedentry.xml
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java
    incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObject.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleProperty.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimplePropertyDefinition.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleType.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleTypeManager.java
    incubator/chemistry/trunk/chemistry/chemistry-commons/src/test/java/org/apache/chemistry/impl/simple/TestSimpleRepository.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrDocument.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrFolder.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewDocument.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrNewFolder.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrObjectEntry.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrPropertyDefinition.java
    incubator/chemistry/trunk/chemistry/chemistry-jcr/src/main/java/org/apache/chemistry/jcr/JcrType.java
    incubator/chemistry/trunk/chemistry/chemistry-tests/src/main/java/org/apache/chemistry/test/BasicHelper.java

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/CMISObject.java Wed Jul 29 10:21:11 2009
@@ -198,10 +198,10 @@
     /**
      * Gets a property.
      *
-     * @param name the property name
+     * @param id the property ID
      * @return the property
      */
-    Property getProperty(String name);
+    Property getProperty(String id);
 
     /**
      * Gets all the properties.
@@ -213,10 +213,10 @@
     /**
      * Gets a property value.
      *
-     * @param name the property name
+     * @param id the property ID
      * @return the property value
      */
-    Serializable getValue(String name);
+    Serializable getValue(String id);
 
     /**
      * Sets a property value.
@@ -226,10 +226,10 @@
      * Whether the value is saved immediately or not is repository-specific, see
      * {@link #save()}.
      *
-     * @param name the property name
+     * @param id the property ID
      * @param value the property value, or {@code null}
      */
-    void setValue(String name, Serializable value);
+    void setValue(String id, Serializable value);
 
     /**
      * Sets several property values.
@@ -260,41 +260,41 @@
      * ----- convenience methods -----
      */
 
-    String getString(String name);
+    String getString(String id);
 
-    String[] getStrings(String name);
+    String[] getStrings(String id);
 
-    BigDecimal getDecimal(String name);
+    BigDecimal getDecimal(String id);
 
-    BigDecimal[] getDecimals(String name);
+    BigDecimal[] getDecimals(String id);
 
-    Integer getInteger(String name);
+    Integer getInteger(String id);
 
-    Integer[] getIntegers(String name);
+    Integer[] getIntegers(String id);
 
-    Boolean getBoolean(String name);
+    Boolean getBoolean(String id);
 
-    Boolean[] getBooleans(String name);
+    Boolean[] getBooleans(String id);
 
-    Calendar getDateTime(String name);
+    Calendar getDateTime(String id);
 
-    Calendar[] getDateTimes(String name);
+    Calendar[] getDateTimes(String id);
 
-    URI getURI(String name);
+    URI getURI(String id);
 
-    URI[] getURIs(String name);
+    URI[] getURIs(String id);
 
-    String getId(String name);
+    String getId(String id);
 
-    String[] getIds(String name);
+    String[] getIds(String id);
 
-    String getXML(String name);
+    String getXML(String id);
 
-    String[] getXMLs(String name);
+    String[] getXMLs(String id);
 
-    String getHTML(String name);
+    String getHTML(String id);
 
-    String[] getHTMLs(String name);
+    String[] getHTMLs(String id);
 
     /*
      * ----- convenience methods for specific properties -----
@@ -342,6 +342,6 @@
      * ----- convenience methods for specific properties (setter) -----
      */
 
-    void setName(String name);
+    void setName(String value);
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/ObjectEntry.java Wed Jul 29 10:21:11 2009
@@ -48,20 +48,20 @@
      * <p>
      * Returns {@code null} is the property is not set, not fetched or unknown.
      *
-     * @param name the property name
+     * @param id the property ID
      * @return the property value, or {@code null}
      */
-    Serializable getValue(String name);
+    Serializable getValue(String id);
 
     /**
      * Sets a property value.
      * <p>
      * Setting a {@code null} value removes the property.
      *
-     * @param name the property name
+     * @param id the property ID
      * @param value the property value, or {@code null}
      */
-    void setValue(String name, Serializable value);
+    void setValue(String id, Serializable value);
 
     /**
      * Gets all the property values known to this entry.

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/PropertyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/PropertyDefinition.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/PropertyDefinition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/PropertyDefinition.java Wed Jul 29 10:21:11 2009
@@ -27,38 +27,49 @@
 public interface PropertyDefinition {
 
     /**
-     * The property's name.
+     * The property ID.
      * <p>
-     * This identifies this property among all properties of this type,
-     * including inherited properties. This is also used as a column name in a
-     * SQL query. It may be in mixed case, but must uniquely identify this
-     * property case-insensitively, and must conform to the syntax rules for SQL
-     * identifiers.
+     * This contains an opaque ID which uniquely identifies this property.
      *
-     * @return the property's name
+     * @return the property ID
      */
-    String getName();
+    String getId();
 
     /**
-     * The property ID.
+     * The property's local name.
      * <p>
-     * This contains a system-assigned ID which uniquely identifies this
-     * property.
+     * This is the underlying repository's name for the property. It is opaque
+     * and has no uniqueness constraint.
+     *
+     * @return the property's local name, or {@code null} if not specified
+     */
+    String getLocalName();
+
+    /**
+     * The property's local namespace.
      * <p>
-     * Two properties of different names from different types may have the same
-     * ID if they are considered to represent "identical" information by the
-     * repository.
+     * This is the underlying repository's namespace for the property.
      *
-     * @return the property ID
+     * @return the property's local namespace, or {@code null} if not specified
      */
-    String getId();
+    URI getLocalNamespace();
+
+    /**
+     * The property's query name.
+     * <p>
+     * This is used as a column name in a SQL query. It maybe in mixed case, but
+     * must uniquely identify this property within its type case-insensitively.
+     *
+     * @return the property's name
+     */
+    String getQueryName();
 
     /**
      * The property's display name.
      * <p>
      * This is used for presentation by the application.
      *
-     * @return the property's display name
+     * @return the property's display name, or {@code null} if not specified
      */
     String getDisplayName();
 
@@ -68,7 +79,7 @@
      * This is a description of the property, or {@code null} if none is
      * provided.
      *
-     * @return the property's description, or {@code null}
+     * @return the property's description, or {@code null} if not specified
      */
     String getDescription();
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Type.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Type.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Type.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-api/src/main/java/org/apache/chemistry/Type.java Wed Jul 29 10:21:11 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.chemistry;
 
+import java.net.URI;
 import java.util.Collection;
 
 /**
@@ -33,6 +34,26 @@
     String getId();
 
     /**
+     * The type's local name.
+     * <p>
+     * This is the underlying repository's name for the type. It is opaque and
+     * has no uniqueness constraint.
+     *
+     * @return the type local name
+     */
+    String getLocalName();
+
+    /**
+     * The type's local namespace.
+     * <p>
+     * This is the underlying repository's internal namespace for the type local
+     * name.
+     *
+     * @return the type local namespace, or {@code null} if not specified
+     */
+    URI getLocalNamespace();
+
+    /**
      * The query name.
      * <p>
      * This is used as a table name in a SQL query. It maybe in mixed case, but
@@ -206,8 +227,9 @@
      * If this type was retrieved through a call specifying {@code
      * returnPropertyDefinitions = false}, then this will return {@code null}.
      *
+     * @param id the property ID
      * @return a property definition, or {@code null} when omitted
      */
-    PropertyDefinition getPropertyDefinition(String name);
+    PropertyDefinition getPropertyDefinition(String id);
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPConnection.java Wed Jul 29 10:21:11 2009
@@ -156,7 +156,7 @@
         Type type = getRepository().getType(typeId);
         XmlProperty p = new XmlProperty(
                 type.getPropertyDefinition(Property.TYPE_ID), typeId);
-        map.put(p.getName(), p);
+        map.put(p.getId(), p);
         return new APPObjectEntry(this, map, null);
     }
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObject.java Wed Jul 29 10:21:11 2009
@@ -167,21 +167,21 @@
         return type.getBaseType();
     }
 
-    public Property getProperty(String name) {
-        PropertyDefinition pd = getType().getPropertyDefinition(name);
+    public Property getProperty(String id) {
+        PropertyDefinition pd = getType().getPropertyDefinition(id);
         if (pd == null) {
-            throw new IllegalArgumentException(name);
+            throw new IllegalArgumentException(id);
         }
         return entry.getProperty(pd);
     }
 
-    public Serializable getValue(String name) {
-        PropertyDefinition pd = getType().getPropertyDefinition(name);
+    public Serializable getValue(String id) {
+        PropertyDefinition pd = getType().getPropertyDefinition(id);
         if (pd == null) {
-            throw new IllegalArgumentException(name);
+            throw new IllegalArgumentException(id);
         }
         // TODO deal with unfetched properties
-        Serializable value = entry.getValue(name);
+        Serializable value = entry.getValue(id);
         if (value == null) {
             value = pd.getDefaultValue();
         }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntry.java Wed Jul 29 10:21:11 2009
@@ -48,12 +48,6 @@
 
     protected Set<String> allowableActions; // TODO use set?
 
-    protected String id;
-
-    protected String name;
-
-    protected String typeId;
-
     protected final List<String> links;
 
     public APPObjectEntry(APPConnection connection,
@@ -112,20 +106,20 @@
         return BaseType.get((String) getValue(Property.BASE_TYPE_ID));
     }
 
-    public Serializable getValue(String name) {
-        XmlProperty p = properties.get(name);
+    public Serializable getValue(String id) {
+        XmlProperty p = properties.get(id);
         return p == null ? null : p.getValue();
     }
 
     // not in API
     public XmlProperty getProperty(PropertyDefinition pd) {
-        XmlProperty p = properties.get(pd.getName());
+        XmlProperty p = properties.get(pd.getId());
         if (p != null) {
             return p;
         }
         if (isCreation()) {
             p = new XmlProperty(pd);
-            properties.put(pd.getName(), p);
+            properties.put(pd.getId(), p);
         } else {
             // TODO not fetched...
         }
@@ -142,19 +136,19 @@
         return map;
     }
 
-    public void setValue(String name, Serializable value) {
-        XmlProperty p = properties.get(name);
+    public void setValue(String id, Serializable value) {
+        XmlProperty p = properties.get(id);
         if (p != null) {
             p.setValue(value);
         } else {
             PropertyDefinition pd = connection.getRepository().getType(
-                    getTypeId()).getPropertyDefinition(name);
+                    getTypeId()).getPropertyDefinition(id);
             if (pd == null) {
-                throw new IllegalArgumentException("No such property: " + name);
+                throw new IllegalArgumentException("No such property: " + id);
             }
             p = new XmlProperty(pd);
             p.setValue(value);
-            properties.put(name, p);
+            properties.put(id, p);
         }
     }
 
@@ -188,7 +182,7 @@
     @Override
     public String toString() {
         return getClass().getSimpleName() + '(' + getTypeId() + ',' + getId()
-        + ')';
+                + ')';
     }
 
     public void writeObjectTo(XMLWriter xw) throws IOException {
@@ -198,7 +192,7 @@
         xw.start();
         for (XmlProperty p : properties.values()) {
             ValueAdapter va = p.getAdapter();
-            xw.element(va.getPropertyQName()).attr(CMIS.NAME, p.getName());
+            xw.element(va.getPropertyQName()).attr(CMIS.PDID, p.getId());
             xw.start();
             if (p.isValueLoaded()) {
                 Serializable v = p.getValue();

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPObjectEntryReader.java Wed Jul 29 10:21:11 2009
@@ -54,7 +54,7 @@
     @Override
     protected void readProperty(ReadContext ctx, StaxReader reader,
             APPObjectEntry object, XmlProperty p) {
-        object.properties.put(p.getName(), p);
+        object.properties.put(p.getId(), p);
     }
 
     @Override

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPPropertyDefinition.java Wed Jul 29 10:21:11 2009
@@ -21,6 +21,7 @@
 import java.io.Serializable;
 import java.lang.reflect.Array;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -48,7 +49,7 @@
 
     protected Map<String, Object> map;
 
-    protected String name;
+    protected String id;
 
     protected PropertyType type;
 
@@ -62,16 +63,29 @@
         this.map = map;
     }
 
-    public String getName() {
-        return name;
+    public String getId() {
+        return id;
     }
 
-    public String getId() {
-        return (String) map.get("id");
+    public String getLocalName() {
+        return (String) map.get(CMIS.LOCAL_NAME.getLocalPart());
+    }
+
+    public URI getLocalNamespace() {
+        String uri = (String) map.get(CMIS.LOCAL_NAMESPACE.getLocalPart());
+        try {
+            return uri == null ? null : new URI(uri);
+        } catch (URISyntaxException e) {
+            return null;
+        }
+    }
+
+    public String getQueryName() {
+        return (String) map.get(CMIS.QUERY_NAME.getLocalPart());
     }
 
     public String getDisplayName() {
-        return (String) map.get("displayName");
+        return (String) map.get(CMIS.DISPLAY_NAME.getLocalPart());
     }
 
     public String getDescription() {
@@ -211,8 +225,8 @@
         ChildrenNavigator nav = reader.getChildren();
         while (nav.next()) {
             String tag = reader.getLocalName();
-            if (tag.equals(CMIS.NAME.getLocalPart())) {
-                pd.name = reader.getElementText();
+            if (tag.equals(CMIS.ID.getLocalPart())) {
+                pd.id = reader.getElementText();
             } else if (tag.equals(CMIS.CARDINALITY.getLocalPart())) {
                 String text = reader.getElementText();
                 pd.multiValued = isMultiValued(text);
@@ -255,7 +269,7 @@
                 }
             } else {
                 if (defaultValues.size() != 1) {
-                    log.error("Single-valued property " + pd.getName()
+                    log.error("Single-valued property " + pd.getId()
                             + " got a defaultValue of size: "
                             + defaultValues.size());
                 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/APPType.java Wed Jul 29 10:21:11 2009
@@ -17,6 +17,8 @@
  */
 package org.apache.chemistry.atompub.client;
 
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -109,6 +111,19 @@
         return Collections.unmodifiableCollection(propertyDefs.values());
     }
 
+    public String getLocalName() {
+        return map.get(CMIS.LOCAL_NAME.getLocalPart());
+    }
+
+    public URI getLocalNamespace() {
+        String uri = map.get(CMIS.LOCAL_NAMESPACE.getLocalPart());
+        try {
+            return uri == null ? null : new URI(uri);
+        } catch (URISyntaxException e) {
+            return null;
+        }
+    }
+
     public String getQueryName() {
         return map.get(CMIS.QUERY_NAME.getLocalPart());
     }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/TypeEntryReader.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/TypeEntryReader.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/TypeEntryReader.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/TypeEntryReader.java Wed Jul 29 10:21:11 2009
@@ -79,11 +79,11 @@
                         pdefs = new HashMap<String, PropertyDefinition>();
                     }
                     PropertyDefinition pdef = readPropertyDef(reader);
-                    if (pdef.getName() == null) {
+                    if (pdef.getId() == null) {
                         throw new IllegalArgumentException(
-                                "Invalid property definition: no name given");
+                                "Invalid property definition: no id given");
                     }
-                    pdefs.put(pdef.getName(), pdef);
+                    pdefs.put(pdef.getId(), pdef);
                 } else {
                     String text;
                     try {
@@ -107,10 +107,11 @@
             }
             // check some mandatory properties
             // TODO also for documents: versionable, contentStreamAllowed
-            // TODO also for relationships: allowedSourceTypes, allowedTargetTypes
+            // TODO also for relationships: allowedSourceTypes,
+            // allowedTargetTypes
             for (QName qname : Arrays.asList( //
                     CMIS.ID, //
-                    // TODO localName, localNamespace
+                    CMIS.LOCAL_NAME, //
                     CMIS.QUERY_NAME, //
                     CMIS.DISPLAY_NAME, //
                     CMIS.BASE_TYPE_ID, //

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/AbstractObjectReader.java Wed Jul 29 10:21:11 2009
@@ -86,7 +86,7 @@
             incomplete = new ArrayList<XmlProperty>();
             while (it.hasNext()) {
                 XmlProperty p = it.next();
-                if (Property.TYPE_ID.equals(p.getName())) {
+                if (Property.TYPE_ID.equals(p.getId())) {
                     // type has been found
                     String v = (String) p.getXmlValue();
                     entryType = ctx.getRepository().getType(v);
@@ -119,15 +119,15 @@
 
     protected void readPropertyWithType(ReadContext ctx, StaxReader reader,
             T object, XmlProperty p, Type entryType) {
-        String name = p.getName();
-        PropertyDefinition def = entryType.getPropertyDefinition(name);
+        String id = p.getId();
+        PropertyDefinition def = entryType.getPropertyDefinition(id);
         if (def == null) {
-            if (name.equals("ContentStreamURI") || name.equals("BaseType")) {
+            if (id.equals("ContentStreamURI") || id.equals("BaseType")) {
                 // Alfresco COMPAT
                 // see org.apache.chemistry.atompub.abdera.PropertiesElement
                 return;
             }
-            throw new ParseException("No such property definition: " + name
+            throw new ParseException("No such property definition: " + id
                     + " in type: " + entryType);
         }
         p.setDefinition(def);

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/PropertyIterator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/PropertyIterator.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/PropertyIterator.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/PropertyIterator.java Wed Jul 29 10:21:11 2009
@@ -52,27 +52,27 @@
 
     @Override
     protected XmlProperty getValue() throws XMLStreamException {
-        String key = reader.getAttributeValue(CMIS.NAME);
-        if (key == null) {
+        String id = reader.getAttributeValue(CMIS.PDID);
+        if (id == null) {
             throw new XMLStreamException(
                     "Parse error. Invalid CMIS property at line: "
                             + reader.getLocation().getLineNumber()
-                            + ". No name specified");
+                            + ". No id specified");
         }
         ValueIterator vi = new ValueIterator(reader);
         if (!vi.hasNext()) {
-            return new XmlProperty(key);
+            return new XmlProperty(id);
         }
         String val = vi.next();
         if (!vi.hasNext()) {
-            return new XmlProperty(key, val);
+            return new XmlProperty(id, val);
         }
         List<String> vals = new ArrayList<String>();
         vals.add(val);
         do {
             vals.add(vi.next());
         } while (vi.hasNext());
-        return new XmlProperty(key, vals);
+        return new XmlProperty(id, vals);
     }
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/XmlProperty.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/XmlProperty.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/XmlProperty.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/main/java/org/apache/chemistry/atompub/client/stax/XmlProperty.java Wed Jul 29 10:21:11 2009
@@ -44,7 +44,7 @@
     /**
      * The internal state can be:
      * <ol>
-     * <li>if def is null, then value hold the property name,
+     * <li>if def is null, then value hold the property id,
      * <li>if def is not null, then value is either {@link NULL} if not yet
      * computed from xmlValue, or it holds the actual Java value.
      * </ol>
@@ -56,17 +56,17 @@
      */
     private Object xmlValue;
 
-    public XmlProperty(String name) {
-        value = name;
+    public XmlProperty(String id) {
+        value = id;
     }
 
-    public XmlProperty(String name, String xmlValue) {
-        value = name;
+    public XmlProperty(String id, String xmlValue) {
+        value = id;
         this.xmlValue = xmlValue;
     }
 
-    public XmlProperty(String name, List<String> xmlValue) {
-        value = name;
+    public XmlProperty(String id, List<String> xmlValue) {
+        value = id;
         this.xmlValue = xmlValue;
     }
 
@@ -82,10 +82,10 @@
     }
 
     /**
-     * Gets the property name.
+     * Gets the property ID.
      */
-    public String getName() {
-        return def == null ? (String) value : def.getName();
+    public String getId() {
+        return def == null ? (String) value : def.getId();
     }
 
     /**
@@ -187,7 +187,7 @@
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + '(' + getName() + "="
+        return this.getClass().getSimpleName() + '(' + getId() + "="
                 + (xmlValue == null ? value : xmlValue) + ')';
     }
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/java/org/apache/chemistry/atompub/client/stax/TestPropertyIterator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/java/org/apache/chemistry/atompub/client/stax/TestPropertyIterator.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/java/org/apache/chemistry/atompub/client/stax/TestPropertyIterator.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/java/org/apache/chemistry/atompub/client/stax/TestPropertyIterator.java Wed Jul 29 10:21:11 2009
@@ -37,12 +37,12 @@
         StaxReader sr = StaxReader.newReader(url.openStream());
         sr.getFirstTag(CMIS.PROPERTIES);
         PropertyIterator pi = new PropertyIterator(sr);
-        List<String> names = new LinkedList<String>();
+        List<String> ids = new LinkedList<String>();
         while (pi.hasNext()) {
-            names.add(pi.next().getName());
+            ids.add(pi.next().getId());
         }
         assertEquals(Arrays.asList("string_null", "string", "date",
-                "string_array", "date_array"), names);
+                "string_array", "date_array"), ids);
     }
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feed-types.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feed-types.xml?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feed-types.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feed-types.xml Wed Jul 29 10:21:11 2009
@@ -16,6 +16,7 @@
     <link href="http://127.0.0.1:8080/cmis/repository" rel="repository" />
     <cmis:documentType>
       <cmis:id>cmis:document</cmis:id>
+      <cmis:localName>cmis:document</cmis:localName>
       <cmis:queryName>Document</cmis:queryName>
       <cmis:displayName>Document Type</cmis:displayName>
       <cmis:baseTypeId>cmis:document</cmis:baseTypeId>
@@ -39,6 +40,7 @@
     <link href="http://127.0.0.1:8080/cmis/repository" rel="repository" />
     <cmis:folderType>
       <cmis:id>cmis:folder</cmis:id>
+      <cmis:localName>cmis:folder</cmis:localName>
       <cmis:queryName>Folder</cmis:queryName>
       <cmis:displayName>Folder Type</cmis:displayName>
       <cmis:baseTypeId>cmis:folder</cmis:baseTypeId>
@@ -62,6 +64,7 @@
     <link href="http://127.0.0.1:8080/cmis/repository" rel="repository" />
     <cmis:relationshipType>
       <cmis:id>cmis:relationship</cmis:id>
+      <cmis:localName>cmis:relationship</cmis:localName>
       <cmis:queryName>Relationship</cmis:queryName>
       <cmis:displayName>Relationship Type</cmis:displayName>
       <cmis:baseTypeId>cmis:relationship</cmis:baseTypeId>
@@ -85,6 +88,7 @@
     <link href="http://127.0.0.1:8080/cmis/repository" rel="repository" />
     <cmis:policyType>
       <cmis:id>cmis:policy</cmis:id>
+      <cmis:localName>cmis:policy</cmis:localName>
       <cmis:queryName>Policy</cmis:queryName>
       <cmis:displayName>Policy Type</cmis:displayName>
       <cmis:baseTypeId>cmis:policy</cmis:baseTypeId>
@@ -108,6 +112,7 @@
     <link href="http://127.0.0.1:8080/cmis/repository" rel="repository" />
     <cmis:folderType>
       <cmis:id>Root</cmis:id>
+      <cmis:localName>Root</cmis:localName>
       <cmis:queryName>Root</cmis:queryName>
       <cmis:displayName>Root Folder Type</cmis:displayName>
       <cmis:baseTypeId>cmis:folder</cmis:baseTypeId>

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feedentry.xml
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feedentry.xml?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feedentry.xml (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-client/src/test/resources/feedentry.xml Wed Jul 29 10:21:11 2009
@@ -2,19 +2,19 @@
 <entry xmlns="http://www.w3.org/2005/Atom" xmlns:cmis="http://docs.oasis-open.org/ns/cmis/core/200901">
   <cmis:object>
     <cmis:properties>
-      <cmis:propertyString cmis:name="string_null" />
-      <cmis:propertyString cmis:name="string">
+      <cmis:propertyString cmis:pdid="string_null" />
+      <cmis:propertyString cmis:pdid="string">
         <cmis:value>string1</cmis:value>
       </cmis:propertyString>
-      <cmis:propertyDateTime cmis:name="date">
+      <cmis:propertyDateTime cmis:pdid="date">
         <cmis:value>2009-03-17T17:55:08+01:00
         </cmis:value>
       </cmis:propertyDateTime>
-      <cmis:propertyString cmis:name="string_array">
+      <cmis:propertyString cmis:pdid="string_array">
         <cmis:value>string1</cmis:value>
         <cmis:value>string2</cmis:value>
       </cmis:propertyString>
-      <cmis:propertyDateTime cmis:name="date_array">
+      <cmis:propertyDateTime cmis:pdid="date_array">
         <cmis:value>2009-03-17T17:55:08+01:00
         </cmis:value>
         <cmis:value>2009-03-18T17:55:08+01:00

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/main/java/org/apache/chemistry/atompub/server/CMISTypesCollection.java Wed Jul 29 10:21:11 2009
@@ -17,6 +17,7 @@
 package org.apache.chemistry.atompub.server;
 
 import java.io.Serializable;
+import java.net.URI;
 import java.util.Date;
 import java.util.List;
 
@@ -130,7 +131,13 @@
         // compiling when it's on one line (compiler generics bug)
         el = factory.newElement(CMIS.ID, dt);
         el.setText(type.getId());
-        // TODO localName, localNamespace
+        el = factory.newElement(CMIS.LOCAL_NAME, dt);
+        el.setText(type.getLocalName());
+        URI localNamespace = type.getLocalNamespace();
+        if (localNamespace != null) {
+            el = factory.newElement(CMIS.LOCAL_NAMESPACE, dt);
+            el.setText(localNamespace.toString());
+        }
         el = factory.newElement(CMIS.QUERY_NAME, dt);
         el.setText(type.getQueryName());
         el = factory.newElement(CMIS.DISPLAY_NAME, dt);
@@ -191,12 +198,20 @@
                     throw new AssertionError(pd.getType().name());
                 }
                 Element def = factory.newElement(qname, dt);
-                el = factory.newElement(CMIS.NAME, def);
-                el.setText(pd.getName());
                 el = factory.newElement(CMIS.ID, def);
                 el.setText(pd.getId());
-                el = factory.newElement(CMIS.PACKAGE, def);
-                el.setText("system"); // TODO package
+                String localName = pd.getLocalName();
+                if (localName != null) {
+                    el = factory.newElement(CMIS.LOCAL_NAME, def);
+                    el.setText(localName);
+                }
+                URI lns = pd.getLocalNamespace();
+                if (lns != null) {
+                    el = factory.newElement(CMIS.LOCAL_NAMESPACE, def);
+                    el.setText(lns.toString());
+                }
+                el = factory.newElement(CMIS.QUERY_NAME, def);
+                el.setText(pd.getQueryName());
                 el = factory.newElement(CMIS.DISPLAY_NAME, def);
                 el.setText(pd.getDisplayName());
                 el = factory.newElement(CMIS.DESCRIPTION, def);

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub-server/src/test/java/org/apache/chemistry/atompub/server/AtomPubServerTestCase.java Wed Jul 29 10:21:11 2009
@@ -93,25 +93,26 @@
 
     public static Repository makeRepository(String rootId) throws IOException {
         PropertyDefinition p1 = new SimplePropertyDefinition("title",
-                "def:title", "Title", "", false, PropertyType.STRING, false,
-                null, false, false, "", Updatability.READ_WRITE, true, true, 0,
-                null, null, -1, null);
-        PropertyDefinition p2 = new SimplePropertyDefinition("description",
-                "def:description", "Description", "", false,
+                "def:title", null, "title", "Title", "", false,
                 PropertyType.STRING, false, null, false, false, "",
                 Updatability.READ_WRITE, true, true, 0, null, null, -1, null);
+        PropertyDefinition p2 = new SimplePropertyDefinition("description",
+                "def:description", null, "description", "Description", "",
+                false, PropertyType.STRING, false, null, false, false, "",
+                Updatability.READ_WRITE, true, true, 0, null, null, -1, null);
         PropertyDefinition p3 = new SimplePropertyDefinition("date",
-                "def:date", "Date", "", false, PropertyType.DATETIME, false,
-                null, false, false, null, Updatability.READ_WRITE, true, true,
-                0, null, null, -1, null);
-        SimpleType dt = new SimpleType("doc", BaseType.DOCUMENT.getId(),
-                "Doc", "My Doc Type", BaseType.DOCUMENT, "", true, true, true,
-                true, true, true, ContentStreamPresence.ALLOWED, null, null,
-                Arrays.asList(p1, p2, p3));
-        SimpleType ft = new SimpleType("fold", BaseType.FOLDER.getId(),
-                "Fold", "My Folder Type", BaseType.FOLDER, "", true, true,
-                true, true, false, false, ContentStreamPresence.NOT_ALLOWED,
-                null, null, Arrays.asList(p1, p2));
+                "def:date", null, "date", "Date", "", false,
+                PropertyType.DATETIME, false, null, false, false, null,
+                Updatability.READ_WRITE, true, true, 0, null, null, -1, null);
+        SimpleType dt = new SimpleType("doc", BaseType.DOCUMENT.getId(), "doc",
+                null, "Doc", "My Doc Type", BaseType.DOCUMENT, "", true, true,
+                true, true, true, true, ContentStreamPresence.ALLOWED, null,
+                null, Arrays.asList(p1, p2, p3));
+        SimpleType ft = new SimpleType("fold", BaseType.FOLDER.getId(), "doc",
+                null, "Fold", "My Folder Type", BaseType.FOLDER, "", true,
+                true, true, true, false, false,
+                ContentStreamPresence.NOT_ALLOWED, null, null, Arrays.asList(
+                        p1, p2));
         SimpleRepository repo = new SimpleRepository("test", Arrays.asList(dt,
                 ft), rootId);
         Connection conn = repo.getConnection(null);

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/CMIS.java Wed Jul 29 10:21:11 2009
@@ -91,6 +91,12 @@
 
     public static final QName BASE_TYPE_ID = CMISName("baseTypeId");
 
+    public static final QName ID = CMISName("id");
+
+    public static final QName LOCAL_NAME = CMISName("localName");
+
+    public static final QName LOCAL_NAMESPACE = CMISName("localNamespace");
+
     public static final QName QUERY_NAME = CMISName("queryName");
 
     public static final QName DISPLAY_NAME = CMISName("displayName");
@@ -131,12 +137,6 @@
 
     public static final QName PROPERTY_HTML_DEFINITION = CMISName("propertyHtmlDefinition");
 
-    public static final QName NAME = CMISName("name");
-
-    public static final QName ID = CMISName("id");
-
-    public static final QName PACKAGE = CMISName("package");
-
     public static final QName PROPERTY_TYPE = CMISName("propertyType");
 
     public static final QName CARDINALITY = CMISName("cardinality");
@@ -173,6 +173,12 @@
 
     public static final QName PROPERTY_HTML = CMISName("propertyHtml");
 
+    public static final QName PDID = CMISName("pdid");
+
+    public static final QName LOCALNAME = CMISName("localname");
+
+    public static final QName DISPLAYNAME = CMISName("displayname");
+
     public static final QName VALUE = CMISName("value");
 
     public static final QName ALLOWABLE_ACTIONS = CMISName("allowableActions");

Modified: incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-atompub/src/main/java/org/apache/chemistry/atompub/abdera/PropertiesElement.java Wed Jul 29 10:21:11 2009
@@ -69,14 +69,14 @@
         repository = null;
         if (contentStreamURI != null) {
             ExtensibleElement el = addExtension(CMIS.PROPERTY_URI);
-            el.setAttributeValue(CMIS.NAME, Property.CONTENT_STREAM_URI);
+            el.setAttributeValue(CMIS.PDID, Property.CONTENT_STREAM_URI);
             Element val = el.addExtension(CMIS.VALUE);
             // don't merge these two lines as JDK 5 has problems compiling it
             val.setText(contentStreamURI);
 
             // Alfresco COMPAT (incorrect property name and type):
             el = addExtension(CMIS.PROPERTY_STRING);
-            el.setAttributeValue(CMIS.NAME, "ContentStreamURI");
+            el.setAttributeValue(CMIS.PDID, "ContentStreamURI");
             val = el.addExtension(CMIS.VALUE);
             // don't merge these two lines
             val.setText(contentStreamURI);
@@ -93,8 +93,8 @@
             if (va == null) {
                 continue;
             }
-            String name = element.getAttributeValue(CMIS.NAME);
-            adapters.put(name, va);
+            String pdid = element.getAttributeValue(CMIS.PDID);
+            adapters.put(pdid, va);
             List<Serializable> list = new LinkedList<Serializable>();
             for (Element el : element.getElements()) {
                 if (!el.getQName().equals(CMIS.VALUE)) {
@@ -102,11 +102,11 @@
                 }
                 Serializable value = va.readValue(el.getText());
                 list.add(value);
-                if (name.equals(Property.TYPE_ID)) {
+                if (pdid.equals(Property.TYPE_ID)) {
                     typeId = (String) value;
                 }
             }
-            raw.put(name, list);
+            raw.put(pdid, list);
         }
         if (typeId == null) {
             // TODO proper exception
@@ -155,22 +155,12 @@
 
     public void setProperties(Map<String, Serializable> values, Type type) {
         for (PropertyDefinition propertyDefinition : type.getPropertyDefinitions()) {
-            String name = propertyDefinition.getName();
-            if (name.equals(Property.CONTENT_STREAM_URI)) {
+            String id = propertyDefinition.getId();
+            if (id.equals(Property.CONTENT_STREAM_URI)) {
                 // special-cased in constructor
                 continue;
             }
-            setProperty(values.get(name), propertyDefinition);
-
-            // Alfresco COMPAT (BaseType not in 0.6)
-            if (name.equals(Property.BASE_TYPE_ID)) {
-                // emit BaseType as well
-                ExtensibleElement el = addExtension(CMIS.PROPERTY_STRING);
-                el.setAttributeValue(CMIS.NAME, "BaseType");
-                Element val = el.addExtension(CMIS.VALUE);
-                // don't merge these two lines
-                val.setText(type.getBaseType().getId());
-            }
+            setProperty(values.get(id), propertyDefinition);
         }
     }
 
@@ -183,7 +173,15 @@
         QName qname = propertyQName(propertyDefinition);
         List<String> values = getStringsForValue(value, propertyDefinition);
         ExtensibleElement el = addExtension(qname);
-        el.setAttributeValue(CMIS.NAME, propertyDefinition.getName());
+        el.setAttributeValue(CMIS.PDID, propertyDefinition.getId());
+        String localName = propertyDefinition.getLocalName();
+        if (localName != null) {
+            el.setAttributeValue(CMIS.LOCALNAME, localName);
+        }
+        String displayName = propertyDefinition.getDisplayName();
+        if (displayName != null) {
+            el.setAttributeValue(CMIS.DISPLAYNAME, displayName);
+        }
         for (String s : values) {
             Element val = el.addExtension(CMIS.VALUE);
             // don't merge these two lines as JDK 5 has problems compiling it

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseObject.java Wed Jul 29 10:21:11 2009
@@ -37,14 +37,14 @@
     public Map<String, Property> getProperties() {
         Map<String, Property> properties = new HashMap<String, Property>();
         for (PropertyDefinition pd : getType().getPropertyDefinitions()) {
-            String name = pd.getName();
-            properties.put(name, getProperty(name));
+            String id = pd.getId();
+            properties.put(id, getProperty(id));
         }
         return properties;
     }
 
-    public void setValue(String name, Serializable value) {
-        getProperty(name).setValue(value);
+    public void setValue(String id, Serializable value) {
+        getProperty(id).setValue(value);
     }
 
     public void setValues(Map<String, Serializable> values) {
@@ -57,76 +57,76 @@
      * ----- Convenience methods -----
      */
 
-    public String getString(String name) {
-        return (String) getValue(name);
+    public String getString(String id) {
+        return (String) getValue(id);
     }
 
-    public String[] getStrings(String name) {
-        return (String[]) getValue(name);
+    public String[] getStrings(String id) {
+        return (String[]) getValue(id);
     }
 
-    public BigDecimal getDecimal(String name) {
-        return (BigDecimal) getValue(name);
+    public BigDecimal getDecimal(String id) {
+        return (BigDecimal) getValue(id);
     }
 
-    public BigDecimal[] getDecimals(String name) {
-        return (BigDecimal[]) getValue(name);
+    public BigDecimal[] getDecimals(String id) {
+        return (BigDecimal[]) getValue(id);
     }
 
-    public Integer getInteger(String name) {
-        return (Integer) getValue(name);
+    public Integer getInteger(String id) {
+        return (Integer) getValue(id);
     }
 
-    public Integer[] getIntegers(String name) {
-        return (Integer[]) getValue(name);
+    public Integer[] getIntegers(String id) {
+        return (Integer[]) getValue(id);
     }
 
-    public Boolean getBoolean(String name) {
-        return (Boolean) getValue(name);
+    public Boolean getBoolean(String id) {
+        return (Boolean) getValue(id);
     }
 
-    public Boolean[] getBooleans(String name) {
-        return (Boolean[]) getValue(name);
+    public Boolean[] getBooleans(String id) {
+        return (Boolean[]) getValue(id);
     }
 
-    public Calendar getDateTime(String name) {
-        return (Calendar) getValue(name);
+    public Calendar getDateTime(String id) {
+        return (Calendar) getValue(id);
     }
 
-    public Calendar[] getDateTimes(String name) {
-        return (Calendar[]) getValue(name);
+    public Calendar[] getDateTimes(String id) {
+        return (Calendar[]) getValue(id);
     }
 
-    public URI getURI(String name) {
-        return (URI) getValue(name);
+    public URI getURI(String id) {
+        return (URI) getValue(id);
     }
 
-    public URI[] getURIs(String name) {
-        return (URI[]) getValue(name);
+    public URI[] getURIs(String id) {
+        return (URI[]) getValue(id);
     }
 
-    public String getId(String name) {
-        return (String) getValue(name);
+    public String getId(String id) {
+        return (String) getValue(id);
     }
 
-    public String[] getIds(String name) {
-        return (String[]) getValue(name);
+    public String[] getIds(String id) {
+        return (String[]) getValue(id);
     }
 
-    public String getXML(String name) {
-        return (String) getValue(name);
+    public String getXML(String id) {
+        return (String) getValue(id);
     }
 
-    public String[] getXMLs(String name) {
-        return (String[]) getValue(name);
+    public String[] getXMLs(String id) {
+        return (String[]) getValue(id);
     }
 
-    public String getHTML(String name) {
-        return (String) getValue(name);
+    public String getHTML(String id) {
+        return (String) getValue(id);
     }
 
-    public String[] getHTMLs(String name) {
-        return (String[]) getValue(name);
+    public String[] getHTMLs(String id) {
+        return (String[]) getValue(id);
     }
 
     /*
@@ -218,8 +218,8 @@
         return getString(Property.CHECKIN_COMMENT);
     }
 
-    public void setName(String name) {
-        setValue(Property.NAME, name);
+    public void setName(String value) {
+        setValue(Property.NAME, value);
     }
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/base/BaseRepository.java Wed Jul 29 10:21:11 2009
@@ -46,33 +46,34 @@
     public static final String ROOT_TYPE_ID = "chemistry:root";
 
     public static final SimpleType ROOT_TYPE = new SimpleType(ROOT_TYPE_ID,
-            BaseType.FOLDER.getId(), ROOT_TYPE_ID, "Root Folder Type",
-            BaseType.FOLDER, "", false, false, false, false, false, false,
-            ContentStreamPresence.NOT_ALLOWED, null, null,
+            BaseType.FOLDER.getId(), ROOT_TYPE_ID, null, ROOT_TYPE_ID,
+            "Root Folder Type", BaseType.FOLDER, "", false, false, false,
+            false, false, false, ContentStreamPresence.NOT_ALLOWED, null, null,
             Collections.<PropertyDefinition> emptyList());
 
     public static final SimpleType DOCUMENT_TYPE = new SimpleType(
-            BaseType.DOCUMENT.getId(), null, BaseType.DOCUMENT.getId(),
-            "Document Type", BaseType.DOCUMENT, "", true, true, true, true,
-            true, true, ContentStreamPresence.ALLOWED, null, null,
-            Collections.<PropertyDefinition> emptyList());
+            BaseType.DOCUMENT.getId(), null, BaseType.DOCUMENT.getId(), null,
+            BaseType.DOCUMENT.getId(), "Document Type", BaseType.DOCUMENT, "",
+            true, true, true, true, true, true, ContentStreamPresence.ALLOWED,
+            null, null, Collections.<PropertyDefinition> emptyList());
 
     public static final SimpleType FOLDER_TYPE = new SimpleType(
-            BaseType.FOLDER.getId(), null, BaseType.FOLDER.getId(),
-            "Folder Type", BaseType.FOLDER, "", true, true, false, true, true,
-            false, ContentStreamPresence.NOT_ALLOWED, null, null,
-            Collections.<PropertyDefinition> emptyList());
+            BaseType.FOLDER.getId(), null, BaseType.FOLDER.getId(), null,
+            BaseType.FOLDER.getId(), "Folder Type", BaseType.FOLDER, "", true,
+            true, false, true, true, false, ContentStreamPresence.NOT_ALLOWED,
+            null, null, Collections.<PropertyDefinition> emptyList());
 
     public static final SimpleType RELATIONSHIP_TYPE = new SimpleType(
             BaseType.RELATIONSHIP.getId(), null, BaseType.RELATIONSHIP.getId(),
-            "Relationship Type", BaseType.RELATIONSHIP, "", true, true, false,
-            true, false, false, ContentStreamPresence.NOT_ALLOWED, null, null,
+            null, BaseType.RELATIONSHIP.getId(), "Relationship Type",
+            BaseType.RELATIONSHIP, "", true, true, false, true, false, false,
+            ContentStreamPresence.NOT_ALLOWED, null, null,
             Collections.<PropertyDefinition> emptyList());
 
     protected static final SimpleType POLICY_TYPE = new SimpleType(
-            BaseType.POLICY.getId(), null, "Policy", "Policy Type",
-            BaseType.POLICY, "", true, true, false, true, false, false,
-            ContentStreamPresence.NOT_ALLOWED, null, null,
+            BaseType.POLICY.getId(), null, BaseType.POLICY.getId(), null,
+            "Policy", "Policy Type", BaseType.POLICY, "", true, true, false,
+            true, false, false, ContentStreamPresence.NOT_ALLOWED, null, null,
             Collections.<PropertyDefinition> emptyList());
 
     protected final String name;

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleConnection.java Wed Jul 29 10:21:11 2009
@@ -294,43 +294,43 @@
         Map<String, Serializable> update = new HashMap<String, Serializable>();
 
         // generate an ID
-        String id = repository.generateId();
-        update.put(Property.ID, id);
+        String objectId = repository.generateId();
+        update.put(Property.ID, objectId);
 
         // check mandatory properties
         Type type = repository.getType(typeId);
         for (PropertyDefinition pd : type.getPropertyDefinitions()) {
-            String name = pd.getName();
-            if (Property.ID.equals(name)) {
+            String id = pd.getId();
+            if (Property.ID.equals(id)) {
                 // ignore, set later
                 continue;
             }
-            if (pd.isRequired() && !data.containsKey(name)) {
-                if (Property.NAME.equals(name)) {
-                    update.put(Property.NAME, id);
-                } else if (Property.CREATED_BY.equals(name)) {
+            if (pd.isRequired() && !data.containsKey(id)) {
+                if (Property.NAME.equals(id)) {
+                    update.put(Property.NAME, objectId);
+                } else if (Property.CREATED_BY.equals(id)) {
                     update.put(Property.CREATED_BY, "system"); // TODO
-                } else if (Property.CREATION_DATE.equals(name)) {
+                } else if (Property.CREATION_DATE.equals(id)) {
                     update.put(Property.CREATION_DATE,
                             GregorianCalendar.getInstance());
-                } else if (Property.LAST_MODIFIED_BY.equals(name)) {
+                } else if (Property.LAST_MODIFIED_BY.equals(id)) {
                     update.put(Property.LAST_MODIFIED_BY, "system"); // TODO
-                } else if (Property.LAST_MODIFICATION_DATE.equals(name)) {
+                } else if (Property.LAST_MODIFICATION_DATE.equals(id)) {
                     update.put(Property.LAST_MODIFICATION_DATE,
                             GregorianCalendar.getInstance());
-                } else if (Property.IS_LATEST_VERSION.equals(name)) {
+                } else if (Property.IS_LATEST_VERSION.equals(id)) {
                     update.put(Property.IS_LATEST_VERSION, Boolean.TRUE);
-                } else if (Property.IS_LATEST_MAJOR_VERSION.equals(name)) {
+                } else if (Property.IS_LATEST_MAJOR_VERSION.equals(id)) {
                     update.put(Property.IS_LATEST_MAJOR_VERSION, Boolean.TRUE);
-                } else if (Property.IS_VERSION_SERIES_CHECKED_OUT.equals(name)) {
+                } else if (Property.IS_VERSION_SERIES_CHECKED_OUT.equals(id)) {
                     update.put(Property.IS_VERSION_SERIES_CHECKED_OUT,
                             Boolean.FALSE);
-                } else if (Property.VERSION_SERIES_ID.equals(name)) {
-                    update.put(Property.VERSION_SERIES_ID, id);
-                } else if (Property.VERSION_LABEL.equals(name)) {
+                } else if (Property.VERSION_SERIES_ID.equals(id)) {
+                    update.put(Property.VERSION_SERIES_ID, objectId);
+                } else if (Property.VERSION_LABEL.equals(id)) {
                     update.put(Property.VERSION_LABEL, "1.0");
                 } else {
-                    throw new RuntimeException("Missing property: " + name); // TODO
+                    throw new RuntimeException("Missing property: " + id); // TODO
                 }
             }
         }
@@ -355,13 +355,13 @@
         }
 
         // properties
-        repository.datas.put(id, data); // TODO clone data?
+        repository.datas.put(objectId, data); // TODO clone data?
 
         // parents/children
         String parentId = (String) data.get(Property.PARENT_ID);
         if (type.getBaseType() == BaseType.FOLDER) {
             // new folder, empty set of children
-            repository.children.put(id, repository.newSet());
+            repository.children.put(objectId, repository.newSet());
         } else {
             // only folders have this property
             data.remove(Property.PARENT_ID);
@@ -371,9 +371,9 @@
             // pointer to parent
             Set<String> parents = repository.newSet();
             parents.add(parentId);
-            repository.parents.put(id, parents);
+            repository.parents.put(objectId, parents);
             // new pointer to child
-            repository.children.get(parentId).add(id);
+            repository.children.get(parentId).add(objectId);
         }
     }
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObject.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObject.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObject.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObject.java Wed Jul 29 10:21:11 2009
@@ -124,25 +124,25 @@
         return type.getBaseType();
     }
 
-    public Serializable getValue(String name) {
-        PropertyDefinition pd = getType().getPropertyDefinition(name);
+    public Serializable getValue(String id) {
+        PropertyDefinition pd = getType().getPropertyDefinition(id);
         if (pd == null) {
-            throw new IllegalArgumentException(name);
+            throw new IllegalArgumentException(id);
         }
-        Serializable value = entry.data.get(name);
+        Serializable value = entry.data.get(id);
         if (value == null) {
             value = pd.getDefaultValue();
         }
         return value;
     }
 
-    public Property getProperty(String name) {
+    public Property getProperty(String id) {
         PropertyDefinition propertyDefinition = getType().getPropertyDefinition(
-                name);
+                id);
         if (propertyDefinition == null) {
-            throw new IllegalArgumentException(name);
+            throw new IllegalArgumentException(id);
         }
-        return new SimpleProperty(entry, name, propertyDefinition);
+        return new SimpleProperty(entry, id, propertyDefinition);
     }
 
     public void save() {

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObjectEntry.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObjectEntry.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObjectEntry.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleObjectEntry.java Wed Jul 29 10:21:11 2009
@@ -57,22 +57,22 @@
         return new HashMap<String, Serializable>(data);
     }
 
-    public Serializable getValue(String name) {
-        return data.get(name);
+    public Serializable getValue(String id) {
+        return data.get(id);
     }
 
-    public void setValue(String name, Serializable value) {
+    public void setValue(String id, Serializable value) {
         if (value == null) {
-            data.remove(name);
+            data.remove(id);
         } else {
-            data.put(name, value);
+            data.put(id, value);
         }
     }
 
     public void setValues(Map<String, Serializable> values) {
         // don't use putAll as we want to check for nulls
-        for (String name : values.keySet()) {
-            setValue(name, values.get(name));
+        for (String id : values.keySet()) {
+            setValue(id, values.get(id));
         }
     }
 

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleProperty.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleProperty.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleProperty.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimpleProperty.java Wed Jul 29 10:21:11 2009
@@ -32,14 +32,14 @@
 
     protected final ObjectEntry entry;
 
-    protected final String name;
+    protected final String id;
 
     private final PropertyDefinition propertyDefinition;
 
-    public SimpleProperty(ObjectEntry entry, String name,
+    public SimpleProperty(ObjectEntry entry, String id,
             PropertyDefinition propertyDefinition) {
         this.entry = entry;
-        this.name = name;
+        this.id = id;
         this.propertyDefinition = propertyDefinition;
     }
 
@@ -48,14 +48,14 @@
     }
 
     public Serializable getValue() {
-        return entry.getValue(name);
+        return entry.getValue(id);
     }
 
     public void setValue(Serializable value) {
         if (propertyDefinition.getUpdatability() == Updatability.READ_ONLY) {
-            throw new RuntimeException("Read-only property: " + name);
+            throw new RuntimeException("Read-only property: " + id);
         }
-        entry.setValue(name, value);
+        entry.setValue(id, value);
     }
 
 }

Modified: incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimplePropertyDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimplePropertyDefinition.java?rev=798836&r1=798835&r2=798836&view=diff
==============================================================================
--- incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimplePropertyDefinition.java (original)
+++ incubator/chemistry/trunk/chemistry/chemistry-commons/src/main/java/org/apache/chemistry/impl/simple/SimplePropertyDefinition.java Wed Jul 29 10:21:11 2009
@@ -29,10 +29,14 @@
 
 public class SimplePropertyDefinition implements PropertyDefinition {
 
-    private final String name;
-
     private final String id;
 
+    private final String localName;
+
+    private final URI localNamespace;
+
+    private final String queryName;
+
     private final String displayName;
 
     private final String description;
@@ -67,7 +71,8 @@
 
     private final URI schemaURI;
 
-    public SimplePropertyDefinition(String name, String id, String displayName,
+    public SimplePropertyDefinition(String id, String localName,
+            URI localNamespace, String queryName, String displayName,
             String description, boolean inherited, PropertyType type,
             boolean multiValued, List<Choice> choices, boolean openChoice,
             boolean required, Serializable defaultValue,
@@ -75,12 +80,14 @@
             int precision, Integer minValue, Integer maxValue, int maxLength,
             URI schemaURI) {
         super();
-        if (name.equals(SimpleProperty.CONTENT_BYTES_KEY)) {
+        if (id.equals(SimpleProperty.CONTENT_BYTES_KEY)) {
             throw new IllegalArgumentException(SimpleProperty.CONTENT_BYTES_KEY
                     + " is a reserved name");
         }
-        this.name = name;
         this.id = id;
+        this.localName = localName;
+        this.localNamespace = localNamespace;
+        this.queryName = queryName;
         this.displayName = displayName;
         this.description = description;
         this.inherited = inherited;
@@ -101,14 +108,22 @@
         this.schemaURI = schemaURI;
     }
 
-    public String getName() {
-        return name;
-    }
-
     public String getId() {
         return id;
     }
 
+    public String getLocalName() {
+        return localName;
+    }
+
+    public URI getLocalNamespace() {
+        return localNamespace;
+    }
+
+    public String getQueryName() {
+        return queryName;
+    }
+
     public String getDisplayName() {
         return displayName;
     }



Mime
View raw message