chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r934854 [4/5] - 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-bindings/src/main/ja...
Date Fri, 16 Apr 2010 12:52:00 GMT
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.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/TypeValidator.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java Fri Apr 16 12:51:57 2010
@@ -28,12 +28,12 @@ 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.DocumentTypeDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
-import org.apache.chemistry.opencmis.commons.api.PropertyDecimalData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDecimal;
 import org.apache.chemistry.opencmis.commons.api.PropertyDecimalDefinition;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.api.PropertyIntegerData;
+import org.apache.chemistry.opencmis.commons.api.PropertyInteger;
 import org.apache.chemistry.opencmis.commons.api.PropertyIntegerDefinition;
 import org.apache.chemistry.opencmis.commons.api.PropertyStringDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
@@ -47,7 +47,7 @@ import org.apache.chemistry.opencmis.com
  */
 public class TypeValidator {
 
-  public static void validateRequiredSystemProperties(PropertiesData properties) {
+  public static void validateRequiredSystemProperties(Properties properties) {
     if (properties == null || properties.getProperties() == null)
       throw new RuntimeException("Cannot create object, no properties are given");
 
@@ -178,7 +178,7 @@ public class TypeValidator {
 
       super.validate(propDef, property);
 
-      BigInteger propVal = ((PropertyIntegerData) property).getFirstValue();
+      BigInteger propVal = ((PropertyInteger) property).getFirstValue();
       BigInteger minVal = ((PropertyIntegerDefinition) propDef).getMinValue();
       BigInteger maxVal = ((PropertyIntegerDefinition) propDef).getMaxValue();
 
@@ -200,7 +200,7 @@ public class TypeValidator {
 
       super.validate(propDef, property);
 
-      BigDecimal propVal = ((PropertyDecimalData) property).getFirstValue();
+      BigDecimal propVal = ((PropertyDecimal) property).getFirstValue();
       BigDecimal minVal = ((PropertyDecimalDefinition) propDef).getMinValue();
       BigDecimal maxVal = ((PropertyDecimalDefinition) propDef).getMaxValue();
 
@@ -236,7 +236,7 @@ public class TypeValidator {
   }
 
   @SuppressWarnings("unchecked")
-  public static <T> void validateProperties(TypeDefinition typeDef, PropertiesData properties,
+  public static <T> void validateProperties(TypeDefinition typeDef, Properties properties,
       boolean checkMandatory) {
 
     List<String> propDefsRequired = getMandatoryPropDefs(typeDef.getPropertyDefinitions());

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.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/clientprovider/ObjectServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/ObjectServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -30,10 +30,10 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.Holder;
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
 import org.apache.chemistry.opencmis.commons.api.ObjectService;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 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.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.inmemory.server.InMemoryObjectServiceImpl;
 
@@ -45,7 +45,7 @@ public class ObjectServiceImpl extends A
     fObjSvc = objSvc;
   }
 
-  public String createDocument(String repositoryId, PropertiesData properties, String folderId,
+  public String createDocument(String repositoryId, Properties properties, String folderId,
       ContentStream contentStream, VersioningState versioningState, List<String> policies,
       Acl addAces, Acl removeAces, ExtensionsData extension) {
     
@@ -53,28 +53,28 @@ public class ObjectServiceImpl extends A
   }
 
   public String createDocumentFromSource(String repositoryId, String sourceId,
-      PropertiesData properties, String folderId, VersioningState versioningState,
+      Properties properties, String folderId, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     
     return fObjSvc.createDocumentFromSource(fDummyCallContext, repositoryId, sourceId, properties, folderId, versioningState, policies, addAces, removeAces, extension);
   }
 
-  public String createFolder(String repositoryId, PropertiesData properties, String folderId,
+  public String createFolder(String repositoryId, Properties properties, String folderId,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     
     return fObjSvc.createFolder(fDummyCallContext, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
   }
 
-  public String createPolicy(String repositoryId, PropertiesData properties, String folderId,
+  public String createPolicy(String repositoryId, Properties properties, String folderId,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     
     return fObjSvc.createPolicy(fDummyCallContext, repositoryId, properties, folderId, policies, addAces, removeAces, extension);
   }
 
-  public String createRelationship(String repositoryId, PropertiesData properties,
+  public String createRelationship(String repositoryId, Properties properties,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     
@@ -94,7 +94,7 @@ public class ObjectServiceImpl extends A
   }
 
   public FailedToDeleteData deleteTree(String repositoryId, String folderId, Boolean allVersions,
-      UnfileObjects unfileObjects, Boolean continueOnFailure, ExtensionsData extension) {
+      UnfileObject unfileObjects, Boolean continueOnFailure, ExtensionsData extension) {
     
     return fObjSvc.deleteTree(fDummyCallContext, repositoryId, folderId, allVersions, unfileObjects, continueOnFailure, extension);
   }
@@ -125,7 +125,7 @@ public class ObjectServiceImpl extends A
     return fObjSvc.getObjectByPath(fDummyCallContext, repositoryId, path, filter, includeAllowableActions, includeRelationships, renditionFilter, includePolicyIds, includeAcl, extension, null);
   }
 
-  public PropertiesData getProperties(String repositoryId, String objectId, String filter,
+  public Properties getProperties(String repositoryId, String objectId, String filter,
       ExtensionsData extension) {
     
     return fObjSvc.getProperties(fDummyCallContext, repositoryId, objectId, filter, extension);
@@ -150,7 +150,7 @@ public class ObjectServiceImpl extends A
   }
 
   public void updateProperties(String repositoryId, Holder<String> objectId,
-      Holder<String> changeToken, PropertiesData properties, ExtensionsData extension) {
+      Holder<String> changeToken, Properties properties, ExtensionsData extension) {
     
     fObjSvc.updateProperties(fDummyCallContext, repositoryId, objectId, changeToken, properties, null, extension, null);    
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.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/clientprovider/VersioningServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/clientprovider/VersioningServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -25,7 +25,7 @@ import org.apache.chemistry.opencmis.com
 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.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.VersioningService;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.inmemory.server.InMemoryVersioningServiceImpl;
@@ -44,7 +44,7 @@ public class VersioningServiceImpl exten
   }
 
   public void checkIn(String repositoryId, Holder<String> objectId, Boolean major,
-      PropertiesData properties, ContentStream contentStream, String checkinComment,
+      Properties properties, ContentStream contentStream, String checkinComment,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
 
@@ -82,7 +82,7 @@ public class VersioningServiceImpl exten
         renditionFilter, includePolicyIds, includeAcl, extension, null);
   }
 
-  public PropertiesData getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId,
+  public Properties getPropertiesOfLatestVersion(String repositoryId, String versionSeriesId,
       Boolean major, String filter, ExtensionsData extension) {
 
     return fVersioningSvc.getPropertiesOfLatestVersion(fDummyCallContext, repositoryId,

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.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/server/AbstractServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AbstractServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -19,7 +19,7 @@
 package org.apache.chemistry.opencmis.inmemory.server;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
@@ -88,7 +88,7 @@ public class AbstractServiceImpl {
       throw new CmisObjectNotFoundException("Unknown repository id: " + repositoryId);    
   }
   
-  protected TypeDefinition getTypeDefinition(String repositoryId, PropertiesData properties) {
+  protected TypeDefinition getTypeDefinition(String repositoryId, Properties properties) {
     String typeId = (String) properties.getProperties().get(PropertyIds.OBJECT_TYPE_ID)
         .getFirstValue();
     TypeDefinitionContainer typeDefC = fStoreManager.getTypeById(repositoryId, typeId);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.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/server/InMemoryDiscoveryServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryDiscoveryServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -30,7 +30,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.ObjectList;
 import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import org.apache.chemistry.opencmis.commons.enums.TypeOfChanges;
+import org.apache.chemistry.opencmis.commons.enums.ChangeType;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ChangeEventInfoDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectListImpl;
@@ -95,7 +95,7 @@ public class InMemoryDiscoveryServiceImp
     ObjectData oif = obj.getObject().getObject();
     ObjectDataImpl oifImpl = (ObjectDataImpl) oif;
     ChangeEventInfoDataImpl changeEventInfo = new ChangeEventInfoDataImpl();
-    changeEventInfo.setTypeOfChanges(TypeOfChanges.UPDATED);
+    changeEventInfo.setChangeType(ChangeType.UPDATED);
     changeEventInfo.setChangeTime(new GregorianCalendar());
     oifImpl.setChangeEventInfo(changeEventInfo);
     if (null != obj.getChildren()) {

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.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/server/InMemoryNavigationServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryNavigationServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -32,7 +32,7 @@ import org.apache.chemistry.opencmis.com
 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.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
@@ -329,7 +329,7 @@ public class InMemoryNavigationServiceIm
         objectData.setRelationships(null /* f.getRenditions(renditionFilter) */);
       }
 
-      PropertiesData props = PropertyCreationHelper.getPropertiesFromObject(repositoryId, spo,
+      Properties props = PropertyCreationHelper.getPropertiesFromObject(repositoryId, spo,
           fStoreManager, requestedIds);
       objectData.setProperties(props);
 
@@ -440,7 +440,7 @@ public class InMemoryNavigationServiceIm
   void copyFilteredProperties(String repositoryId, StoredObject so, String filter,
       ObjectDataImpl objData) {
     List<String> requestedIds = FilterParser.getRequestedIdsFromFilter(filter);
-    PropertiesData props = PropertyCreationHelper.getPropertiesFromObject(repositoryId, so,
+    Properties props = PropertyCreationHelper.getPropertiesFromObject(repositoryId, so,
         fStoreManager, requestedIds);
     objData.setProperties(props);
   }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.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/server/InMemoryObjectServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -32,7 +32,7 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.api.RenditionData;
@@ -40,7 +40,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.Updatability;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
@@ -49,7 +49,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisUpdateConflictException;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.FailedToDeleteDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesImpl;
 import org.apache.chemistry.opencmis.inmemory.DataObjectCreator;
 import org.apache.chemistry.opencmis.inmemory.FilterParser;
 import org.apache.chemistry.opencmis.inmemory.NameValidator;
@@ -84,7 +84,7 @@ public class InMemoryObjectServiceImpl e
     fAtomLinkProvider = new AtomLinkInfoProvider(fStoreManager);
   }
 
-  public String createDocument(CallContext context, String repositoryId, PropertiesData properties,
+  public String createDocument(CallContext context, String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
@@ -105,7 +105,7 @@ public class InMemoryObjectServiceImpl e
   }
 
   public String createDocumentFromSource(CallContext context, String repositoryId, String sourceId,
-      PropertiesData properties, String folderId, VersioningState versioningState,
+      Properties properties, String folderId, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
 
@@ -126,10 +126,10 @@ public class InMemoryObjectServiceImpl e
       // build properties collection
       List<String> requestedIds = FilterParser.getRequestedIdsFromFilter("*");
 
-      PropertiesData existingProps = PropertyCreationHelper.getPropertiesFromObject(repositoryId,
+      Properties existingProps = PropertyCreationHelper.getPropertiesFromObject(repositoryId,
           so, fStoreManager, requestedIds);
 
-      PropertiesDataImpl newPD = new PropertiesDataImpl();
+      PropertiesImpl newPD = new PropertiesImpl();
       // copy all existing properties
       for (PropertyData<?> prop : existingProps.getProperties().values()) {
         newPD.addProperty(prop);
@@ -149,7 +149,7 @@ public class InMemoryObjectServiceImpl e
     }
   }
 
-  public String createFolder(CallContext context, String repositoryId, PropertiesData properties,
+  public String createFolder(CallContext context, String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
     try {
@@ -166,7 +166,7 @@ public class InMemoryObjectServiceImpl e
     }
   }
 
-  public String createPolicy(CallContext context, String repositoryId, PropertiesData properties,
+  public String createPolicy(CallContext context, String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
 
@@ -188,7 +188,7 @@ public class InMemoryObjectServiceImpl e
   }
 
   public String createRelationship(CallContext context, String repositoryId,
-      PropertiesData properties, List<String> policies, Acl addAces,
+      Properties properties, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
 
     try {
@@ -221,7 +221,7 @@ public class InMemoryObjectServiceImpl e
    * to be created. Also the ObjectInfoHolder needs to be filled.
    */
   @SuppressWarnings("unchecked")
-  public ObjectData create(CallContext context, String repositoryId, PropertiesData properties,
+  public ObjectData create(CallContext context, String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, ExtensionsData extension, ObjectInfoHolder objectInfos) {
 
@@ -323,7 +323,7 @@ public class InMemoryObjectServiceImpl e
   }
 
   public FailedToDeleteData deleteTree(CallContext context, String repositoryId, String folderId,
-      Boolean allVersions, UnfileObjects unfileObjects, Boolean continueOnFailure,
+      Boolean allVersions, UnfileObject unfileObjects, Boolean continueOnFailure,
       ExtensionsData extension) {
 
     try {
@@ -338,7 +338,7 @@ public class InMemoryObjectServiceImpl e
       if (null == allVersions)
         allVersions = true;
       if (null == unfileObjects)
-        unfileObjects = UnfileObjects.DELETE;
+        unfileObjects = UnfileObject.DELETE;
       if (null == continueOnFailure)
         continueOnFailure = false;
 
@@ -352,7 +352,7 @@ public class InMemoryObjectServiceImpl e
         throw new RuntimeException("deleteTree can only be invoked on a folder, but id " + folderId
             + " does not refer to a folder");
 
-      if (unfileObjects == UnfileObjects.UNFILE)
+      if (unfileObjects == UnfileObject.UNFILE)
         throw new CmisNotSupportedException("This repository does not support unfile operations.");
 
       // check if it is the root folder
@@ -486,7 +486,7 @@ public class InMemoryObjectServiceImpl e
     }
   }
 
-  public PropertiesData getProperties(CallContext context, String repositoryId, String objectId,
+  public Properties getProperties(CallContext context, String repositoryId, String objectId,
       String filter, ExtensionsData extension) {
 
     try {
@@ -501,7 +501,7 @@ public class InMemoryObjectServiceImpl e
 
       // build properties collection
       List<String> requestedIds = FilterParser.getRequestedIdsFromFilter(filter);
-      PropertiesData props = PropertyCreationHelper.getPropertiesFromObject(repositoryId, so,
+      Properties props = PropertyCreationHelper.getPropertiesFromObject(repositoryId, so,
           fStoreManager, requestedIds);
       LOG.debug("stop getProperties()");
       return props;
@@ -648,7 +648,7 @@ public class InMemoryObjectServiceImpl e
   }
 
   public ObjectData updateProperties(CallContext context, String repositoryId,
-      Holder<String> objectId, Holder<String> changeToken, PropertiesData properties,
+      Holder<String> objectId, Holder<String> changeToken, Properties properties,
       Acl acl, ExtensionsData extension, ObjectInfoHolder objectInfos) {
 
     try {
@@ -776,7 +776,7 @@ public class InMemoryObjectServiceImpl e
   // ///////////////////////////////////////////////////////
   // private helper methods
 
-  private StoredObject createDocumentIntern(String repositoryId, PropertiesData properties,
+  private StoredObject createDocumentIntern(String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, Acl addACEs, Acl removeACEs,
       ExtensionsData extension) {
@@ -862,7 +862,7 @@ public class InMemoryObjectServiceImpl e
     return so;
   }
 
-  private Folder createFolderIntern(String repositoryId, PropertiesData properties,
+  private Folder createFolderIntern(String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
 
@@ -927,13 +927,13 @@ public class InMemoryObjectServiceImpl e
     }
   }
 
-  private StoredObject createPolicyIntern(String repositoryId, PropertiesData properties,
+  private StoredObject createPolicyIntern(String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension) {
     return null;
   }
 
-  private StoredObject createRelationshipIntern(String repositoryId, PropertiesData properties,
+  private StoredObject createRelationshipIntern(String repositoryId, Properties properties,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension) {
     return null;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.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/server/InMemoryVersioningServiceImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Fri Apr 16 12:51:57 2010
@@ -27,7 +27,7 @@ import org.apache.chemistry.opencmis.com
 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.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
@@ -80,7 +80,7 @@ public class InMemoryVersioningServiceIm
   }
 
   public ObjectData checkIn(CallContext context, String repositoryId, Holder<String> objectId,
-      Boolean major, PropertiesData properties, ContentStream contentStream,
+      Boolean major, Properties properties, ContentStream contentStream,
       String checkinComment, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos) {
 
@@ -233,7 +233,7 @@ public class InMemoryVersioningServiceIm
     }
   }
 
-  public PropertiesData getPropertiesOfLatestVersion(CallContext context, String repositoryId,
+  public Properties getPropertiesOfLatestVersion(CallContext context, String repositoryId,
       String versionSeriesId, Boolean major, String filter, ExtensionsData extension) {
 
     try {
@@ -254,7 +254,7 @@ public class InMemoryVersioningServiceIm
         throw new RuntimeException("Object is not instance of a document (version series)");
 
       List<String> requestedIds = FilterParser.getRequestedIdsFromFilter(filter);
-      PropertiesData props = PropertyCreationHelper.getPropertiesFromObject(repositoryId,
+      Properties props = PropertyCreationHelper.getPropertiesFromObject(repositoryId,
           latestVersionObject, fStoreManager, requestedIds);
 
       return props;

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.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/StoreManagerImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/StoreManagerImpl.java Fri Apr 16 12:51:57 2010
@@ -39,7 +39,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AbstractTypeDefinition;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.BindingsObjectFactoryImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionContainerImpl;
 import org.apache.chemistry.opencmis.inmemory.RepositoryInfoCreator;
@@ -310,7 +310,7 @@ public class StoreManagerImpl implements
     repoInfo.setProductVersion("0.1");
     
     // set capabilities
-    RepositoryCapabilitiesDataImpl caps = new RepositoryCapabilitiesDataImpl();
+    RepositoryCapabilitiesImpl caps = new RepositoryCapabilitiesImpl();
     caps.setAllVersionsSearchable(false);
     caps.setCapabilityAcl(CapabilityAcl.NONE);
     caps.setCapabilityChanges(CapabilityChanges.PROPERTIES); // just for testing

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -30,7 +30,7 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
@@ -205,7 +205,7 @@ public class PropertyCreationHelper {
     prop.setUpdatability(Updatability.READWRITE);
   }
   
-  public static PropertiesData getPropertiesFromObject(String repositoryId, StoredObject so,
+  public static Properties getPropertiesFromObject(String repositoryId, StoredObject so,
       StoreManager storeManager, List<String> requestedIds) {
     // build properties collection 
     
@@ -227,7 +227,7 @@ public class PropertyCreationHelper {
       }
     }   
     List<PropertyData<?>> propertiesList = new ArrayList<PropertyData<?>> (properties.values());
-    PropertiesData props = objectFactory.createPropertiesData(propertiesList);
+    Properties props = objectFactory.createPropertiesData(propertiesList);
     return props;    
   }
   
@@ -242,7 +242,7 @@ public class PropertyCreationHelper {
 
     // build properties collection
     List<String> requestedIds = FilterParser.getRequestedIdsFromFilter(filter);
-    PropertiesData props = getPropertiesFromObject(so.getRepositoryId(), so,
+    Properties props = getPropertiesFromObject(so.getRepositoryId(), so,
         sm, requestedIds);
 
     // fill output object

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -27,7 +27,7 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
 import org.apache.chemistry.opencmis.commons.api.RepositoryService;
@@ -127,7 +127,7 @@ public class AbstractServiceTst /* exten
   }
 
   protected String createFolder(String folderName, String parentFolderId, String typeId) {
-    PropertiesData props = createFolderProperties(folderName, typeId);
+    Properties props = createFolderProperties(folderName, typeId);
     String id = null;
     try {
       id = fObjSvc.createFolder(fRepositoryId, props, parentFolderId, null, null, null, null);
@@ -146,7 +146,7 @@ public class AbstractServiceTst /* exten
     Acl removeACEs = null;
     ExtensionsData extension = null;
 
-    PropertiesData props = createDocumentProperties(name, typeId);
+    Properties props = createDocumentProperties(name, typeId);
 
     if (withContent)
       contentStream = createContent();
@@ -168,19 +168,19 @@ public class AbstractServiceTst /* exten
     return createDocument(name, folderId, typeId, versioningState, withContent);
   }
 
-  protected PropertiesData createDocumentProperties(String name, String typeId) {
+  protected Properties createDocumentProperties(String name, String typeId) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, name));
     properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
     return props;
   }
 
-  protected PropertiesData createFolderProperties(String folderName, String typeId) {
+  protected Properties createFolderProperties(String folderName, String typeId) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, folderName));
     properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
     return props;
   }
 
@@ -263,7 +263,7 @@ public class AbstractServiceTst /* exten
     String path=null;
     try {
       String filter = PropertyIds.PATH;
-      PropertiesData res = fObjSvc.getProperties(fRepositoryId, id, filter, null);
+      Properties res = fObjSvc.getProperties(fRepositoryId, id, filter, null);
       assertNotNull(res);
       PropertyData<String> pd = (PropertyData<String>) res.getProperties().get(PropertyIds.PATH);
       assertNotNull(pd);

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -33,7 +33,7 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
@@ -264,7 +264,7 @@ public class MultiFilingTest extends Abs
     Holder<String> idHolder = new Holder<String>(docId);    
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, RENAMED_DOC_NAME));      
-    PropertiesData newProps = fFactory.createPropertiesData(properties);
+    Properties newProps = fFactory.createPropertiesData(properties);
     Holder<String> changeTokenHolder = new Holder<String>();
     fObjSvc.updateProperties(fRepositoryId, idHolder, changeTokenHolder, newProps, null);
     docId = idHolder.getValue(); 

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -27,7 +27,7 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
@@ -215,7 +215,7 @@ public class NavigationServiceTest exten
       properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, "Folder " + i));
       properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID,
           InMemoryFolderTypeDefinition.getRootFolderType().getId()));
-      PropertiesData props = fFactory.createPropertiesData(properties);      
+      Properties props = fFactory.createPropertiesData(properties);      
       String id = fObjSvc.createFolder(fRepositoryId, props, fRootFolderId, null, null, null, null);
       if (i==3) // store one
         fLevel1FolderId = id;

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -35,9 +35,9 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
-import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
 
@@ -60,7 +60,7 @@ public class ObjectCreator {
     Acl removeACEs = null;
     ExtensionsData extension = null;
 
-    PropertiesData props = createStringDocumentProperties(name, typeId, propsToSet);
+    Properties props = createStringDocumentProperties(name, typeId, propsToSet);
 
     contentStream = createContent();
 
@@ -73,7 +73,7 @@ public class ObjectCreator {
     return id;
   }
 
-  public PropertiesData createStringDocumentProperties(String name, String typeId, Map<String, String> propsToSet) {
+  public Properties createStringDocumentProperties(String name, String typeId, Map<String, String> propsToSet) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, name));
     properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, typeId));
@@ -81,7 +81,7 @@ public class ObjectCreator {
       for (Entry<String, String> propToSet : propsToSet.entrySet()) {
         properties.add(fFactory.createPropertyStringData(propToSet.getKey(), propToSet.getValue()));
       }
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
     return props;
   }
 
@@ -161,24 +161,24 @@ public class ObjectCreator {
   }
 
   public void updateProperty(String id, String propertyId, String propertyValue) {
-    PropertiesData properties = getUpdatePropertyList(propertyId, propertyValue);
+    Properties properties = getUpdatePropertyList(propertyId, propertyValue);
 
     Holder<String> idHolder = new Holder<String>(id);
     Holder<String> changeTokenHolder = new Holder<String>();
     fObjSvc.updateProperties(fRepositoryId, idHolder, changeTokenHolder, properties, null);
   }
 
-  public PropertiesData getUpdatePropertyList(String propertyId, String propertyValue) {
+  public Properties getUpdatePropertyList(String propertyId, String propertyValue) {
     List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
     properties.add(fFactory.createPropertyStringData(propertyId, propertyValue));
-    PropertiesData newProps = fFactory.createPropertiesData(properties);
+    Properties newProps = fFactory.createPropertiesData(properties);
     return newProps;
   }
 
   public boolean verifyProperty(String id, String propertyId, String propertyValue) {
-      PropertiesData props = fObjSvc.getProperties(fRepositoryId, id, "*", null);
+      Properties props = fObjSvc.getProperties(fRepositoryId, id, "*", null);
       Map<String, PropertyData<?>> propsMap = props.getProperties();
-      PropertyStringData pd = (PropertyStringData) propsMap.get(propertyId);
+      PropertyString pd = (PropertyString) propsMap.get(propertyId);
       return propertyValue.equals(pd.getFirstValue());
   }
 

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -35,13 +35,13 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 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.enums.AllowableActionsEnum;
+import org.apache.chemistry.opencmis.commons.enums.Action;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
-import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
+import org.apache.chemistry.opencmis.commons.enums.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
@@ -111,7 +111,7 @@ public class ObjectServiceTest extends A
 
     // test create a document with a folder type, should fail:
     try {
-      PropertiesData props = createDocumentProperties("DocumentWithAFolderType", FOLDER_TYPE_ID);
+      Properties props = createDocumentProperties("DocumentWithAFolderType", FOLDER_TYPE_ID);
       id = fObjSvc.createDocument(fRepositoryId, props, fRootFolderId, null, VersioningState.NONE,
           null, null, null, null);
       fail("Creating  document with a folder type should fail.");
@@ -120,7 +120,7 @@ public class ObjectServiceTest extends A
     }
     // test create a document with an illegal name, should fail:
     try {
-      PropertiesData props = createDocumentProperties("abc ()", DOCUMENT_TYPE_ID);
+      Properties props = createDocumentProperties("abc ()", DOCUMENT_TYPE_ID);
       id = fObjSvc.createDocument(fRepositoryId, props, fRootFolderId, null, VersioningState.NONE,
           null, null, null, null);
       fail("Creating  document with an illegal name should fail.");
@@ -242,7 +242,7 @@ public class ObjectServiceTest extends A
     String id2 = null;
     try {
       VersioningState versioningState = VersioningState.NONE;
-      PropertiesData props = createDocumentPropertiesForDocumentFromSource("Document From Source");
+      Properties props = createDocumentPropertiesForDocumentFromSource("Document From Source");
       id2 = fObjSvc.createDocumentFromSource(fRepositoryId, id1, props, fRootFolderId, versioningState,
           null, null, null, null);
       if (null == id2)
@@ -461,7 +461,7 @@ public class ObjectServiceTest extends A
     gen.setNumberOfDocumentsToCreatePerFolder(2); // create two documents in each folder
     gen.createFolderHierachy(1, 1, rootFolderId);
     try {
-          fObjSvc.deleteTree(fRepositoryId, rootFolderId, null /*true*/, UnfileObjects.DELETE, true, null);
+          fObjSvc.deleteTree(fRepositoryId, rootFolderId, null /*true*/, UnfileObject.DELETE, true, null);
     } catch (Exception e) {
       fail("deleteTree failed unexpected. " + e);
     }
@@ -539,7 +539,7 @@ public class ObjectServiceTest extends A
       // Generate some property values for custom attributes
       properties.add(fFactory.createPropertyStringData(TEST_DOCUMENT_MY_STRING_PROP_ID, newStringPropVal));
       properties.add(fFactory.createPropertyIntegerData(TEST_DOCUMENT_MY_INT_PROP_ID, newIntPropVal));
-      PropertiesData newProps = fFactory.createPropertiesData(properties);
+      Properties newProps = fFactory.createPropertiesData(properties);
 
       Holder<String> idHolder = new Holder<String>(id);
       Holder<String> changeTokenHolder = new Holder<String>();
@@ -667,7 +667,7 @@ public class ObjectServiceTest extends A
     ObjectData res = fObjSvc.getObject(fRepositoryId, id, "*", true, IncludeRelationships.NONE,
         null, false, false, null);
     assertNotNull(res.getAllowableActions());
-    Set<AllowableActionsEnum> actions = res.getAllowableActions().getAllowableActions();
+    Set<Action> actions = res.getAllowableActions().getAllowableActions();
     assertNotNull(actions);
     verifyAllowableActionsDocument(actions, false, withContent);
 
@@ -683,52 +683,52 @@ public class ObjectServiceTest extends A
     log.info("... testAllowableActions() finished.");
   }
 
-  private void verifyAllowableActionsDocument(Set<AllowableActionsEnum> actions, boolean isVersioned, boolean hasContent) {
-        assertTrue(actions.contains(AllowableActionsEnum.CAN_DELETE_OBJECT));
-        assertTrue(actions.contains(AllowableActionsEnum.CAN_UPDATE_PROPERTIES));
-        assertTrue(actions.contains(AllowableActionsEnum.CAN_GET_PROPERTIES));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_OBJECT_RELATIONSHIPS));
-        assertTrue(actions.contains(AllowableActionsEnum.CAN_GET_OBJECT_PARENTS));
-
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_FOLDER_PARENT));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_FOLDER_TREE));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_DESCENDANTS));
-        assertTrue(actions.contains(AllowableActionsEnum.CAN_MOVE_OBJECT));
+  private void verifyAllowableActionsDocument(Set<Action> actions, boolean isVersioned, boolean hasContent) {
+        assertTrue(actions.contains(Action.CAN_DELETE_OBJECT));
+        assertTrue(actions.contains(Action.CAN_UPDATE_PROPERTIES));
+        assertTrue(actions.contains(Action.CAN_GET_PROPERTIES));
+        assertFalse(actions.contains(Action.CAN_GET_OBJECT_RELATIONSHIPS));
+        assertTrue(actions.contains(Action.CAN_GET_OBJECT_PARENTS));
+
+        assertFalse(actions.contains(Action.CAN_GET_FOLDER_PARENT));
+        assertFalse(actions.contains(Action.CAN_GET_FOLDER_TREE));
+        assertFalse(actions.contains(Action.CAN_GET_DESCENDANTS));
+        assertTrue(actions.contains(Action.CAN_MOVE_OBJECT));
         if (hasContent) {
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM));
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_GET_CONTENT_STREAM));
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_GET_RENDITIONS));
+          assertTrue(actions.contains(Action.CAN_DELETE_CONTENT_STREAM));
+          assertTrue(actions.contains(Action.CAN_GET_CONTENT_STREAM));
+          assertTrue(actions.contains(Action.CAN_GET_RENDITIONS));
         } else {
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM));
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_CONTENT_STREAM));
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_RENDITIONS));
+          assertFalse(actions.contains(Action.CAN_DELETE_CONTENT_STREAM));
+          assertFalse(actions.contains(Action.CAN_GET_CONTENT_STREAM));
+          assertFalse(actions.contains(Action.CAN_GET_RENDITIONS));
         }
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_ADD_OBJECT_TO_FOLDER));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_REMOVE_OBJECT_FROM_FOLDER));
+        assertFalse(actions.contains(Action.CAN_ADD_OBJECT_TO_FOLDER));
+        assertFalse(actions.contains(Action.CAN_REMOVE_OBJECT_FROM_FOLDER));
 
         if (isVersioned) {
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT));
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_CHECK_IN));
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_CHECK_OUT));
-          assertTrue(actions.contains(AllowableActionsEnum.CAN_GET_ALL_VERSIONS));
+          assertTrue(actions.contains(Action.CAN_CANCEL_CHECK_OUT));
+          assertTrue(actions.contains(Action.CAN_CHECK_IN));
+          assertTrue(actions.contains(Action.CAN_CHECK_OUT));
+          assertTrue(actions.contains(Action.CAN_GET_ALL_VERSIONS));
 
         } else {
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT));
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_CHECK_IN));
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_CHECK_OUT));
-          assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_ALL_VERSIONS));
+          assertFalse(actions.contains(Action.CAN_CANCEL_CHECK_OUT));
+          assertFalse(actions.contains(Action.CAN_CHECK_IN));
+          assertFalse(actions.contains(Action.CAN_CHECK_OUT));
+          assertFalse(actions.contains(Action.CAN_GET_ALL_VERSIONS));
         }
-        assertTrue(actions.contains(AllowableActionsEnum.CAN_SET_CONTENT_STREAM));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_APPLY_POLICY));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_APPLIED_POLICIES));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_REMOVE_POLICY));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_CHILDREN));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_CREATE_DOCUMENT));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_CREATE_FOLDER));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_CREATE_RELATIONSHIP));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_DELETE_TREE));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_GET_ACL));
-        assertFalse(actions.contains(AllowableActionsEnum.CAN_APPLY_ACL));
+        assertTrue(actions.contains(Action.CAN_SET_CONTENT_STREAM));
+        assertFalse(actions.contains(Action.CAN_APPLY_POLICY));
+        assertFalse(actions.contains(Action.CAN_GET_APPLIED_POLICIES));
+        assertFalse(actions.contains(Action.CAN_REMOVE_POLICY));
+        assertFalse(actions.contains(Action.CAN_GET_CHILDREN));
+        assertFalse(actions.contains(Action.CAN_CREATE_DOCUMENT));
+        assertFalse(actions.contains(Action.CAN_CREATE_FOLDER));
+        assertFalse(actions.contains(Action.CAN_CREATE_RELATIONSHIP));
+        assertFalse(actions.contains(Action.CAN_DELETE_TREE));
+        assertFalse(actions.contains(Action.CAN_GET_ACL));
+        assertFalse(actions.contains(Action.CAN_APPLY_ACL));
   }
 
   private String retrieveDocument(String id) {
@@ -792,12 +792,12 @@ public class ObjectServiceTest extends A
     return createDocument(name, folderId, DOCUMENT_TYPE_ID, withContent);
   }
 
-  private PropertiesData createDocumentPropertiesForDocumentFromSource(String name) {
+  private Properties createDocumentPropertiesForDocumentFromSource(String name) {
     // 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.NAME, name));
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
     return props;
   }
 
@@ -828,7 +828,7 @@ public class ObjectServiceTest extends A
     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)));
 
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
 
     if (withContent)
       contentStream = createContent();
@@ -860,7 +860,7 @@ public class ObjectServiceTest extends A
     properties.add(fFactory.createPropertyStringData(TEST_DOCUMENT_MY_SUB_STRING_PROP_ID, "another cool string"));
     properties.add(fFactory.createPropertyIntegerData(TEST_DOCUMENT_MY_SUB_INT_PROP_ID, BigInteger.valueOf(4712)));
 
-    PropertiesData props = fFactory.createPropertiesData(properties);
+    Properties props = fFactory.createPropertiesData(properties);
 
     if (withContent)
       contentStream = createContent();

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -50,7 +50,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerDefinitionImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDefinitionImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriDefinitionImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
 import org.apache.chemistry.opencmis.inmemory.RepositoryInfoCreator;
 import org.apache.chemistry.opencmis.inmemory.TypeCreator;
@@ -78,7 +78,7 @@ public class RepositoryServiceTest exten
   static public class UnitTestRepositoryInfo implements RepositoryInfoCreator {
 
     public RepositoryInfo createRepositoryInfo() {
-      RepositoryCapabilitiesDataImpl caps = new RepositoryCapabilitiesDataImpl();
+      RepositoryCapabilitiesImpl caps = new RepositoryCapabilitiesImpl();
       caps.setAllVersionsSearchable(false);
       caps.setCapabilityAcl(CapabilityAcl.NONE);
       caps.setCapabilityChanges(CapabilityChanges.NONE);

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -31,7 +31,7 @@ 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.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
@@ -95,7 +95,7 @@ public class TypeValidationTest extends 
     // of the ObjectService
 
     List<PropertyData<?>> properties =  createPropertiesWithNameAndTypeId(MY_DOC_TYPE);
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
     
     // validate properties according to type
     TypeDefinition typeDef = buildMyType();
@@ -127,7 +127,7 @@ public class TypeValidationTest extends 
     List<PropertyData<?>> properties =  createPropertiesWithNameAndTypeId(STRING_DOC_TYPE);
     properties.add(FACTORY.createPropertyStringData(STRING_PROP_TYPE,
         "A String property with quite a long value exceeding the max. length."));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try exceeding string length
     try {
@@ -156,7 +156,7 @@ public class TypeValidationTest extends 
     
     List<PropertyData<?>> properties = createPropertiesWithNameAndTypeId(INT_DOC_TYPE);
     properties.add(FACTORY.createPropertyIntegerData(INT_PROP_TYPE, BigInteger.valueOf(-100))); // try wrong value
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try exceeding string length
     try {
@@ -185,7 +185,7 @@ public class TypeValidationTest extends 
 
     List<PropertyData<?>> properties = createPropertiesWithNameAndTypeId(DECIMAL_DOC_TYPE);
     properties.add(FACTORY.createPropertyDecimalData(DECIMAL_PROP_TYPE, BigDecimal.valueOf(-11.11)));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try exceeding string length
     try {
@@ -213,7 +213,7 @@ public class TypeValidationTest extends 
 
     List<PropertyData<?>> properties = createPropertiesWithNameAndTypeId(PICK_LIST_DOC_TYPE);
     properties.add(FACTORY.createPropertyStringData(PICK_LIST_PROP_DEF, "pink"));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try wrong value
     try {
@@ -246,7 +246,7 @@ public class TypeValidationTest extends 
     propValues.add("red");
     propValues.add("pink");    
     properties.add(FACTORY.createPropertyStringData(PICK_LIST_PROP_DEF, propValues));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try wrong value
     try {
@@ -282,7 +282,7 @@ public class TypeValidationTest extends 
     propValues.add("green");
     propValues.add("pink");    
     properties.add(FACTORY.createPropertyStringData(PICK_LIST_PROP_DEF, propValues));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try wrong value
     try {
@@ -316,7 +316,7 @@ public class TypeValidationTest extends 
 
     List<PropertyData<?>> properties = createPropertiesWithNameAndTypeId(PICK_LIST_DOC_TYPE);
     properties.add(FACTORY.createPropertyStringData(PICK_LIST_PROP_DEF, "frankfurt"));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try wrong value
     try {
@@ -349,7 +349,7 @@ public class TypeValidationTest extends 
     propValues.add("stuttgart");
     propValues.add("hintertupfingen");
     properties.add(FACTORY.createPropertyStringData(PICK_LIST_PROP_DEF, propValues));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try wrong value
     try {
@@ -385,7 +385,7 @@ public class TypeValidationTest extends 
     List<PropertyData<?>> properties =  createPropertiesWithNameAndTypeId(DOC_TYPE_SUB);
     properties.add(FACTORY.createPropertyStringData(STRING_PROP_TYPE_SUB,
         "A String property with quite a long value exceeding the max. length."));
-    PropertiesData props = FACTORY.createPropertiesData(properties);
+    Properties props = FACTORY.createPropertiesData(properties);
 
     // try exceeding string length on org property
     try {

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -38,12 +38,12 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
+import org.apache.chemistry.opencmis.commons.api.PropertyBoolean;
 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.PropertyId;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
 import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
@@ -133,7 +133,7 @@ public class VersioningTest extends Abst
     fVerSvc.checkOut(fRepositoryId, idHolder, null, contentCopied);
     String pwcId = idHolder.getValue();
     // test that object is checked out and that all properties are set correctly
-    PropertiesData props = fObjSvc.getProperties(fRepositoryId, pwcId, "*", null);
+    Properties props = fObjSvc.getProperties(fRepositoryId, pwcId, "*", null);
     String changeToken = (String) props.getProperties().get(PropertyIds.CHANGE_TOKEN).getFirstValue();
     checkVersionProperties(pwcId, VersioningState.CHECKEDOUT, props.getProperties(), null);
     
@@ -188,7 +188,7 @@ public class VersioningTest extends Abst
     String pwcId = idHolder.getValue();
     
     ContentStream altContent = fCreator.createAlternateContent();
-    PropertiesData newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, PROP_VALUE_NEW);
+    Properties newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, PROP_VALUE_NEW);
     idHolder = new Holder<String>(pwcId);
     assertTrue(isCheckedOut(docId));
     assertTrue(isCheckedOut(pwcId));
@@ -280,7 +280,7 @@ public class VersioningTest extends Abst
     String pwcId = idHolder.getValue();
     
     // Set a new content and modify property
-    PropertiesData props = fObjSvc.getProperties(fRepositoryId, pwcId, "*", null);
+    Properties props = fObjSvc.getProperties(fRepositoryId, pwcId, "*", null);
     String changeToken = (String) props.getProperties().get(PropertyIds.CHANGE_TOKEN).getFirstValue();
     ContentStream altContent = fCreator.createAlternateContent();
     idHolder = new Holder<String>(pwcId);
@@ -323,7 +323,7 @@ public class VersioningTest extends Abst
     String pwcId = idHolder.getValue();
     
     ContentStream altContent = fCreator.createAlternateContent();
-    PropertiesData newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, PROP_VALUE_NEW);
+    Properties newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, PROP_VALUE_NEW);
     idHolder = new Holder<String>(pwcId);
     assertTrue(isCheckedOut(docId));
     assertTrue(isCheckedOut(pwcId));
@@ -333,7 +333,7 @@ public class VersioningTest extends Abst
     fVerSvc.checkIn(fRepositoryId, idHolder, true, newProps, altContent, checkinComment, null, null, null,
         null);
     
-    PropertiesData latest = fVerSvc.getPropertiesOfLatestVersion(fRepositoryId, docId, true, "*", null);
+    Properties latest = fVerSvc.getPropertiesOfLatestVersion(fRepositoryId, docId, true, "*", null);
     assertNotNull(latest);
     
     checkVersionProperties(verId, versioningState, latest.getProperties(), checkinComment);        
@@ -355,7 +355,7 @@ public class VersioningTest extends Abst
     String pwcId = idHolder.getValue();
     
     ContentStream altContent = fCreator.createAlternateContent();
-    PropertiesData newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, PROP_VALUE_NEW);
+    Properties newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, PROP_VALUE_NEW);
     idHolder = new Holder<String>(pwcId);
     assertTrue(isCheckedOut(docId));
     assertTrue(isCheckedOut(pwcId));
@@ -443,7 +443,7 @@ public class VersioningTest extends Abst
       properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, "Folder " + i));
       properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID,
           BaseTypeId.CMIS_FOLDER.value()));
-      PropertiesData props = fFactory.createPropertiesData(properties);      
+      Properties props = fFactory.createPropertiesData(properties);      
       String id = fObjSvc.createFolder(fRepositoryId, props, fRootFolderId, null, null, null, null);
       res[i] = id;
     }
@@ -466,7 +466,7 @@ public class VersioningTest extends Abst
   }
   
   private String getVersionSeriesId(String docId, Map<String, PropertyData<?>> props) {
-    PropertyIdData pdid = (PropertyIdData) props.get(PropertyIds.VERSION_SERIES_ID);
+    PropertyId pdid = (PropertyId) props.get(PropertyIds.VERSION_SERIES_ID);
     assertNotNull(pdid);
     String sVal = pdid.getFirstValue();
     assertNotNull(sVal);
@@ -474,12 +474,12 @@ public class VersioningTest extends Abst
   }
   
   private boolean isCheckedOut(String objectId) {
-    PropertiesData props = fObjSvc.getProperties(fRepositoryId, objectId, "*", null);
+    Properties props = fObjSvc.getProperties(fRepositoryId, objectId, "*", null);
     return isCheckedOut(props.getProperties());
   }
   
   private boolean isCheckedOut( Map<String, PropertyData<?>> props) {
-    PropertyBooleanData pdb = (PropertyBooleanData) props.get(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
+    PropertyBoolean pdb = (PropertyBoolean) 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.IS_LATEST_VERSION);
+    PropertyBoolean pdb = (PropertyBoolean) 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.IS_MAJOR_VERSION);
+    pdb = (PropertyBoolean) props.get(PropertyIds.IS_MAJOR_VERSION);
     assertNotNull(pdb);
     bVal = pdb.getFirstValue();
     assertEquals(versioningState == VersioningState.MAJOR, bVal);
     
-    pdb = (PropertyBooleanData) props.get(PropertyIds.IS_LATEST_MAJOR_VERSION);
+    pdb = (PropertyBoolean) props.get(PropertyIds.IS_LATEST_MAJOR_VERSION);
     assertNotNull(pdb);
     bVal = pdb.getFirstValue();
     assertEquals(versioningState == VersioningState.MAJOR, bVal);
     
-    PropertyIdData pdid = (PropertyIdData) props.get(PropertyIds.VERSION_SERIES_ID);
+    PropertyId pdid = (PropertyId) 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.IS_VERSION_SERIES_CHECKED_OUT);
+    pdb = (PropertyBoolean) props.get(PropertyIds.IS_VERSION_SERIES_CHECKED_OUT);
     assertNotNull(pdb);
     bVal = pdb.getFirstValue();
     assertEquals(versioningState == VersioningState.CHECKEDOUT, bVal);
     
-    PropertyStringData pds = (PropertyStringData) props.get(PropertyIds.VERSION_SERIES_CHECKED_OUT_BY);
+    PropertyString pds = (PropertyString) 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.VERSION_SERIES_CHECKED_OUT_ID);
+    pdid = (PropertyId) 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.CHECKIN_COMMENT);
+    pds = (PropertyString) props.get(PropertyIds.CHECKIN_COMMENT);
     assertNotNull(pdb);
     sVal = pds.getFirstValue();
     if (checkinComment == null)
@@ -599,7 +599,7 @@ public class VersioningTest extends Abst
     fVerSvc.checkOut(fRepositoryId, idHolder, null, contentCopied);
 
     ContentStream content2 = createContent('a');
-    PropertiesData newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, "PropertyFromVersion2");    
+    Properties newProps = fCreator.getUpdatePropertyList(VersionTestTypeSystemCreator.PROPERTY_ID, "PropertyFromVersion2");    
     idHolder = new Holder<String>(verIdV1);    
     // Test check-in and pass content and properties
     String checkinComment = "Checkin from Unit Test-2.";

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -28,10 +28,10 @@ import org.apache.chemistry.opencmis.com
 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.Properties;
 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.UnfileObject;
 import org.apache.chemistry.opencmis.commons.enums.VersioningState;
 
 /**
@@ -50,7 +50,7 @@ public interface CmisObjectService {
    * Bindings: Web Services
    * </p>
    */
-  String createDocument(CallContext context, String repositoryId, PropertiesData properties,
+  String createDocument(CallContext context, String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension);
@@ -63,7 +63,7 @@ public interface CmisObjectService {
    * </p>
    */
   String createDocumentFromSource(CallContext context, String repositoryId, String sourceId,
-      PropertiesData properties, String folderId, VersioningState versioningState,
+      Properties properties, String folderId, VersioningState versioningState,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension);
 
@@ -74,7 +74,7 @@ public interface CmisObjectService {
    * Bindings: Web Services
    * </p>
    */
-  String createFolder(CallContext context, String repositoryId, PropertiesData properties,
+  String createFolder(CallContext context, String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension);
 
@@ -85,7 +85,7 @@ public interface CmisObjectService {
    * Bindings: AtomPub, Web Services
    * </p>
    */
-  String createRelationship(CallContext context, String repositoryId, PropertiesData properties,
+  String createRelationship(CallContext context, String repositoryId, Properties properties,
       List<String> policies, Acl addAces, Acl removeAces,
       ExtensionsData extension);
 
@@ -96,7 +96,7 @@ public interface CmisObjectService {
    * Bindings: Web Services
    * </p>
    */
-  String createPolicy(CallContext context, String repositoryId, PropertiesData properties,
+  String createPolicy(CallContext context, String repositoryId, Properties properties,
       String folderId, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension);
 
@@ -108,7 +108,7 @@ public interface CmisObjectService {
    * Bindings: AtomPub
    * </p>
    */
-  ObjectData create(CallContext context, String repositoryId, PropertiesData properties,
+  ObjectData create(CallContext context, String repositoryId, Properties properties,
       String folderId, ContentStream contentStream, VersioningState versioningState,
       List<String> policies, ExtensionsData extension, ObjectInfoHolder objectInfos);
 
@@ -141,7 +141,7 @@ public interface CmisObjectService {
    * Bindings: Web Services
    * </p>
    */
-  PropertiesData getProperties(CallContext context, String repositoryId, String objectId,
+  Properties getProperties(CallContext context, String repositoryId, String objectId,
       String filter, ExtensionsData extension);
 
   /**
@@ -184,7 +184,7 @@ public interface CmisObjectService {
    * </p>
    */
   ObjectData updateProperties(CallContext context, String repositoryId, Holder<String> objectId,
-      Holder<String> changeToken, PropertiesData properties, Acl acl,
+      Holder<String> changeToken, Properties properties, Acl acl,
       ExtensionsData extension, ObjectInfoHolder objectInfos);
 
   /**
@@ -219,7 +219,7 @@ public interface CmisObjectService {
    * </p>
    */
   FailedToDeleteData deleteTree(CallContext context, String repositoryId, String folderId,
-      Boolean allVersions, UnfileObjects unfileObjects, Boolean continueOnFailure,
+      Boolean allVersions, UnfileObject unfileObjects, Boolean continueOnFailure,
       ExtensionsData extension);
 
   /**

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=934854&r1=934853&r2=934854&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 12:51:57 2010
@@ -25,7 +25,7 @@ import org.apache.chemistry.opencmis.com
 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.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
 
 /**
@@ -61,7 +61,7 @@ public interface CmisVersioningService {
       ExtensionsData extension);
 
   public ObjectData checkIn(CallContext context, String repositoryId, Holder<String> objectId,
-      Boolean major, PropertiesData properties, ContentStream contentStream,
+      Boolean major, Properties properties, ContentStream contentStream,
       String checkinComment, List<String> policies, Acl addAces,
       Acl removeAces, ExtensionsData extension, ObjectInfoHolder objectInfos);
 
@@ -84,7 +84,7 @@ public interface CmisVersioningService {
    * Bindings: Web Services
    * </p>
    */
-  public PropertiesData getPropertiesOfLatestVersion(CallContext context, String repositoryId,
+  public Properties getPropertiesOfLatestVersion(CallContext context, String repositoryId,
       String versionSeriesId, Boolean major, String filter, ExtensionsData extension);
 
   /**



Mime
View raw message