You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2010/04/16 10:52:16 UTC
svn commit: r934714 [7/8] - in /incubator/chemistry/opencmis/trunk: chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/ chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/or...

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoredObjectImpl.java Fri Apr 16 08:52:10 2010
@@ -27,8 +27,8 @@ import java.util.TimeZone;
 import java.util.Map.Entry;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.inmemory.FilterParser;
 import org.apache.chemistry.opencmis.inmemory.storedobj.api.StoredObject;
 
@@ -214,34 +214,34 @@ public class StoredObjectImpl implements
   public void fillProperties(Map<String, PropertyData<?>> properties,
       BindingsObjectFactory objFactory, List<String> requestedIds) {
     
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_NAME, requestedIds)) {
-      properties.put(PropertyIds.CMIS_NAME, objFactory.createPropertyStringData(PropertyIds.CMIS_NAME, getName()));
+    if (FilterParser.isContainedInFilter(PropertyIds.NAME, requestedIds)) {
+      properties.put(PropertyIds.NAME, objFactory.createPropertyStringData(PropertyIds.NAME, getName()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_OBJECT_ID, requestedIds)) {
-      properties.put(PropertyIds.CMIS_OBJECT_ID, objFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_ID, getId()));
+    if (FilterParser.isContainedInFilter(PropertyIds.OBJECT_ID, requestedIds)) {
+      properties.put(PropertyIds.OBJECT_ID, objFactory.createPropertyIdData(PropertyIds.OBJECT_ID, getId()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_OBJECT_TYPE_ID, requestedIds)) {
-      properties.put(PropertyIds.CMIS_OBJECT_TYPE_ID, objFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, getTypeId()));
+    if (FilterParser.isContainedInFilter(PropertyIds.OBJECT_TYPE_ID, requestedIds)) {
+      properties.put(PropertyIds.OBJECT_TYPE_ID, objFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, getTypeId()));
     }
     // set the base type id outside becaus it requires the type definition
 //    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_BASE_TYPE_ID, requestedIds)) {
 //      properties.add(objFactory.createPropertyIdData(PropertyIds.CMIS_BASE_TYPE_ID, getBaseTypeId()));
 //    }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_CREATED_BY, requestedIds)) {
-      properties.put(PropertyIds.CMIS_CREATED_BY, objFactory.createPropertyStringData(PropertyIds.CMIS_CREATED_BY, getCreatedBy()));
+    if (FilterParser.isContainedInFilter(PropertyIds.CREATED_BY, requestedIds)) {
+      properties.put(PropertyIds.CREATED_BY, objFactory.createPropertyStringData(PropertyIds.CREATED_BY, getCreatedBy()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_CREATION_DATE, requestedIds)) {
-      properties.put(PropertyIds.CMIS_CREATION_DATE, objFactory.createPropertyDateTimeData(PropertyIds.CMIS_CREATION_DATE, getCreatedAt()));
+    if (FilterParser.isContainedInFilter(PropertyIds.CREATION_DATE, requestedIds)) {
+      properties.put(PropertyIds.CREATION_DATE, objFactory.createPropertyDateTimeData(PropertyIds.CREATION_DATE, getCreatedAt()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_LAST_MODIFIED_BY, requestedIds)) {
-      properties.put(PropertyIds.CMIS_LAST_MODIFIED_BY, objFactory.createPropertyStringData(PropertyIds.CMIS_LAST_MODIFIED_BY, getModifiedBy()));
+    if (FilterParser.isContainedInFilter(PropertyIds.LAST_MODIFIED_BY, requestedIds)) {
+      properties.put(PropertyIds.LAST_MODIFIED_BY, objFactory.createPropertyStringData(PropertyIds.LAST_MODIFIED_BY, getModifiedBy()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_LAST_MODIFICATION_DATE, requestedIds)) {
-      properties.put(PropertyIds.CMIS_LAST_MODIFICATION_DATE, objFactory.createPropertyDateTimeData(PropertyIds.CMIS_LAST_MODIFICATION_DATE, getModifiedAt()));
+    if (FilterParser.isContainedInFilter(PropertyIds.LAST_MODIFICATION_DATE, requestedIds)) {
+      properties.put(PropertyIds.LAST_MODIFICATION_DATE, objFactory.createPropertyDateTimeData(PropertyIds.LAST_MODIFICATION_DATE, getModifiedAt()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_CHANGE_TOKEN, requestedIds)) {
+    if (FilterParser.isContainedInFilter(PropertyIds.CHANGE_TOKEN, requestedIds)) {
       String token = getChangeToken();
-      properties.put(PropertyIds.CMIS_CHANGE_TOKEN, objFactory.createPropertyStringData(PropertyIds.CMIS_CHANGE_TOKEN, token));
+      properties.put(PropertyIds.CHANGE_TOKEN, objFactory.createPropertyStringData(PropertyIds.CHANGE_TOKEN, token));
     }
 
     // add custom properties of type definition to the collection
@@ -282,8 +282,8 @@ public class StoredObjectImpl implements
     setModifiedBy(user);
     if (isCreated) {
       setCreatedBy(user);
-      setName((String) properties.get(PropertyIds.CMIS_NAME).getFirstValue());
-      setTypeId((String) properties.get(PropertyIds.CMIS_OBJECT_TYPE_ID).getFirstValue());
+      setName((String) properties.get(PropertyIds.NAME).getFirstValue());
+      setTypeId((String) properties.get(PropertyIds.OBJECT_TYPE_ID).getFirstValue());
     } else {
       setModifiedAtNow();
     }      
@@ -342,68 +342,68 @@ public class StoredObjectImpl implements
   */
   private void removeAllSystemProperties(Map<String, PropertyData<?>> properties) {
     // ---- base ----
-    if (properties.containsKey(PropertyIds.CMIS_NAME))
-      properties.remove(PropertyIds.CMIS_NAME);
-    if (properties.containsKey(PropertyIds.CMIS_OBJECT_ID))
-      properties.remove(PropertyIds.CMIS_OBJECT_ID);
-    if (properties.containsKey(PropertyIds.CMIS_OBJECT_TYPE_ID))
-      properties.remove(PropertyIds.CMIS_OBJECT_TYPE_ID);
-    if (properties.containsKey(PropertyIds.CMIS_BASE_TYPE_ID))
-      properties.remove(PropertyIds.CMIS_BASE_TYPE_ID);
-    if (properties.containsKey(PropertyIds.CMIS_CREATED_BY))
-      properties.remove(PropertyIds.CMIS_CREATED_BY);
-    if (properties.containsKey(PropertyIds.CMIS_CREATION_DATE))
-      properties.remove(PropertyIds.CMIS_CREATION_DATE);
-    if (properties.containsKey(PropertyIds.CMIS_LAST_MODIFIED_BY))
-      properties.remove(PropertyIds.CMIS_LAST_MODIFIED_BY);
-    if (properties.containsKey(PropertyIds.CMIS_LAST_MODIFICATION_DATE))
-      properties.remove(PropertyIds.CMIS_LAST_MODIFICATION_DATE);
-    if (properties.containsKey(PropertyIds.CMIS_CHANGE_TOKEN))
-      properties.remove(PropertyIds.CMIS_CHANGE_TOKEN);
+    if (properties.containsKey(PropertyIds.NAME))
+      properties.remove(PropertyIds.NAME);
+    if (properties.containsKey(PropertyIds.OBJECT_ID))
+      properties.remove(PropertyIds.OBJECT_ID);
+    if (properties.containsKey(PropertyIds.OBJECT_TYPE_ID))
+      properties.remove(PropertyIds.OBJECT_TYPE_ID);
+    if (properties.containsKey(PropertyIds.BASE_TYPE_ID))
+      properties.remove(PropertyIds.BASE_TYPE_ID);
+    if (properties.containsKey(PropertyIds.CREATED_BY))
+      properties.remove(PropertyIds.CREATED_BY);
+    if (properties.containsKey(PropertyIds.CREATION_DATE))
+      properties.remove(PropertyIds.CREATION_DATE);
+    if (properties.containsKey(PropertyIds.LAST_MODIFIED_BY))
+      properties.remove(PropertyIds.LAST_MODIFIED_BY);
+    if (properties.containsKey(PropertyIds.LAST_MODIFICATION_DATE))
+      properties.remove(PropertyIds.LAST_MODIFICATION_DATE);
+    if (properties.containsKey(PropertyIds.CHANGE_TOKEN))
+      properties.remove(PropertyIds.CHANGE_TOKEN);
     // ---- document ----
-    if (properties.containsKey(PropertyIds.CMIS_IS_IMMUTABLE))
-      properties.remove(PropertyIds.CMIS_IS_IMMUTABLE);
-    if (properties.containsKey(PropertyIds.CMIS_IS_LATEST_VERSION))
-      properties.remove(PropertyIds.CMIS_IS_LATEST_VERSION);
-    if (properties.containsKey(PropertyIds.CMIS_IS_MAJOR_VERSION))
-      properties.remove(PropertyIds.CMIS_IS_MAJOR_VERSION);
-    if (properties.containsKey(PropertyIds.CMIS_IS_LATEST_MAJOR_VERSION))
-      properties.remove(PropertyIds.CMIS_IS_LATEST_MAJOR_VERSION);
-    if (properties.containsKey(PropertyIds.CMIS_VERSION_LABEL))
-      properties.remove(PropertyIds.CMIS_VERSION_LABEL);
-    if (properties.containsKey(PropertyIds.CMIS_VERSION_SERIES_ID))
-      properties.remove(PropertyIds.CMIS_VERSION_SERIES_ID);
-    if (properties.containsKey(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT))
-      properties.remove(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT);
-    if (properties.containsKey(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY))
-      properties.remove(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY);
-    if (properties.containsKey(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID))
-      properties.remove(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID);
-    if (properties.containsKey(PropertyIds.CMIS_CHECKIN_COMMENT))
-      properties.remove(PropertyIds.CMIS_CHECKIN_COMMENT);
-    if (properties.containsKey(PropertyIds.CMIS_CONTENT_STREAM_LENGTH))
-      properties.remove(PropertyIds.CMIS_CONTENT_STREAM_LENGTH);
-    if (properties.containsKey(PropertyIds.CMIS_CONTENT_STREAM_MIME_TYPE))
-      properties.remove(PropertyIds.CMIS_CONTENT_STREAM_MIME_TYPE);
-    if (properties.containsKey(PropertyIds.CMIS_CONTENT_STREAM_FILE_NAME))
-      properties.remove(PropertyIds.CMIS_CONTENT_STREAM_FILE_NAME);
-    if (properties.containsKey(PropertyIds.CMIS_CONTENT_STREAM_ID))
-      properties.remove(PropertyIds.CMIS_CONTENT_STREAM_ID);
+    if (properties.containsKey(PropertyIds.IS_IMMUTABLE))
+      properties.remove(PropertyIds.IS_IMMUTABLE);
+    if (properties.containsKey(PropertyIds.IS_LATEST_VERSION))
+      properties.remove(PropertyIds.IS_LATEST_VERSION);
+    if (properties.containsKey(PropertyIds.IS_MAJOR_VERSION))
+      properties.remove(PropertyIds.IS_MAJOR_VERSION);
+    if (properties.containsKey(PropertyIds.IS_LATEST_MAJOR_VERSION))
+      properties.remove(PropertyIds.IS_LATEST_MAJOR_VERSION);
+    if (properties.containsKey(PropertyIds.VERSION_LABEL))
+      properties.remove(PropertyIds.VERSION_LABEL);
+    if (properties.containsKey(PropertyIds.VERSION_SERIES_ID))
+      properties.remove(PropertyIds.VERSION_SERIES_ID);
+    if (properties.containsKey(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT))
+      properties.remove(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
+    if (properties.containsKey(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY))
+      properties.remove(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY);
+    if (properties.containsKey(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID))
+      properties.remove(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID);
+    if (properties.containsKey(PropertyIds.CHECKIN_COMMENT))
+      properties.remove(PropertyIds.CHECKIN_COMMENT);
+    if (properties.containsKey(PropertyIds.CONTENT_STREAM_LENGTH))
+      properties.remove(PropertyIds.CONTENT_STREAM_LENGTH);
+    if (properties.containsKey(PropertyIds.CONTENT_STREAM_MIME_TYPE))
+      properties.remove(PropertyIds.CONTENT_STREAM_MIME_TYPE);
+    if (properties.containsKey(PropertyIds.CONTENT_STREAM_FILE_NAME))
+      properties.remove(PropertyIds.CONTENT_STREAM_FILE_NAME);
+    if (properties.containsKey(PropertyIds.CONTENT_STREAM_ID))
+      properties.remove(PropertyIds.CONTENT_STREAM_ID);
     // ---- folder ----     
-    if (properties.containsKey(PropertyIds.CMIS_PARENT_ID))
-      properties.remove(PropertyIds.CMIS_PARENT_ID);
-    if (properties.containsKey(PropertyIds.CMIS_ALLOWED_CHILD_OBJECT_TYPE_IDS))
-      properties.remove(PropertyIds.CMIS_ALLOWED_CHILD_OBJECT_TYPE_IDS);
-    if (properties.containsKey(PropertyIds.CMIS_PATH))
-      properties.remove(PropertyIds.CMIS_PATH);
+    if (properties.containsKey(PropertyIds.PARENT_ID))
+      properties.remove(PropertyIds.PARENT_ID);
+    if (properties.containsKey(PropertyIds.ALLOWED_CHILD_OBJECT_TYPE_IDS))
+      properties.remove(PropertyIds.ALLOWED_CHILD_OBJECT_TYPE_IDS);
+    if (properties.containsKey(PropertyIds.PATH))
+      properties.remove(PropertyIds.PATH);
     // ---- relationship ----
-    if (properties.containsKey(PropertyIds.CMIS_SOURCE_ID))
-      properties.remove(PropertyIds.CMIS_SOURCE_ID);
-    if (properties.containsKey(PropertyIds.CMIS_TARGET_ID))
-      properties.remove(PropertyIds.CMIS_TARGET_ID);
+    if (properties.containsKey(PropertyIds.SOURCE_ID))
+      properties.remove(PropertyIds.SOURCE_ID);
+    if (properties.containsKey(PropertyIds.TARGET_ID))
+      properties.remove(PropertyIds.TARGET_ID);
     // ---- policy ----
-    if (properties.containsKey(PropertyIds.CMIS_POLICY_TEXT))
-      properties.remove(PropertyIds.CMIS_POLICY_TEXT);
+    if (properties.containsKey(PropertyIds.POLICY_TEXT))
+      properties.remove(PropertyIds.POLICY_TEXT);
   }
 
 public void persist() {

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/VersionedDocumentImpl.java Fri Apr 16 08:52:10 2010
@@ -23,9 +23,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
 import org.apache.chemistry.opencmis.inmemory.FilterParser;
@@ -152,17 +152,17 @@ public class VersionedDocumentImpl exten
     super.fillProperties(properties, objFactory, requestedIds);
     
     // overwrite the version related properties 
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_VERSION_SERIES_ID, requestedIds)) { 
-      properties.put(PropertyIds.CMIS_VERSION_SERIES_ID, objFactory.createPropertyIdData(PropertyIds.CMIS_VERSION_SERIES_ID, getId()));
+    if (FilterParser.isContainedInFilter(PropertyIds.VERSION_SERIES_ID, requestedIds)) { 
+      properties.put(PropertyIds.VERSION_SERIES_ID, objFactory.createPropertyIdData(PropertyIds.VERSION_SERIES_ID, getId()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT, requestedIds)) {
-      properties.put(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT, objFactory.createPropertyBooleanData(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT, isCheckedOut()));
+    if (FilterParser.isContainedInFilter(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT, requestedIds)) {
+      properties.put(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT, objFactory.createPropertyBooleanData(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT, isCheckedOut()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY, requestedIds)) {
-      properties.put(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY, objFactory.createPropertyStringData(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY, getCheckedOutBy()));
+    if (FilterParser.isContainedInFilter(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY, requestedIds)) {
+      properties.put(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY, objFactory.createPropertyStringData(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY, getCheckedOutBy()));
     }
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID, requestedIds)) {
-      properties.put(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID, objFactory.createPropertyIdData(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID, pwc == null ? null : pwc.getId()));
+    if (FilterParser.isContainedInFilter(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID, requestedIds)) {
+      properties.put(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID, objFactory.createPropertyIdData(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID, pwc == null ? null : pwc.getId()));
     }
     
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/DocumentTypeCreationHelper.java Fri Apr 16 08:52:10 2010
@@ -82,48 +82,48 @@ public class DocumentTypeCreationHelper 
       Map<String, PropertyDefinition<?>> propertyDefinitions) {
 
     PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_NAME, "CMIS Name Property");
+        PropertyIds.NAME, "CMIS Name Property");
     propS.setUpdatability(Updatability.READWRITE);
     propertyDefinitions.put(propS.getId(), propS);
     
     PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_OBJECT_ID, "CMIS Object Id Property");
+        PropertyIds.OBJECT_ID, "CMIS Object Id Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propId.getId(), propId);
     
     propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_OBJECT_TYPE_ID, "CMIS Object Type Id Property");
+        PropertyIds.OBJECT_TYPE_ID, "CMIS Object Type Id Property");
     propId.setUpdatability(Updatability.ONCREATE);
     propId.setIsRequired(true);
     propertyDefinitions.put(propId.getId(), propId);
     
     propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_BASE_TYPE_ID, "CMIS Base Type Id Property");
+        PropertyIds.BASE_TYPE_ID, "CMIS Base Type Id Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propId.getId(), propId);
     
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_CREATED_BY, "CMIS Created By Property");
+        PropertyIds.CREATED_BY, "CMIS Created By Property");
     propS.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
     
     PropertyDateTimeDefinitionImpl propD = PropertyCreationHelper.createDateTimeDefinition(
-        PropertyIds.CMIS_CREATION_DATE, "CMIS Creation Date Property");
+        PropertyIds.CREATION_DATE, "CMIS Creation Date Property");
     propD.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propD.getId(), propD);
     
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_LAST_MODIFIED_BY, "CMIS Last Modified By Property");
+        PropertyIds.LAST_MODIFIED_BY, "CMIS Last Modified By Property");
     propS.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
     
     propD = PropertyCreationHelper.createDateTimeDefinition(
-        PropertyIds.CMIS_LAST_MODIFICATION_DATE, "CMIS Last Modification Date Property");
+        PropertyIds.LAST_MODIFICATION_DATE, "CMIS Last Modification Date Property");
     propD.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propD.getId(), propD);
     
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_CHANGE_TOKEN, "CMIS Change Token Property");
+        PropertyIds.CHANGE_TOKEN, "CMIS Change Token Property");
     propS.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
   }
@@ -133,71 +133,71 @@ public class DocumentTypeCreationHelper 
     
     setBasicPropertyDefinitions(propertyDefinitions);
     PropertyBooleanDefinitionImpl propB = PropertyCreationHelper.createBooleanDefinition(
-        PropertyIds.CMIS_IS_IMMUTABLE, "CMIS Is Immutable Property");
+        PropertyIds.IS_IMMUTABLE, "CMIS Is Immutable Property");
     propB.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propB.getId(), propB);
     
     propB = PropertyCreationHelper.createBooleanDefinition(
-        PropertyIds.CMIS_IS_LATEST_VERSION, "CMIS Is Latest Version Property");
+        PropertyIds.IS_LATEST_VERSION, "CMIS Is Latest Version Property");
     propB.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propB.getId(), propB);
     
     propB = PropertyCreationHelper.createBooleanDefinition(
-        PropertyIds.CMIS_IS_MAJOR_VERSION, "CMIS Is Major Version Property");
+        PropertyIds.IS_MAJOR_VERSION, "CMIS Is Major Version Property");
     propB.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propB.getId(), propB);
     
     propB = PropertyCreationHelper.createBooleanDefinition(
-        PropertyIds.CMIS_IS_LATEST_MAJOR_VERSION, "CMIS Is Latest Major Version Property");
+        PropertyIds.IS_LATEST_MAJOR_VERSION, "CMIS Is Latest Major Version Property");
     propB.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propB.getId(), propB);
     
     PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_VERSION_LABEL, "CMIS Version Label Property");
+        PropertyIds.VERSION_LABEL, "CMIS Version Label Property");
     propS.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
     
     PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_VERSION_SERIES_ID, "CMIS Version Series Id Property");
+        PropertyIds.VERSION_SERIES_ID, "CMIS Version Series Id Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propId.getId(), propId);
     
     propB = PropertyCreationHelper.createBooleanDefinition(
-        PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT, "CMIS Is Version Series Checked Out Property");
+        PropertyIds.IS_VERSION_SERIES_CHECKED_OUT, "CMIS Is Version Series Checked Out Property");
     propB.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propB.getId(), propB);
         
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY, "CMIS Version Series Checked Out By Property");
+        PropertyIds.VERSION_SERIES_CHECKED_OUT_BY, "CMIS Version Series Checked Out By Property");
     propS.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
     
     propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID, "CMIS Version Series Checked Out Id Property");
+        PropertyIds.VERSION_SERIES_CHECKED_OUT_ID, "CMIS Version Series Checked Out Id Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propId.getId(), propId);
     
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_CHECKIN_COMMENT, "CMIS Checkin Comment Property");
+        PropertyIds.CHECKIN_COMMENT, "CMIS Checkin Comment Property");
     propId.setUpdatability(Updatability.READONLY); // Note: spec says read-only, because not set as property
     propertyDefinitions.put(propS.getId(), propS);
     
     PropertyIntegerDefinitionImpl propI= PropertyCreationHelper.createIntegerDefinition(
-        PropertyIds.CMIS_CONTENT_STREAM_LENGTH, "CMIS Content Stream Length Property");
+        PropertyIds.CONTENT_STREAM_LENGTH, "CMIS Content Stream Length Property");
     propI.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propI.getId(), propI);
     
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_CONTENT_STREAM_MIME_TYPE, "CMIS Content Stream Mime Type Property");
+        PropertyIds.CONTENT_STREAM_MIME_TYPE, "CMIS Content Stream Mime Type Property");
     propS.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
     
     propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_CONTENT_STREAM_FILE_NAME, "CMIS Content Stream File Name Property");
+        PropertyIds.CONTENT_STREAM_FILE_NAME, "CMIS Content Stream File Name Property");
     propertyDefinitions.put(propS.getId(), propS);
     
     propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_CONTENT_STREAM_ID, "CMIS Stream Id Property");
+        PropertyIds.CONTENT_STREAM_ID, "CMIS Stream Id Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propId.getId(), propId);
     
@@ -209,18 +209,18 @@ public class DocumentTypeCreationHelper 
 
     setBasicPropertyDefinitions(propertyDefinitions);
     PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_PARENT_ID, "CMIS Parent Id Property");
+        PropertyIds.PARENT_ID, "CMIS Parent Id Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propId.getId(), propId);
     
     propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_ALLOWED_CHILD_OBJECT_TYPE_IDS, "CMIS Allowed Childe Object Type Ids Property");
+        PropertyIds.ALLOWED_CHILD_OBJECT_TYPE_IDS, "CMIS Allowed Childe Object Type Ids Property");
     propId.setUpdatability(Updatability.READONLY);
     propId.setCardinality(Cardinality.MULTI);
     propertyDefinitions.put(propId.getId(), propId);
     
     PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_PATH, "CMIS Path Property");
+        PropertyIds.PATH, "CMIS Path Property");
     propId.setUpdatability(Updatability.READONLY);
     propertyDefinitions.put(propS.getId(), propS);
 
@@ -231,7 +231,7 @@ public class DocumentTypeCreationHelper 
 
     setBasicPropertyDefinitions(propertyDefinitions);
     PropertyStringDefinitionImpl propS = PropertyCreationHelper.createStringDefinition(
-        PropertyIds.CMIS_POLICY_TEXT, "CMIS Policy Text Property");
+        PropertyIds.POLICY_TEXT, "CMIS Policy Text Property");
     propS.setIsRequired(true);
     propertyDefinitions.put(propS.getId(), propS);    
   }
@@ -241,12 +241,12 @@ public class DocumentTypeCreationHelper 
   
     setBasicPropertyDefinitions(propertyDefinitions);
     PropertyIdDefinitionImpl propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_SOURCE_ID, "CMIS Source Id Property");
+        PropertyIds.SOURCE_ID, "CMIS Source Id Property");
     propId.setIsRequired(true);
     propertyDefinitions.put(propId.getId(), propId);
     
     propId = PropertyCreationHelper.createIdDefinition(
-        PropertyIds.CMIS_TARGET_ID, "CMIS Target Id Property");
+        PropertyIds.TARGET_ID, "CMIS Target Id Property");
     propId.setIsRequired(true);
     propertyDefinitions.put(propId.getId(), propId);
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java Fri Apr 16 08:52:10 2010
@@ -25,15 +25,15 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.AllowableActions;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
 import org.apache.chemistry.opencmis.commons.api.Choice;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.Cardinality;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.PropertyType;
@@ -215,7 +215,7 @@ public class PropertyCreationHelper {
 
     String typeId = so.getTypeId();
       // (String) props.getProperties().get(PropertyIds.CMIS_OBJECT_TYPE_ID).getFirstValue();
-    if (FilterParser.isContainedInFilter(PropertyIds.CMIS_BASE_TYPE_ID, requestedIds)) {
+    if (FilterParser.isContainedInFilter(PropertyIds.BASE_TYPE_ID, requestedIds)) {
       TypeDefinitionContainer typeDefC = storeManager.getTypeById(repositoryId, typeId);
       if (typeDefC == null) {
         log.warn("getPropertiesFromObject(), cannot get type definition, a type with id " + typeId
@@ -223,7 +223,7 @@ public class PropertyCreationHelper {
       } else {
         TypeDefinition typeDef = typeDefC.getTypeDefinition();
         String baseTypeId = typeDef.getBaseId().value();
-        properties.put(PropertyIds.CMIS_BASE_TYPE_ID, objectFactory.createPropertyIdData(PropertyIds.CMIS_BASE_TYPE_ID, baseTypeId));
+        properties.put(PropertyIds.BASE_TYPE_ID, objectFactory.createPropertyIdData(PropertyIds.BASE_TYPE_ID, baseTypeId));
       }
     }   
     List<PropertyData<?>> propertiesList = new ArrayList<PropertyData<?>> (properties.values());

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/AbstractServiceTst.java Fri Apr 16 08:52:10 2010
@@ -17,21 +17,21 @@ import java.util.Map;
 import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory;
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.SessionParameter;
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.MultiFilingService;
-import org.apache.chemistry.opencmis.commons.bindings.NavigationService;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectService;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryService;
-import org.apache.chemistry.opencmis.commons.bindings.VersioningService;
+import org.apache.chemistry.opencmis.commons.api.MultiFilingService;
+import org.apache.chemistry.opencmis.commons.api.NavigationService;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.api.ObjectService;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.RepositoryService;
+import org.apache.chemistry.opencmis.commons.api.VersioningService;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.BindingsObjectFactoryImpl;
@@ -170,16 +170,16 @@ public class AbstractServiceTst /* exten
 
   protected PropertiesData createDocumentProperties(String name, String typeId) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, name));
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, typeId));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, name));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
     PropertiesData props = fFactory.createPropertiesData(properties);
     return props;
   }
 
   protected PropertiesData createFolderProperties(String folderName, String typeId) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, folderName));
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, typeId));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, folderName));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
     PropertiesData props = fFactory.createPropertiesData(properties);
     return props;
   }
@@ -262,10 +262,10 @@ public class AbstractServiceTst /* exten
   protected String getPathOfFolder(String id) {
     String path=null;
     try {
-      String filter = PropertyIds.CMIS_PATH;
+      String filter = PropertyIds.PATH;
       PropertiesData res = fObjSvc.getProperties(fRepositoryId, id, filter, null);
       assertNotNull(res);
-      PropertyData<String> pd = (PropertyData<String>) res.getProperties().get(PropertyIds.CMIS_PATH);
+      PropertyData<String> pd = (PropertyData<String>) res.getProperties().get(PropertyIds.PATH);
       assertNotNull(pd);
       path = pd.getFirstValue();
       assertNotNull(path);
@@ -281,7 +281,7 @@ public class AbstractServiceTst /* exten
     String filter = "*";
     List<ObjectParentData> parentData = fNavSvc.getObjectParents(fRepositoryId, id, filter, false, IncludeRelationships.NONE, null, true, null);
     String name = parentData.get(0).getRelativePathSegment();
-    PropertyData<String> pd = (PropertyData<String>) parentData.get(0).getObject().getProperties().getProperties().get(PropertyIds.CMIS_PATH);
+    PropertyData<String> pd = (PropertyData<String>) parentData.get(0).getObject().getProperties().getProperties().get(PropertyIds.PATH);
     assertNotNull(pd);
     path = pd.getFirstValue() + "/" + name;
     return path;
@@ -314,7 +314,7 @@ public class AbstractServiceTst /* exten
       LOG.debug("return property id: " + pd.getId() + ", value: " + pd.getValues());
     }
 
-    PropertyData<?> pd = props.get(PropertyIds.CMIS_OBJECT_ID);
+    PropertyData<?> pd = props.get(PropertyIds.OBJECT_ID);
     assertNotNull(pd);
     assertEquals(objectId, pd.getFirstValue());
   }
@@ -356,7 +356,7 @@ public class AbstractServiceTst /* exten
 
   protected String getStringProperty(ObjectData objData, String propertyKey) {
     PropertyData<? extends Object> pd = (PropertyData<? extends Object>) objData.getProperties()
-        .getProperties().get(PropertyIds.CMIS_PATH);
+        .getProperties().get(PropertyIds.PATH);
     assertNotNull(pd.getFirstValue());
     assertTrue(pd.getFirstValue() instanceof String);
     return (String)pd.getFirstValue();

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java Fri Apr 16 08:52:10 2010
@@ -30,11 +30,11 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
@@ -263,7 +263,7 @@ public class MultiFilingTest extends Abs
   private void renameDocumentAndCheckResult(String docId) {
     Holder<String> idHolder = new Holder<String>(docId);    
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, RENAMED_DOC_NAME));      
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, RENAMED_DOC_NAME));      
     PropertiesData newProps = fFactory.createPropertiesData(properties);
     Holder<String> changeTokenHolder = new Holder<String>();
     fObjSvc.updateProperties(fRepositoryId, idHolder, changeTokenHolder, newProps, null);
@@ -272,7 +272,7 @@ public class MultiFilingTest extends Abs
         null, false, false, null);
     assertNotNull(res);
     Map<String, PropertyData<?>> propMap = res.getProperties().getProperties();
-    PropertyData<?> pd = propMap.get(PropertyIds.CMIS_NAME);
+    PropertyData<?> pd = propMap.get(PropertyIds.NAME);
     assertNotNull(pd);
     assertEquals(RENAMED_DOC_NAME, pd.getFirstValue());    
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/NavigationServiceTest.java Fri Apr 16 08:52:10 2010
@@ -23,12 +23,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderContainer;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
 import org.apache.chemistry.opencmis.inmemory.types.InMemoryFolderTypeDefinition;
@@ -212,8 +212,8 @@ public class NavigationServiceTest exten
   private void createLevel1Folders() {
     for (int i = 0; i < NUM_ROOT_FOLDERS; i++) {
       List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-      properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, "Folder " + i));
-      properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID,
+      properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, "Folder " + i));
+      properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID,
           InMemoryFolderTypeDefinition.getRootFolderType().getId()));
       PropertiesData props = fFactory.createPropertiesData(properties);      
       String id = fObjSvc.createFolder(fRepositoryId, props, fRootFolderId, null, null, null, null);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectCreator.java Fri Apr 16 08:52:10 2010
@@ -29,15 +29,15 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectService;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectService;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 
@@ -75,8 +75,8 @@ public class ObjectCreator {
 
   public PropertiesData createStringDocumentProperties(String name, String typeId, Map<String, String> propsToSet) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, name));
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, typeId));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, name));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
     if (null != propsToSet)
       for (Entry<String, String> propToSet : propsToSet.entrySet()) {
         properties.add(fFactory.createPropertyStringData(propToSet.getKey(), propToSet.getValue()));

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/ObjectServiceTest.java Fri Apr 16 08:52:10 2010
@@ -27,18 +27,18 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.AllowableActions;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
@@ -285,11 +285,11 @@ public class ObjectServiceTest extends A
         log.info("return property id: " + pd.getId() + ", value: " + pd.getValues());
       }
 
-      PropertyData<?> pd = props.get(PropertyIds.CMIS_NAME);
+      PropertyData<?> pd = props.get(PropertyIds.NAME);
       assertNotNull(pd);
       assertEquals(MY_CUSTOM_NAME, pd.getFirstValue());
 
-      pd = props.get(PropertyIds.CMIS_OBJECT_TYPE_ID);
+      pd = props.get(PropertyIds.OBJECT_TYPE_ID);
       assertEquals(TEST_INHERITED_CUSTOM_DOCUMENT_TYPE_ID, pd.getFirstValue());
 
       pd = props.get(TEST_DOCUMENT_MY_STRING_PROP_ID);
@@ -519,10 +519,10 @@ public class ObjectServiceTest extends A
 
       String returnedId = res.getId();
       assertEquals(id, returnedId);
-      PropertyData<?> pd = props.get(PropertyIds.CMIS_NAME);
+      PropertyData<?> pd = props.get(PropertyIds.NAME);
       assertNotNull(pd);
       assertEquals(MY_CUSTOM_NAME, pd.getFirstValue());
-      pd = props.get(PropertyIds.CMIS_OBJECT_TYPE_ID);
+      pd = props.get(PropertyIds.OBJECT_TYPE_ID);
       assertEquals(TEST_CUSTOM_DOCUMENT_TYPE_ID, pd.getFirstValue());
       pd = props.get(TEST_DOCUMENT_MY_STRING_PROP_ID);
       assertEquals("My pretty string", pd.getFirstValue());
@@ -555,10 +555,10 @@ public class ObjectServiceTest extends A
       }
       returnedId = res.getId();
       assertEquals(id, returnedId);
-      pd = props.get(PropertyIds.CMIS_NAME);
+      pd = props.get(PropertyIds.NAME);
       assertNotNull(pd);
       assertEquals(MY_CUSTOM_NAME, pd.getFirstValue());
-      pd = props.get(PropertyIds.CMIS_OBJECT_TYPE_ID);
+      pd = props.get(PropertyIds.OBJECT_TYPE_ID);
       assertEquals(TEST_CUSTOM_DOCUMENT_TYPE_ID, pd.getFirstValue());
       pd = props.get(TEST_DOCUMENT_MY_STRING_PROP_ID);
       assertEquals(newStringPropVal, pd.getFirstValue());
@@ -625,7 +625,7 @@ public class ObjectServiceTest extends A
       log.info("Test renaming");
       final String newName = "My Renamed Document"; // MY_CUSTOM_NAME
       properties = new ArrayList<PropertyData<?>>();
-      properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, newName));
+      properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, newName));
       newProps = fFactory.createPropertiesData(properties);
       changeTokenHolder.setValue(newChangeToken);
       fObjSvc.updateProperties(fRepositoryId, idHolder, changeTokenHolder, newProps, null);
@@ -634,14 +634,14 @@ public class ObjectServiceTest extends A
           null, false, false, null);
       assertNotNull(res);
       props = res.getProperties().getProperties();
-      pd = props.get(PropertyIds.CMIS_NAME);
+      pd = props.get(PropertyIds.NAME);
       assertNotNull(pd);
       assertEquals(newName, pd.getFirstValue());
 
       // test rename with a conflicting name
       createDocumentWithCustomType(fRootFolderId, false);
       properties = new ArrayList<PropertyData<?>>();
-      properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, MY_CUSTOM_NAME));
+      properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, MY_CUSTOM_NAME));
       newProps = fFactory.createPropertiesData(properties);
       // now rename to old name
       try {
@@ -739,7 +739,7 @@ public class ObjectServiceTest extends A
   }
 
   private void moveObjectTest(boolean isFolder) {
-    final String propertyFilter=PropertyIds.CMIS_OBJECT_ID+","+PropertyIds.CMIS_NAME; //+","+PropertyIds.CMIS_OBJECT_TYPE_ID+","+PropertyIds.CMIS_BASE_TYPE_ID;
+    final String propertyFilter=PropertyIds.OBJECT_ID+","+PropertyIds.NAME; //+","+PropertyIds.CMIS_OBJECT_TYPE_ID+","+PropertyIds.CMIS_BASE_TYPE_ID;
     String rootFolderId = createFolder();
     ObjectGenerator gen = new ObjectGenerator(fFactory, fNavSvc, fObjSvc, fRepositoryId);
     // Set the type id for all created documents:
@@ -796,7 +796,7 @@ public class ObjectServiceTest extends A
     // We only provide a name but not a type id, as spec says to copy missing attributes
     // from the existing one
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, name));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, name));
     PropertiesData props = fFactory.createPropertiesData(properties);
     return props;
   }
@@ -805,10 +805,10 @@ public class ObjectServiceTest extends A
   private void testReturnedProperties(String objectId, String objectName, String typeId, Map<String, PropertyData<?>> props) {
     super.testReturnedProperties(objectId, props);
 
-    PropertyData<?> pd = props.get(PropertyIds.CMIS_NAME);
+    PropertyData<?> pd = props.get(PropertyIds.NAME);
     assertNotNull(pd);
     assertEquals(objectName, pd.getFirstValue());
-    pd = props.get(PropertyIds.CMIS_OBJECT_TYPE_ID);
+    pd = props.get(PropertyIds.OBJECT_TYPE_ID);
     assertEquals(typeId, pd.getFirstValue());
   }
 
@@ -822,8 +822,8 @@ public class ObjectServiceTest extends A
 
     // create the properties:
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, MY_CUSTOM_NAME));
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, TEST_CUSTOM_DOCUMENT_TYPE_ID));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, MY_CUSTOM_NAME));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, TEST_CUSTOM_DOCUMENT_TYPE_ID));
     // Generate some property values for custom attributes
     properties.add(fFactory.createPropertyStringData(TEST_DOCUMENT_MY_STRING_PROP_ID, "My pretty string"));
     properties.add(fFactory.createPropertyIntegerData(TEST_DOCUMENT_MY_INT_PROP_ID, BigInteger.valueOf(4711)));
@@ -852,8 +852,8 @@ public class ObjectServiceTest extends A
 
     // create the properties:
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, MY_CUSTOM_NAME));
-    properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, TEST_INHERITED_CUSTOM_DOCUMENT_TYPE_ID));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, MY_CUSTOM_NAME));
+    properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, TEST_INHERITED_CUSTOM_DOCUMENT_TYPE_ID));
     // Generate some property values for custom attributes
     properties.add(fFactory.createPropertyStringData(TEST_DOCUMENT_MY_STRING_PROP_ID, "My pretty string"));
     properties.add(fFactory.createPropertyIntegerData(TEST_DOCUMENT_MY_INT_PROP_ID, BigInteger.valueOf(4711)));

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java Fri Apr 16 08:52:10 2010
@@ -29,10 +29,10 @@ import java.util.Map;
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.api.Choice;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
 import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
 import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
@@ -522,41 +522,41 @@ public class RepositoryServiceTest exten
     Map<String, PropertyDefinition<?>> propDefs = typeDef.getPropertyDefinitions();
     String baseTypeId = typeDef.getBaseId().value();
     
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_NAME));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_OBJECT_ID));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_OBJECT_TYPE_ID));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_BASE_TYPE_ID));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_CREATED_BY));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_CREATION_DATE));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_LAST_MODIFIED_BY));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_LAST_MODIFICATION_DATE));
-    assertTrue(propDefs.containsKey(PropertyIds.CMIS_CHANGE_TOKEN));
+    assertTrue(propDefs.containsKey(PropertyIds.NAME));
+    assertTrue(propDefs.containsKey(PropertyIds.OBJECT_ID));
+    assertTrue(propDefs.containsKey(PropertyIds.OBJECT_TYPE_ID));
+    assertTrue(propDefs.containsKey(PropertyIds.BASE_TYPE_ID));
+    assertTrue(propDefs.containsKey(PropertyIds.CREATED_BY));
+    assertTrue(propDefs.containsKey(PropertyIds.CREATION_DATE));
+    assertTrue(propDefs.containsKey(PropertyIds.LAST_MODIFIED_BY));
+    assertTrue(propDefs.containsKey(PropertyIds.LAST_MODIFICATION_DATE));
+    assertTrue(propDefs.containsKey(PropertyIds.CHANGE_TOKEN));
 
     if (baseTypeId.equals(BaseObjectTypeIds.CMIS_DOCUMENT.value())) {
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_IS_IMMUTABLE));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_IS_LATEST_VERSION));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_IS_MAJOR_VERSION));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_IS_LATEST_MAJOR_VERSION));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_VERSION_LABEL));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_VERSION_SERIES_ID));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_CHECKIN_COMMENT));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_CONTENT_STREAM_LENGTH));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_CONTENT_STREAM_MIME_TYPE));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_CONTENT_STREAM_FILE_NAME));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_CONTENT_STREAM_ID));
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_CHANGE_TOKEN));      
+      assertTrue(propDefs.containsKey(PropertyIds.IS_IMMUTABLE));
+      assertTrue(propDefs.containsKey(PropertyIds.IS_LATEST_VERSION));
+      assertTrue(propDefs.containsKey(PropertyIds.IS_MAJOR_VERSION));
+      assertTrue(propDefs.containsKey(PropertyIds.IS_LATEST_MAJOR_VERSION));
+      assertTrue(propDefs.containsKey(PropertyIds.VERSION_LABEL));
+      assertTrue(propDefs.containsKey(PropertyIds.VERSION_SERIES_ID));
+      assertTrue(propDefs.containsKey(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT));
+      assertTrue(propDefs.containsKey(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY));
+      assertTrue(propDefs.containsKey(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID));
+      assertTrue(propDefs.containsKey(PropertyIds.CHECKIN_COMMENT));
+      assertTrue(propDefs.containsKey(PropertyIds.CONTENT_STREAM_LENGTH));
+      assertTrue(propDefs.containsKey(PropertyIds.CONTENT_STREAM_MIME_TYPE));
+      assertTrue(propDefs.containsKey(PropertyIds.CONTENT_STREAM_FILE_NAME));
+      assertTrue(propDefs.containsKey(PropertyIds.CONTENT_STREAM_ID));
+      assertTrue(propDefs.containsKey(PropertyIds.CHANGE_TOKEN));      
     } else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_FOLDER.value())) {
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_PARENT_ID));      
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_ALLOWED_CHILD_OBJECT_TYPE_IDS));      
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_PATH));            
+      assertTrue(propDefs.containsKey(PropertyIds.PARENT_ID));      
+      assertTrue(propDefs.containsKey(PropertyIds.ALLOWED_CHILD_OBJECT_TYPE_IDS));      
+      assertTrue(propDefs.containsKey(PropertyIds.PATH));            
     } else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_POLICY.value())) {
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_POLICY_TEXT));            
+      assertTrue(propDefs.containsKey(PropertyIds.POLICY_TEXT));            
     } else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_RELATIONSHIP.value())) {
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_SOURCE_ID));      
-      assertTrue(propDefs.containsKey(PropertyIds.CMIS_TARGET_ID));            
+      assertTrue(propDefs.containsKey(PropertyIds.SOURCE_ID));      
+      assertTrue(propDefs.containsKey(PropertyIds.TARGET_ID));            
     } else
       fail("Unknown base type id in type definition");
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/TypeValidationTest.java Fri Apr 16 08:52:10 2010
@@ -29,12 +29,12 @@ import java.util.Map;
 import junit.framework.TestCase;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
 import org.apache.chemistry.opencmis.commons.api.Choice;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.Cardinality;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.BindingsObjectFactoryImpl;
@@ -84,8 +84,8 @@ public class TypeValidationTest extends 
   
   private List<PropertyData<?>> createPropertiesWithNameAndTypeId(String typeId) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-    properties.add(FACTORY.createPropertyIdData(PropertyIds.CMIS_NAME, "Document_1"));
-    properties.add(FACTORY.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, typeId));
+    properties.add(FACTORY.createPropertyIdData(PropertyIds.NAME, "Document_1"));
+    properties.add(FACTORY.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
     return properties;
   }
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java Fri Apr 16 08:52:10 2010
@@ -33,18 +33,18 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.DocumentTypeDefinition;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
+import org.apache.chemistry.opencmis.commons.api.PropertyIdData;
+import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyBooleanData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyIdData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
 import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
@@ -134,7 +134,7 @@ public class VersioningTest extends Abst
     String pwcId = idHolder.getValue();
     // test that object is checked out and that all properties are set correctly
     PropertiesData props = fObjSvc.getProperties(fRepositoryId, pwcId, "*", null);
-    String changeToken = (String) props.getProperties().get(PropertyIds.CMIS_CHANGE_TOKEN).getFirstValue();
+    String changeToken = (String) props.getProperties().get(PropertyIds.CHANGE_TOKEN).getFirstValue();
     checkVersionProperties(pwcId, VersioningState.CHECKEDOUT, props.getProperties(), null);
     
     // Test that a second checkout is not possible
@@ -281,7 +281,7 @@ public class VersioningTest extends Abst
     
     // Set a new content and modify property
     PropertiesData props = fObjSvc.getProperties(fRepositoryId, pwcId, "*", null);
-    String changeToken = (String) props.getProperties().get(PropertyIds.CMIS_CHANGE_TOKEN).getFirstValue();
+    String changeToken = (String) props.getProperties().get(PropertyIds.CHANGE_TOKEN).getFirstValue();
     ContentStream altContent = fCreator.createAlternateContent();
     idHolder = new Holder<String>(pwcId);
     Holder<String> tokenHolder = new Holder<String>(changeToken);
@@ -440,8 +440,8 @@ public class VersioningTest extends Abst
     
     for (int i = 0; i < num; i++) {
       List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
-      properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_NAME, "Folder " + i));
-      properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID,
+      properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, "Folder " + i));
+      properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID,
           BaseObjectTypeIds.CMIS_FOLDER.value()));
       PropertiesData props = fFactory.createPropertiesData(properties);      
       String id = fObjSvc.createFolder(fRepositoryId, props, fRootFolderId, null, null, null, null);
@@ -466,7 +466,7 @@ public class VersioningTest extends Abst
   }
   
   private String getVersionSeriesId(String docId, Map<String, PropertyData<?>> props) {
-    PropertyIdData pdid = (PropertyIdData) props.get(PropertyIds.CMIS_VERSION_SERIES_ID);
+    PropertyIdData pdid = (PropertyIdData) props.get(PropertyIds.VERSION_SERIES_ID);
     assertNotNull(pdid);
     String sVal = pdid.getFirstValue();
     assertNotNull(sVal);
@@ -479,7 +479,7 @@ public class VersioningTest extends Abst
   }
   
   private boolean isCheckedOut( Map<String, PropertyData<?>> props) {
-    PropertyBooleanData pdb = (PropertyBooleanData) props.get(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT);
+    PropertyBooleanData pdb = (PropertyBooleanData) props.get(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
     assertNotNull(pdb);
     boolean bVal = pdb.getFirstValue();
     return bVal;
@@ -492,22 +492,22 @@ public class VersioningTest extends Abst
     }
     
     DocumentTypeDefinition typeDef = (DocumentTypeDefinition) fRepSvc.getTypeDefinition(fRepositoryId, VersionTestTypeSystemCreator.VERSION_TEST_DOCUMENT_TYPE_ID, null);
-    PropertyBooleanData pdb = (PropertyBooleanData) props.get(PropertyIds.CMIS_IS_LATEST_VERSION);
+    PropertyBooleanData pdb = (PropertyBooleanData) props.get(PropertyIds.IS_LATEST_VERSION);
     assertNotNull(pdb);
     boolean bVal = pdb.getFirstValue();
     assertEquals(versioningState != VersioningState.CHECKEDOUT, bVal); // if checked out it isn't the latest version
 
-    pdb = (PropertyBooleanData) props.get(PropertyIds.CMIS_IS_MAJOR_VERSION);
+    pdb = (PropertyBooleanData) props.get(PropertyIds.IS_MAJOR_VERSION);
     assertNotNull(pdb);
     bVal = pdb.getFirstValue();
     assertEquals(versioningState == VersioningState.MAJOR, bVal);
     
-    pdb = (PropertyBooleanData) props.get(PropertyIds.CMIS_IS_LATEST_MAJOR_VERSION);
+    pdb = (PropertyBooleanData) props.get(PropertyIds.IS_LATEST_MAJOR_VERSION);
     assertNotNull(pdb);
     bVal = pdb.getFirstValue();
     assertEquals(versioningState == VersioningState.MAJOR, bVal);
     
-    PropertyIdData pdid = (PropertyIdData) props.get(PropertyIds.CMIS_VERSION_SERIES_ID);
+    PropertyIdData pdid = (PropertyIdData) props.get(PropertyIds.VERSION_SERIES_ID);
     assertNotNull(pdb);
     String sVal = pdid.getFirstValue();
     if (typeDef.isVersionable())
@@ -515,12 +515,12 @@ public class VersioningTest extends Abst
     else
       assertEquals(docId, sVal);
 
-    pdb = (PropertyBooleanData) props.get(PropertyIds.CMIS_IS_VERSION_SERIES_CHECKED_OUT);
+    pdb = (PropertyBooleanData) props.get(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
     assertNotNull(pdb);
     bVal = pdb.getFirstValue();
     assertEquals(versioningState == VersioningState.CHECKEDOUT, bVal);
     
-    PropertyStringData pds = (PropertyStringData) props.get(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_BY);
+    PropertyStringData pds = (PropertyStringData) props.get(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY);
     assertNotNull(pdb);
     sVal = pds.getFirstValue();
     if (versioningState == VersioningState.CHECKEDOUT)
@@ -528,7 +528,7 @@ public class VersioningTest extends Abst
     else
       assertTrue(null == sVal || sVal.equals(""));
 
-    pdid = (PropertyIdData) props.get(PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID);
+    pdid = (PropertyIdData) props.get(PropertyIds.VERSION_SERIES_CHECKED_OUT_ID);
     assertNotNull(pdid);
     sVal = pdid.getFirstValue();
     if (versioningState == VersioningState.CHECKEDOUT)
@@ -536,7 +536,7 @@ public class VersioningTest extends Abst
     else
       assertTrue(null == sVal || sVal.equals(""));
     
-    pds = (PropertyStringData) props.get(PropertyIds.CMIS_CHECKIN_COMMENT);
+    pds = (PropertyStringData) props.get(PropertyIds.CHECKIN_COMMENT);
     assertNotNull(pdb);
     sVal = pds.getFirstValue();
     if (checkinComment == null)
@@ -566,10 +566,10 @@ public class VersioningTest extends Abst
       log.info("return property id: " + pd.getId() + ", value: " + pd.getValues());
     }
     
-    PropertyData<?> pd = props.get(PropertyIds.CMIS_NAME);
+    PropertyData<?> pd = props.get(PropertyIds.NAME);
     assertNotNull(pd);
     assertEquals(PROP_NAME, pd.getFirstValue());
-    pd = props.get(PropertyIds.CMIS_OBJECT_TYPE_ID);
+    pd = props.get(PropertyIds.OBJECT_TYPE_ID);
     assertEquals(VersionTestTypeSystemCreator.VERSION_TEST_DOCUMENT_TYPE_ID, pd.getFirstValue());
     pd = props.get(VersionTestTypeSystemCreator.PROPERTY_ID);
     assertEquals(PROP_VALUE, pd.getFirstValue());

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisAclService.java Fri Apr 16 08:52:10 2010
@@ -18,8 +18,8 @@
  */
 package org.apache.chemistry.opencmis.server.spi;
 
+import org.apache.chemistry.opencmis.commons.api.Acl;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
 import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
 
 /**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisDiscoveryService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisDiscoveryService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisDiscoveryService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisDiscoveryService.java Fri Apr 16 08:52:10 2010
@@ -21,8 +21,8 @@ package org.apache.chemistry.opencmis.se
 import java.math.BigInteger;
 
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 
 /**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisMultiFilingService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisMultiFilingService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisMultiFilingService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisMultiFilingService.java Fri Apr 16 08:52:10 2010
@@ -19,7 +19,7 @@
 package org.apache.chemistry.opencmis.server.spi;
 
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
 
 /**
  * CMIS MultiFiling Service interface. Please refer to the CMIS specification and the OpenCMIS

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisNavigationService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisNavigationService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisNavigationService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisNavigationService.java Fri Apr 16 08:52:10 2010
@@ -22,11 +22,11 @@ import java.math.BigInteger;
 import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderContainer;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 
 /**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisObjectService.java Fri Apr 16 08:52:10 2010
@@ -21,15 +21,15 @@ package org.apache.chemistry.opencmis.se
 import java.math.BigInteger;
 import java.util.List;
 
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.AllowableActions;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
+import org.apache.chemistry.opencmis.commons.api.FailedToDeleteData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.RenditionData;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisPolicyService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisPolicyService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisPolicyService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisPolicyService.java Fri Apr 16 08:52:10 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se
 import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
 
 /**
  * CMIS Policy Service interface. Please refer to the CMIS specification and the OpenCMIS

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRelationshipService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRelationshipService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRelationshipService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRelationshipService.java Fri Apr 16 08:52:10 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se
 import java.math.BigInteger;
 
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
 import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
 
 /**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRepositoryService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRepositoryService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRepositoryService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisRepositoryService.java Fri Apr 16 08:52:10 2010
@@ -22,10 +22,10 @@ import java.math.BigInteger;
 import java.util.List;
 
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
 
 /**
  * CMIS Repository Service interface. Please refer to the CMIS specification and the OpenCMIS

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/CmisVersioningService.java Fri Apr 16 08:52:10 2010
@@ -20,12 +20,12 @@ package org.apache.chemistry.opencmis.se
 
 import java.util.List;
 
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 
 /**