chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fguilla...@apache.org
Subject svn commit: r934854 [3/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-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ChangeEventInfoDataImpl.java Fri Apr 16 12:51:57 2010
@@ -20,21 +20,21 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.GregorianCalendar;
 
-import org.apache.chemistry.opencmis.commons.api.ChangeEventInfoData;
-import org.apache.chemistry.opencmis.commons.enums.TypeOfChanges;
+import org.apache.chemistry.opencmis.commons.api.ChangeEventInfo;
+import org.apache.chemistry.opencmis.commons.enums.ChangeType;
 
 /**
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
- * 
+ *
  */
-public class ChangeEventInfoDataImpl extends AbstractExtensionData implements ChangeEventInfoData {
+public class ChangeEventInfoDataImpl extends AbstractExtensionData implements ChangeEventInfo {
 
   private GregorianCalendar fChangeTime;
-  private TypeOfChanges fTypeOfChanges;
+  private ChangeType fTypeOfChanges;
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.ChangeEventInfoData#getChangeTime()
    */
   public GregorianCalendar getChangeTime() {
@@ -47,14 +47,14 @@ public class ChangeEventInfoDataImpl ext
 
   /*
    * (non-Javadoc)
-   * 
+   *
    * @see org.apache.opencmis.client.provider.ChangeEventInfoData#getChangeType()
    */
-  public TypeOfChanges getChangeType() {
+  public ChangeType getChangeType() {
     return fTypeOfChanges;
   }
 
-  public void setTypeOfChanges(TypeOfChanges typeOfChanges) {
-    fTypeOfChanges = typeOfChanges;
+  public void setChangeType(ChangeType changeType) {
+    fTypeOfChanges = changeType;
   }
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectDataImpl.java Fri Apr 16 12:51:57 2010
@@ -23,10 +23,10 @@ import java.util.List;
 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.ChangeEventInfoData;
+import org.apache.chemistry.opencmis.commons.api.ChangeEventInfo;
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
-import org.apache.chemistry.opencmis.commons.api.PolicyIdListData;
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PolicyIdList;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 import org.apache.chemistry.opencmis.commons.api.RenditionData;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
@@ -37,11 +37,11 @@ import org.apache.chemistry.opencmis.com
  */
 public class ObjectDataImpl extends AbstractExtensionData implements ObjectData {
 
-  private PropertiesData fProperties;
-  private ChangeEventInfoData fChangeEventInfo;
+  private Properties fProperties;
+  private ChangeEventInfo fChangeEventInfo;
   private List<ObjectData> fRelationships;
   private List<RenditionData> fRenditions;
-  private PolicyIdListData fPolicyIds;
+  private PolicyIdList fPolicyIds;
   private AllowableActions fAllowableActions;
   private Acl fAcl;
   private Boolean fIsExactAcl;
@@ -83,11 +83,11 @@ public class ObjectDataImpl extends Abst
    * 
    * @see org.apache.opencmis.client.provider.ObjectData#getProperties()
    */
-  public PropertiesData getProperties() {
+  public Properties getProperties() {
     return fProperties;
   }
 
-  public void setProperties(PropertiesData properties) {
+  public void setProperties(Properties properties) {
     fProperties = properties;
   }
 
@@ -96,11 +96,11 @@ public class ObjectDataImpl extends Abst
    * 
    * @see org.apache.opencmis.client.provider.ObjectData#getChangeEventInfo()
    */
-  public ChangeEventInfoData getChangeEventInfo() {
+  public ChangeEventInfo getChangeEventInfo() {
     return fChangeEventInfo;
   }
 
-  public void setChangeEventInfo(ChangeEventInfoData changeEventInfo) {
+  public void setChangeEventInfo(ChangeEventInfo changeEventInfo) {
     fChangeEventInfo = changeEventInfo;
   }
 
@@ -135,11 +135,11 @@ public class ObjectDataImpl extends Abst
    * 
    * @see org.apache.opencmis.client.provider.ObjectData#getPolicyIds()
    */
-  public PolicyIdListData getPolicyIds() {
+  public PolicyIdList getPolicyIds() {
     return fPolicyIds;
   }
 
-  public void setPolicyIds(PolicyIdListData policyIds) {
+  public void setPolicyIds(PolicyIdList policyIds) {
     fPolicyIds = policyIds;
   }
 

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java Fri Apr 16 12:51:57 2010
@@ -20,13 +20,13 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PolicyIdListData;
+import org.apache.chemistry.opencmis.commons.api.PolicyIdList;
 
 /**
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PolicyIdListDataImpl extends AbstractExtensionData implements PolicyIdListData {
+public class PolicyIdListImpl extends AbstractExtensionData implements PolicyIdList {
 
   private List<String> fPolicyIds;
 

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PolicyIdListImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java Fri Apr 16 12:51:57 2010
@@ -23,7 +23,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Properties;
 import org.apache.chemistry.opencmis.commons.api.PropertyData;
 
 /**
@@ -32,14 +32,14 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertiesDataImpl extends AbstractExtensionData implements PropertiesData {
+public class PropertiesImpl extends AbstractExtensionData implements Properties {
 
   Map<String, PropertyData<?>> fProperties = new LinkedHashMap<String, PropertyData<?>>();
 
   /**
    * Constructor.
    */
-  public PropertiesDataImpl() {
+  public PropertiesImpl() {
   }
 
   /**
@@ -48,7 +48,7 @@ public class PropertiesDataImpl extends 
    * @param properties
    *          initial list of properties
    */
-  public PropertiesDataImpl(List<PropertyData<?>> properties) {
+  public PropertiesImpl(List<PropertyData<?>> properties) {
     if (properties != null) {
       for (PropertyData<?> prop : properties) {
         addProperty(prop);

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertiesImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java Fri Apr 16 12:51:57 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.api.PropertyBoolean;
 
 /**
  * Boolean property data implementation.
@@ -28,18 +28,18 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyBooleanDataImpl extends AbstractPropertyData<Boolean> implements
-    PropertyBooleanData {
+public class PropertyBooleanImpl extends AbstractPropertyData<Boolean> implements
+    PropertyBoolean {
 
-  public PropertyBooleanDataImpl() {
+  public PropertyBooleanImpl() {
   }
 
-  public PropertyBooleanDataImpl(String id, List<Boolean> values) {
+  public PropertyBooleanImpl(String id, List<Boolean> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyBooleanDataImpl(String id, Boolean value) {
+  public PropertyBooleanImpl(String id, Boolean value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyBooleanImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java Fri Apr 16 12:51:57 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
 import java.util.GregorianCalendar;
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyDateTimeData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDateTime;
 
 /**
  * DateTime property data implementation.
@@ -29,18 +29,18 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyDateTimeDataImpl extends AbstractPropertyData<GregorianCalendar> implements
-    PropertyDateTimeData {
+public class PropertyDateTimeImpl extends AbstractPropertyData<GregorianCalendar> implements
+    PropertyDateTime {
 
-  public PropertyDateTimeDataImpl() {
+  public PropertyDateTimeImpl() {
   }
 
-  public PropertyDateTimeDataImpl(String id, List<GregorianCalendar> values) {
+  public PropertyDateTimeImpl(String id, List<GregorianCalendar> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyDateTimeDataImpl(String id, GregorianCalendar value) {
+  public PropertyDateTimeImpl(String id, GregorianCalendar value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDateTimeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java Fri Apr 16 12:51:57 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
 import java.math.BigDecimal;
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyDecimalData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDecimal;
 
 /**
  * Decimal property data implementation.
@@ -29,18 +29,18 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyDecimalDataImpl extends AbstractPropertyData<BigDecimal> implements
-    PropertyDecimalData {
+public class PropertyDecimalImpl extends AbstractPropertyData<BigDecimal> implements
+    PropertyDecimal {
 
-  public PropertyDecimalDataImpl() {
+  public PropertyDecimalImpl() {
   }
 
-  public PropertyDecimalDataImpl(String id, List<BigDecimal> values) {
+  public PropertyDecimalImpl(String id, List<BigDecimal> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyDecimalDataImpl(String id, BigDecimal value) {
+  public PropertyDecimalImpl(String id, BigDecimal value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyDecimalImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java Fri Apr 16 12:51:57 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyHtmlData;
+import org.apache.chemistry.opencmis.commons.api.PropertyHtml;
 
 /**
  * Html property data implementation.
@@ -28,17 +28,17 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyHtmlDataImpl extends AbstractPropertyData<String> implements PropertyHtmlData {
+public class PropertyHtmlImpl extends AbstractPropertyData<String> implements PropertyHtml {
 
-  public PropertyHtmlDataImpl() {
+  public PropertyHtmlImpl() {
   }
 
-  public PropertyHtmlDataImpl(String id, List<String> values) {
+  public PropertyHtmlImpl(String id, List<String> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyHtmlDataImpl(String id, String value) {
+  public PropertyHtmlImpl(String id, String value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyHtmlImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java Fri Apr 16 12:51:57 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyIdData;
+import org.apache.chemistry.opencmis.commons.api.PropertyId;
 
 /**
  * Id property data implementation.
@@ -28,17 +28,17 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyIdDataImpl extends AbstractPropertyData<String> implements PropertyIdData {
+public class PropertyIdImpl extends AbstractPropertyData<String> implements PropertyId {
 
-  public PropertyIdDataImpl() {
+  public PropertyIdImpl() {
   }
 
-  public PropertyIdDataImpl(String id, List<String> values) {
+  public PropertyIdImpl(String id, List<String> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyIdDataImpl(String id, String value) {
+  public PropertyIdImpl(String id, String value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIdImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java Fri Apr 16 12:51:57 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
 import java.math.BigInteger;
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyIntegerData;
+import org.apache.chemistry.opencmis.commons.api.PropertyInteger;
 
 /**
  * Integer property data implementation.
@@ -29,18 +29,18 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyIntegerDataImpl extends AbstractPropertyData<BigInteger> implements
-    PropertyIntegerData {
+public class PropertyIntegerImpl extends AbstractPropertyData<BigInteger> implements
+    PropertyInteger {
 
-  public PropertyIntegerDataImpl() {
+  public PropertyIntegerImpl() {
   }
 
-  public PropertyIntegerDataImpl(String id, List<BigInteger> values) {
+  public PropertyIntegerImpl(String id, List<BigInteger> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyIntegerDataImpl(String id, BigInteger value) {
+  public PropertyIntegerImpl(String id, BigInteger value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyIntegerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java Fri Apr 16 12:51:57 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
 
 /**
  * String property data implementation.
@@ -28,18 +28,18 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyStringDataImpl extends AbstractPropertyData<String> implements
-    PropertyStringData {
+public class PropertyStringImpl extends AbstractPropertyData<String> implements
+    PropertyString {
 
-  public PropertyStringDataImpl() {
+  public PropertyStringImpl() {
   }
 
-  public PropertyStringDataImpl(String id, List<String> values) {
+  public PropertyStringImpl(String id, List<String> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyStringDataImpl(String id, String value) {
+  public PropertyStringImpl(String id, String value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyStringImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java Fri Apr 16 12:51:57 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
 
 import java.util.List;
 
-import org.apache.chemistry.opencmis.commons.api.PropertyUriData;
+import org.apache.chemistry.opencmis.commons.api.PropertyUri;
 
 /**
  * Uri property data implementation.
@@ -28,17 +28,17 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class PropertyUriDataImpl extends AbstractPropertyData<String> implements PropertyUriData {
+public class PropertyUriImpl extends AbstractPropertyData<String> implements PropertyUri {
 
-  public PropertyUriDataImpl() {
+  public PropertyUriImpl() {
   }
 
-  public PropertyUriDataImpl(String id, List<String> values) {
+  public PropertyUriImpl(String id, List<String> values) {
     setId(id);
     setValues(values);
   }
 
-  public PropertyUriDataImpl(String id, String value) {
+  public PropertyUriImpl(String id, String value) {
     setId(id);
     setValue(value);
   }

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PropertyUriImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java (from r934825, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesDataImpl.java)
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesDataImpl.java&r1=934825&r2=934854&rev=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java Fri Apr 16 12:51:57 2010
@@ -30,7 +30,7 @@ import org.apache.chemistry.opencmis.com
  * @author <a href="mailto:fmueller@opentext.com">Florian M&uuml;ller</a>
  * 
  */
-public class RepositoryCapabilitiesDataImpl extends AbstractExtensionData implements
+public class RepositoryCapabilitiesImpl extends AbstractExtensionData implements
     RepositoryCapabilities {
 
   private static final long serialVersionUID = 1L;
@@ -53,7 +53,7 @@ public class RepositoryCapabilitiesDataI
   /**
    * Constructor.
    */
-  public RepositoryCapabilitiesDataImpl() {
+  public RepositoryCapabilitiesImpl() {
   }
 
   /*

Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryCapabilitiesImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java Fri Apr 16 12:51:57 2010
@@ -51,7 +51,7 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionDefinitionDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionMappingDataImpl;
-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;
 
 /**
@@ -86,7 +86,7 @@ public class ConverterTest extends TestC
     obj1.setThinClientUri("thinClientUri");
     obj1.setVendorName("vendorName");
 
-    RepositoryCapabilitiesDataImpl cap1 = new RepositoryCapabilitiesDataImpl();
+    RepositoryCapabilitiesImpl cap1 = new RepositoryCapabilitiesImpl();
     cap1.setAllVersionsSearchable(Boolean.TRUE);
     cap1.setCapabilityAcl(CapabilityAcl.DISCOVER);
     cap1.setCapabilityChanges(CapabilityChanges.ALL);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntryParser.java Fri Apr 16 12:51:57 2010
@@ -37,18 +37,18 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.Acl;
 import org.apache.chemistry.opencmis.commons.api.ContentStream;
 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.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.exceptions.CmisInvalidArgumentException;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
 import org.apache.chemistry.opencmis.commons.impl.Constants;
 import org.apache.chemistry.opencmis.commons.impl.Converter;
 import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringImpl;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType;
 import org.apache.commons.codec.binary.Base64;
 
@@ -97,7 +97,7 @@ public class AtomEntryParser {
   /**
    * Returns the properties of the object.
    */
-  public PropertiesData getProperties() {
+  public Properties getProperties() {
     return (fObject == null ? null : fObject.getProperties());
   }
 
@@ -105,7 +105,7 @@ public class AtomEntryParser {
    * Returns the Id of the object.
    */
   public String getId() {
-    PropertiesData properties = getProperties();
+    Properties properties = getProperties();
     if (properties == null) {
       return null;
     }
@@ -116,8 +116,8 @@ public class AtomEntryParser {
     }
 
     PropertyData<?> property = propertiesMap.get(PropertyIds.OBJECT_ID);
-    if (property instanceof PropertyIdData) {
-      return ((PropertyIdData) property).getFirstValue();
+    if (property instanceof PropertyId) {
+      return ((PropertyId) property).getFirstValue();
     }
 
     return null;
@@ -238,8 +238,8 @@ public class AtomEntryParser {
 
     // overwrite cmis:name with Atom title
     if ((fObject != null) && (fObject.getProperties() != null) && (atomTitle != null)) {
-      PropertyStringData nameProperty = new PropertyStringDataImpl(PropertyIds.NAME, atomTitle);
-      ((PropertiesDataImpl) fObject.getProperties()).addProperty(nameProperty);
+      PropertyString nameProperty = new PropertyStringImpl(PropertyIds.NAME, atomTitle);
+      ((PropertiesImpl) fObject.getProperties()).addProperty(nameProperty);
     }
   }
 

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java Fri Apr 16 12:51:57 2010
@@ -30,7 +30,7 @@ import javax.xml.stream.XMLStreamExcepti
 
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
 import org.apache.chemistry.opencmis.commons.api.ObjectInFolderContainer;
-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;
@@ -232,7 +232,7 @@ public final class AtomPubUtils {
       return null;
     }
 
-    PropertiesData propData = object.getProperties();
+    Properties propData = object.getProperties();
     if (propData == null) {
       return null;
     }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/ObjectService.java Fri Apr 16 12:51:57 2010
@@ -44,11 +44,11 @@ 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.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
 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.CmisRuntimeException;
 import org.apache.chemistry.opencmis.commons.impl.Constants;
@@ -257,8 +257,8 @@ public final class ObjectService {
     // get parameters
     String folderId = getStringParameter(request, Constants.PARAM_ID);
     Boolean allVersions = getBooleanParameter(request, Constants.PARAM_ALL_VERSIONS);
-    UnfileObjects unfileObjects = getEnumParameter(request, Constants.PARAM_UNFILE_OBJECTS,
-        UnfileObjects.class);
+    UnfileObject unfileObjects = getEnumParameter(request, Constants.PARAM_UNFILE_OBJECTS,
+        UnfileObject.class);
     Boolean continueOnFailure = getBooleanParameter(request, Constants.PARAM_CONTINUE_ON_FAILURE);
 
     // execute
@@ -542,7 +542,7 @@ public final class ObjectService {
   /**
    * Gets the change token from a property set.
    */
-  private static String extractChangeToken(PropertiesData properties) {
+  private static String extractChangeToken(Properties properties) {
     if (properties == null) {
       return null;
     }
@@ -553,10 +553,10 @@ public final class ObjectService {
     }
 
     PropertyData<?> changeLogProperty = propertiesMap.get(PropertyIds.CHANGE_TOKEN);
-    if (!(changeLogProperty instanceof PropertyStringData)) {
+    if (!(changeLogProperty instanceof PropertyString)) {
       return null;
     }
 
-    return ((PropertyStringData) changeLogProperty).getFirstValue();
+    return ((PropertyString) changeLogProperty).getFirstValue();
   }
 }

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/webservices/ObjectService.java Fri Apr 16 12:51:57 2010
@@ -36,7 +36,7 @@ import javax.xml.ws.WebServiceContext;
 import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
 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.commons.impl.jaxb.CmisAccessControlListType;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisAllowableActionsType;
@@ -248,7 +248,7 @@ public class ObjectService extends Abstr
       CallContext context = createContext(fContext);
 
       return convert(service.deleteTree(context, repositoryId, folderId, allVersions, convert(
-          UnfileObjects.class, unfileObjects), continueOnFailure, convert(extension)));
+          UnfileObject.class, unfileObjects), continueOnFailure, convert(extension)));
     }
     catch (Exception e) {
       throw convertException(e);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/AtomEntryParserTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/AtomEntryParserTest.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/AtomEntryParserTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/test/java/org/apache/chemistry/opencmis/server/impl/AtomEntryParserTest.java Fri Apr 16 12:51:57 2010
@@ -27,7 +27,7 @@ import java.io.ByteArrayOutputStream;
 
 import org.apache.chemistry.opencmis.commons.PropertyIds;
 import org.apache.chemistry.opencmis.commons.api.ContentStream;
-import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.api.PropertyString;
 import org.apache.chemistry.opencmis.server.impl.atompub.AtomEntryParser;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Test;
@@ -231,9 +231,9 @@ public class AtomEntryParserTest {
     assertNotNull(aep.getObject());
     assertNotNull(aep.getObject().getProperties());
     assertNotNull(aep.getObject().getProperties().getProperties());
-    assertNotNull(aep.getObject().getProperties().getProperties().get(PropertyIds.NAME) instanceof PropertyStringData);
+    assertNotNull(aep.getObject().getProperties().getProperties().get(PropertyIds.NAME) instanceof PropertyString);
 
-    PropertyStringData nameProperty = (PropertyStringData) aep.getObject().getProperties()
+    PropertyString nameProperty = (PropertyString) aep.getObject().getProperties()
         .getProperties().get(PropertyIds.NAME);
 
     assertEquals("atom.title", nameProperty.getFirstValue());

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Fri Apr 16 12:51:57 2010
@@ -58,18 +58,18 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
 import org.apache.chemistry.opencmis.commons.api.PermissionDefinition;
 import org.apache.chemistry.opencmis.commons.api.PermissionMapping;
-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.PropertyDateTimeData;
+import org.apache.chemistry.opencmis.commons.api.PropertyDateTime;
 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.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.enums.AclPropagation;
-import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
+import org.apache.chemistry.opencmis.commons.enums.Action;
 import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
 import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
 import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
@@ -107,16 +107,16 @@ import org.apache.chemistry.opencmis.com
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ObjectParentDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionDefinitionDataImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.PermissionMappingDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyBooleanDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDateTimeDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDecimalDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyHtmlDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertiesImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyBooleanImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDateTimeImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyDecimalImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyHtmlImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIdImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyIntegerImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyStringImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PropertyUriImpl;
+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.jaxb.CmisObjectType;
 import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisProperty;
@@ -211,7 +211,7 @@ public class FileShareRepository {
 
     fRepositoryInfo.setThinClientUri("");
 
-    RepositoryCapabilitiesDataImpl capabilities = new RepositoryCapabilitiesDataImpl();
+    RepositoryCapabilitiesImpl capabilities = new RepositoryCapabilitiesImpl();
     capabilities.setCapabilityAcl(CapabilityAcl.DISCOVER);
     capabilities.setAllVersionsSearchable(false);
     capabilities.setCapabilityJoin(CapabilityJoin.NONE);
@@ -352,7 +352,7 @@ public class FileShareRepository {
   /**
    * Create* dispatch for AtomPub.
    */
-  public ObjectData create(CallContext context, PropertiesData properties, String folderId,
+  public ObjectData create(CallContext context, Properties properties, String folderId,
       ContentStream contentStream, VersioningState versioningState, ObjectInfoHolder objectInfos) {
     debug("create");
     boolean userReadOnly = checkUser(context, true);
@@ -380,7 +380,7 @@ public class FileShareRepository {
   /**
    * CMIS createDocument.
    */
-  public String createDocument(CallContext context, PropertiesData properties, String folderId,
+  public String createDocument(CallContext context, Properties properties, String folderId,
       ContentStream contentStream, VersioningState versioningState) {
     debug("createDocument");
     checkUser(context, true);
@@ -403,7 +403,7 @@ public class FileShareRepository {
     }
 
     // compile the properties
-    PropertiesData props = compileProperties(typeId, context.getUsername(), millisToCalendar(System
+    Properties props = compileProperties(typeId, context.getUsername(), millisToCalendar(System
         .currentTimeMillis()), context.getUsername(), properties);
 
     // check the name
@@ -463,7 +463,7 @@ public class FileShareRepository {
    * CMIS createDocumentFromSource.
    */
   public String createDocumentFromSource(CallContext context, String sourceId,
-      PropertiesData properties, String folderId, VersioningState versioningState) {
+      Properties properties, String folderId, VersioningState versioningState) {
 
     // check versioning state
     if (VersioningState.NONE != versioningState) {
@@ -486,7 +486,7 @@ public class FileShareRepository {
     String name = source.getName();
 
     // get properties
-    PropertiesDataImpl sourceProperties = new PropertiesDataImpl();
+    PropertiesImpl sourceProperties = new PropertiesImpl();
     readCustomProperties(source, sourceProperties, null, new ObjectInfoImpl());
 
     // get the type id
@@ -496,7 +496,7 @@ public class FileShareRepository {
     }
 
     // copy properties
-    PropertiesDataImpl newProperties = new PropertiesDataImpl();
+    PropertiesImpl newProperties = new PropertiesImpl();
     for (PropertyData<?> prop : sourceProperties.getProperties().values()) {
       if ((prop.getId().equals(PropertyIds.OBJECT_TYPE_ID))
           || (prop.getId().equals(PropertyIds.CREATED_BY))
@@ -598,7 +598,7 @@ public class FileShareRepository {
   /**
    * CMIS createFolder.
    */
-  public String createFolder(CallContext context, PropertiesData properties, String folderId) {
+  public String createFolder(CallContext context, Properties properties, String folderId) {
     debug("createFolder");
     checkUser(context, true);
 
@@ -615,7 +615,7 @@ public class FileShareRepository {
     }
 
     // compile the properties
-    PropertiesData props = compileProperties(typeId, context.getUsername(), millisToCalendar(System
+    Properties props = compileProperties(typeId, context.getUsername(), millisToCalendar(System
         .currentTimeMillis()), context.getUsername(), properties);
 
     // check the name
@@ -795,7 +795,7 @@ public class FileShareRepository {
    * CMIS updateProperties.
    */
   public ObjectData updateProperties(CallContext context, Holder<String> objectId,
-      PropertiesData properties, ObjectInfoHolder objectInfos) {
+      Properties properties, ObjectInfoHolder objectInfos) {
     debug("updateProperties");
     boolean userReadOnly = checkUser(context, true);
 
@@ -814,7 +814,7 @@ public class FileShareRepository {
     }
 
     // get old properties
-    PropertiesDataImpl oldProperties = new PropertiesDataImpl();
+    PropertiesImpl oldProperties = new PropertiesImpl();
     readCustomProperties(file, oldProperties, null, new ObjectInfoImpl());
 
     // get the type id
@@ -837,7 +837,7 @@ public class FileShareRepository {
     }
 
     // compile the properties
-    PropertiesData props = updateProperties(typeId, creator, creationDate, context.getUsername(),
+    Properties props = updateProperties(typeId, creator, creationDate, context.getUsername(),
         oldProperties, properties);
 
     // write properties
@@ -1329,7 +1329,7 @@ public class FileShareRepository {
   /**
    * Gathers all base properties of a file or folder.
    */
-  private PropertiesData compileProperties(File file, Set<String> orgfilter,
+  private Properties compileProperties(File file, Set<String> orgfilter,
       ObjectInfoHolder objectInfos) {
     if (file == null) {
       throw new IllegalArgumentException("File must not be null!");
@@ -1360,7 +1360,7 @@ public class FileShareRepository {
 
     // let's do it
     try {
-      PropertiesDataImpl result = new PropertiesDataImpl();
+      PropertiesImpl result = new PropertiesImpl();
 
       // id
       String id = fileToId(file);
@@ -1459,7 +1459,7 @@ public class FileShareRepository {
    * Reads and adds properties.
    */
   @SuppressWarnings("unchecked")
-  private void readCustomProperties(File file, PropertiesDataImpl properties, Set<String> filter,
+  private void readCustomProperties(File file, PropertiesImpl properties, Set<String> filter,
       ObjectInfoImpl objectInfo) {
     File propFile = getPropertiesFile(file);
 
@@ -1487,8 +1487,8 @@ public class FileShareRepository {
       PropertyData<?> prop = Converter.convert(cmisProp);
 
       // overwrite object info
-      if (prop instanceof PropertyStringData) {
-        String firstValueStr = ((PropertyStringData) prop).getFirstValue();
+      if (prop instanceof PropertyString) {
+        String firstValueStr = ((PropertyString) prop).getFirstValue();
         if (PropertyIds.NAME.equals(prop.getId())) {
           objectInfo.setName(firstValueStr);
         }
@@ -1506,8 +1506,8 @@ public class FileShareRepository {
         }
       }
 
-      if (prop instanceof PropertyDateTimeData) {
-        GregorianCalendar firstValueCal = ((PropertyDateTimeData) prop).getFirstValue();
+      if (prop instanceof PropertyDateTime) {
+        GregorianCalendar firstValueCal = ((PropertyDateTime) prop).getFirstValue();
         if (PropertyIds.CREATION_DATE.equals(prop.getId())) {
           objectInfo.setCreationDate(firstValueCal);
         }
@@ -1544,9 +1544,9 @@ public class FileShareRepository {
   /**
    * Checks and compiles a property set that can be written to disc.
    */
-  private PropertiesData compileProperties(String typeId, String creator,
-      GregorianCalendar creationDate, String modifier, PropertiesData properties) {
-    PropertiesDataImpl result = new PropertiesDataImpl();
+  private Properties compileProperties(String typeId, String creator,
+      GregorianCalendar creationDate, String modifier, Properties properties) {
+    PropertiesImpl result = new PropertiesImpl();
     Set<String> addedProps = new HashSet<String>();
 
     if ((properties == null) || (properties.getProperties() == null)) {
@@ -1609,10 +1609,10 @@ public class FileShareRepository {
   /**
    * Checks and updates a property set that can be written to disc.
    */
-  private PropertiesData updateProperties(String typeId, String creator,
-      GregorianCalendar creationDate, String modifier, PropertiesData oldProperties,
-      PropertiesData properties) {
-    PropertiesDataImpl result = new PropertiesDataImpl();
+  private Properties updateProperties(String typeId, String creator,
+      GregorianCalendar creationDate, String modifier, Properties oldProperties,
+      Properties properties) {
+    PropertiesImpl result = new PropertiesImpl();
 
     if (properties == null) {
       throw new CmisConstraintException("No properties!");
@@ -1685,7 +1685,7 @@ public class FileShareRepository {
     return prop.getValues().isEmpty();
   }
 
-  private void addPropertyId(PropertiesDataImpl props, String typeId, Set<String> filter,
+  private void addPropertyId(PropertiesImpl props, String typeId, Set<String> filter,
       String id, String value) {
     if (!checkAddProperty(props, typeId, filter, id)) {
       return;
@@ -1695,46 +1695,46 @@ public class FileShareRepository {
       throw new IllegalArgumentException("Value must not be null!");
     }
 
-    props.addProperty(new PropertyIdDataImpl(id, value));
+    props.addProperty(new PropertyIdImpl(id, value));
   }
 
-  private void addPropertyString(PropertiesDataImpl props, String typeId, Set<String> filter,
+  private void addPropertyString(PropertiesImpl props, String typeId, Set<String> filter,
       String id, String value) {
     if (!checkAddProperty(props, typeId, filter, id)) {
       return;
     }
 
-    props.addProperty(new PropertyStringDataImpl(id, value));
+    props.addProperty(new PropertyStringImpl(id, value));
   }
 
-  private void addPropertyInteger(PropertiesDataImpl props, String typeId, Set<String> filter,
+  private void addPropertyInteger(PropertiesImpl props, String typeId, Set<String> filter,
       String id, long value) {
     if (!checkAddProperty(props, typeId, filter, id)) {
       return;
     }
 
-    props.addProperty(new PropertyIntegerDataImpl(id, BigInteger.valueOf(value)));
+    props.addProperty(new PropertyIntegerImpl(id, BigInteger.valueOf(value)));
   }
 
-  private void addPropertyBoolean(PropertiesDataImpl props, String typeId, Set<String> filter,
+  private void addPropertyBoolean(PropertiesImpl props, String typeId, Set<String> filter,
       String id, boolean value) {
     if (!checkAddProperty(props, typeId, filter, id)) {
       return;
     }
 
-    props.addProperty(new PropertyBooleanDataImpl(id, value));
+    props.addProperty(new PropertyBooleanImpl(id, value));
   }
 
-  private void addPropertyDateTime(PropertiesDataImpl props, String typeId, Set<String> filter,
+  private void addPropertyDateTime(PropertiesImpl props, String typeId, Set<String> filter,
       String id, GregorianCalendar value) {
     if (!checkAddProperty(props, typeId, filter, id)) {
       return;
     }
 
-    props.addProperty(new PropertyDateTimeDataImpl(id, value));
+    props.addProperty(new PropertyDateTimeImpl(id, value));
   }
 
-  private boolean checkAddProperty(PropertiesData properties, String typeId, Set<String> filter,
+  private boolean checkAddProperty(Properties properties, String typeId, Set<String> filter,
       String id) {
     if ((properties == null) || (properties.getProperties() == null)) {
       throw new IllegalArgumentException("Properties must not be null!");
@@ -1770,7 +1770,7 @@ public class FileShareRepository {
    * Adds the default value of property if defined.
    */
   @SuppressWarnings("unchecked")
-  private boolean addPropertyDefault(PropertiesDataImpl props, PropertyDefinition<?> propDef) {
+  private boolean addPropertyDefault(PropertiesImpl props, PropertyDefinition<?> propDef) {
     if ((props == null) || (props.getProperties() == null)) {
       throw new IllegalArgumentException("Props must not be null!");
     }
@@ -1784,31 +1784,31 @@ public class FileShareRepository {
       switch (propDef.getPropertyType()) {
       case BOOLEAN:
         props
-            .addProperty(new PropertyBooleanDataImpl(propDef.getId(), (List<Boolean>) defaultValue));
+            .addProperty(new PropertyBooleanImpl(propDef.getId(), (List<Boolean>) defaultValue));
         break;
       case DATETIME:
-        props.addProperty(new PropertyDateTimeDataImpl(propDef.getId(),
+        props.addProperty(new PropertyDateTimeImpl(propDef.getId(),
             (List<GregorianCalendar>) defaultValue));
         break;
       case DECIMAL:
-        props.addProperty(new PropertyDecimalDataImpl(propDef.getId(),
+        props.addProperty(new PropertyDecimalImpl(propDef.getId(),
             (List<BigDecimal>) defaultValue));
         break;
       case HTML:
-        props.addProperty(new PropertyHtmlDataImpl(propDef.getId(), (List<String>) defaultValue));
+        props.addProperty(new PropertyHtmlImpl(propDef.getId(), (List<String>) defaultValue));
         break;
       case ID:
-        props.addProperty(new PropertyIdDataImpl(propDef.getId(), (List<String>) defaultValue));
+        props.addProperty(new PropertyIdImpl(propDef.getId(), (List<String>) defaultValue));
         break;
       case INTEGER:
-        props.addProperty(new PropertyIntegerDataImpl(propDef.getId(),
+        props.addProperty(new PropertyIntegerImpl(propDef.getId(),
             (List<BigInteger>) defaultValue));
         break;
       case STRING:
-        props.addProperty(new PropertyStringDataImpl(propDef.getId(), (List<String>) defaultValue));
+        props.addProperty(new PropertyStringImpl(propDef.getId(), (List<String>) defaultValue));
         break;
       case URI:
-        props.addProperty(new PropertyUriDataImpl(propDef.getId(), (List<String>) defaultValue));
+        props.addProperty(new PropertyUriImpl(propDef.getId(), (List<String>) defaultValue));
         break;
       default:
         throw new RuntimeException("Unknown datatype! Spec change?");
@@ -1837,7 +1837,7 @@ public class FileShareRepository {
     boolean isFolder = file.isDirectory();
     boolean isRoot = fRoot.equals(file);
 
-    Set<AllowableActionsEnum> aam = new HashSet<AllowableActionsEnum>();
+    Set<Action> aam = new HashSet<Action>();
 
     // TODO XXX use enum
 //    aam.put(AllowableActionsData.ACTION_CAN_GET_OBJECT_PARENTS, !isRoot);
@@ -1914,7 +1914,7 @@ public class FileShareRepository {
   /**
    * Writes the properties for a document or folder.
    */
-  private void writePropertiesFile(File file, PropertiesData properties) {
+  private void writePropertiesFile(File file, Properties properties) {
     File propFile = getPropertiesFile(file);
 
     // if no properties set delete the properties file
@@ -1993,13 +1993,13 @@ public class FileShareRepository {
   /**
    * Gets the type id from a set of properties.
    */
-  private String getTypeId(PropertiesData properties) {
+  private String getTypeId(Properties properties) {
     PropertyData<?> typeProperty = properties.getProperties().get(PropertyIds.OBJECT_TYPE_ID);
-    if (!(typeProperty instanceof PropertyIdData)) {
+    if (!(typeProperty instanceof PropertyId)) {
       throw new CmisInvalidArgumentException("Type id must be set!");
     }
 
-    String typeId = ((PropertyIdData) typeProperty).getFirstValue();
+    String typeId = ((PropertyId) typeProperty).getFirstValue();
     if (typeId == null) {
       throw new CmisInvalidArgumentException("Type id must be set!");
     }
@@ -2010,37 +2010,37 @@ public class FileShareRepository {
   /**
    * Returns the first value of an id property.
    */
-  private String getIdProperty(PropertiesData properties, String name) {
+  private String getIdProperty(Properties properties, String name) {
     PropertyData<?> property = properties.getProperties().get(name);
-    if (!(property instanceof PropertyIdData)) {
+    if (!(property instanceof PropertyId)) {
       return null;
     }
 
-    return ((PropertyIdData) property).getFirstValue();
+    return ((PropertyId) property).getFirstValue();
   }
 
   /**
    * Returns the first value of an string property.
    */
-  private String getStringProperty(PropertiesData properties, String name) {
+  private String getStringProperty(Properties properties, String name) {
     PropertyData<?> property = properties.getProperties().get(name);
-    if (!(property instanceof PropertyStringData)) {
+    if (!(property instanceof PropertyString)) {
       return null;
     }
 
-    return ((PropertyStringData) property).getFirstValue();
+    return ((PropertyString) property).getFirstValue();
   }
 
   /**
    * Returns the first value of an datetime property.
    */
-  private GregorianCalendar getDateTimeProperty(PropertiesData properties, String name) {
+  private GregorianCalendar getDateTimeProperty(Properties properties, String name) {
     PropertyData<?> property = properties.getProperties().get(name);
-    if (!(property instanceof PropertyDateTimeData)) {
+    if (!(property instanceof PropertyDateTime)) {
       return null;
     }
 
-    return ((PropertyDateTimeData) property).getFirstValue();
+    return ((PropertyDateTime) property).getFirstValue();
   }
 
   /**

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/ObjectService.java Fri Apr 16 12:51:57 2010
@@ -29,10 +29,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;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
 import org.apache.chemistry.opencmis.server.spi.CallContext;
@@ -67,7 +67,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData,
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
-  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) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).create(context,
@@ -86,7 +86,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  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) {
@@ -107,7 +107,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   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) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId)
@@ -124,7 +124,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  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) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).createFolder(context,
@@ -141,7 +141,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.provider.AccessControlList,
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
-  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) {
     fRepositoryMap.getAuthenticatedRepository(context, repositoryId);
@@ -159,7 +159,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   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) {
     fRepositoryMap.getAuthenticatedRepository(context, repositoryId);
     throw new CmisNotSupportedException("createRelationship not supported!");
@@ -203,7 +203,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData)
    */
   public FailedToDeleteData deleteTree(CallContext context, String repositoryId, String folderId,
-      Boolean allVersions, UnfileObjects unfileObjects, Boolean continueOnFailure,
+      Boolean allVersions, UnfileObject unfileObjects, Boolean continueOnFailure,
       ExtensionsData extension) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).deleteTree(context,
         folderId, continueOnFailure);
@@ -282,7 +282,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.commons.api.ExtensionsData,
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
-  public PropertiesData getProperties(CallContext context, String repositoryId, String objectId,
+  public Properties getProperties(CallContext context, String repositoryId, String objectId,
       String filter, ExtensionsData extension) {
     ObjectData object = fRepositoryMap.getAuthenticatedRepository(context, repositoryId).getObject(
         context, objectId, filter, false, false, null);
@@ -350,7 +350,7 @@ public class ObjectService implements Cm
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
   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) {
     return fRepositoryMap.getAuthenticatedRepository(context, repositoryId).updateProperties(
         context, objectId, properties, objectInfos);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java?rev=934854&r1=934853&r2=934854&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/VersioningService.java Fri Apr 16 12:51:57 2010
@@ -26,7 +26,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;
 import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
 import org.apache.chemistry.opencmis.server.spi.CallContext;
@@ -77,7 +77,7 @@ public class VersioningService implement
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
   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) {
     throw new CmisNotSupportedException("checkIn not supported!");
@@ -143,7 +143,7 @@ public class VersioningService implement
    * java.lang.String, org.apache.opencmis.commons.api.ExtensionsData,
    * org.apache.opencmis.server.spi.ObjectInfoHolder)
    */
-  public PropertiesData getPropertiesOfLatestVersion(CallContext context, String repositoryId,
+  public Properties getPropertiesOfLatestVersion(CallContext context, String repositoryId,
       String versionSeriesId, Boolean major, String filter, ExtensionsData extension) {
     ObjectData object = fRepositoryMap.getAuthenticatedRepository(context, repositoryId).getObject(
         context, versionSeriesId, filter, false, false, null);

Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.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/DataObjectCreator.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/DataObjectCreator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/DataObjectCreator.java Fri Apr 16 12:51:57 2010
@@ -27,16 +27,16 @@ import java.util.Set;
 import org.apache.chemistry.opencmis.commons.api.Ace;
 import org.apache.chemistry.opencmis.commons.api.Acl;
 import org.apache.chemistry.opencmis.commons.api.AllowableActions;
-import org.apache.chemistry.opencmis.commons.api.ChangeEventInfoData;
+import org.apache.chemistry.opencmis.commons.api.ChangeEventInfo;
 import org.apache.chemistry.opencmis.commons.api.ObjectData;
-import org.apache.chemistry.opencmis.commons.api.PolicyIdListData;
+import org.apache.chemistry.opencmis.commons.api.PolicyIdList;
 import org.apache.chemistry.opencmis.commons.api.RenditionData;
-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.impl.dataobjects.AccessControlListImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.AllowableActionsImpl;
 import org.apache.chemistry.opencmis.commons.impl.dataobjects.ChangeEventInfoDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyIdListDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyIdListImpl;
 import org.apache.chemistry.opencmis.inmemory.server.RuntimeContext;
 import org.apache.chemistry.opencmis.inmemory.storedobj.api.Content;
 import org.apache.chemistry.opencmis.inmemory.storedobj.api.Folder;
@@ -73,55 +73,55 @@ public class DataObjectCreator {
     }
 
     AllowableActionsImpl allowableActions = new AllowableActionsImpl();
-    Set<AllowableActionsEnum> set = allowableActions.getAllowableActions();
+    Set<Action> set = allowableActions.getAllowableActions();
 
-    set.add(AllowableActionsEnum.CAN_DELETE_OBJECT);
-    set.add(AllowableActionsEnum.CAN_UPDATE_PROPERTIES);
+    set.add(Action.CAN_DELETE_OBJECT);
+    set.add(Action.CAN_UPDATE_PROPERTIES);
 
     if (isFolder || isDocument) {
-      set.add(AllowableActionsEnum.CAN_GET_PROPERTIES);
+      set.add(Action.CAN_GET_PROPERTIES);
       if (!so.equals(objStore.getRootFolder())) {
-          set.add(AllowableActionsEnum.CAN_GET_OBJECT_PARENTS);
+          set.add(Action.CAN_GET_OBJECT_PARENTS);
       }
-      set.add(AllowableActionsEnum.CAN_MOVE_OBJECT);
+      set.add(Action.CAN_MOVE_OBJECT);
     }
 
     if (isFolder) {
         if (!so.equals(objStore.getRootFolder())) {
-            set.add(AllowableActionsEnum.CAN_GET_FOLDER_PARENT);
+            set.add(Action.CAN_GET_FOLDER_PARENT);
         }
-        set.add(AllowableActionsEnum.CAN_GET_FOLDER_TREE);
-        set.add(AllowableActionsEnum.CAN_GET_DESCENDANTS);
+        set.add(Action.CAN_GET_FOLDER_TREE);
+        set.add(Action.CAN_GET_DESCENDANTS);
 
-        set.add(AllowableActionsEnum.CAN_ADD_OBJECT_TO_FOLDER);
-        set.add(AllowableActionsEnum.CAN_REMOVE_OBJECT_FROM_FOLDER);
-        set.add(AllowableActionsEnum.CAN_CREATE_DOCUMENT);
-        set.add(AllowableActionsEnum.CAN_CREATE_FOLDER);
-        set.add(AllowableActionsEnum.CAN_GET_CHILDREN);
-        set.add(AllowableActionsEnum.CAN_DELETE_TREE);
+        set.add(Action.CAN_ADD_OBJECT_TO_FOLDER);
+        set.add(Action.CAN_REMOVE_OBJECT_FROM_FOLDER);
+        set.add(Action.CAN_CREATE_DOCUMENT);
+        set.add(Action.CAN_CREATE_FOLDER);
+        set.add(Action.CAN_GET_CHILDREN);
+        set.add(Action.CAN_DELETE_TREE);
     }
 
     if (hasContent) {
-        set.add(AllowableActionsEnum.CAN_DELETE_CONTENT_STREAM);
-        set.add(AllowableActionsEnum.CAN_GET_CONTENT_STREAM);
+        set.add(Action.CAN_DELETE_CONTENT_STREAM);
+        set.add(Action.CAN_GET_CONTENT_STREAM);
     }
 
    if (isVersioned) {
        if (canCheckOut) {
-           set.add(AllowableActionsEnum.CAN_CHECK_OUT);
+           set.add(Action.CAN_CHECK_OUT);
        }
        if (isCheckedOut) {
-           set.add(AllowableActionsEnum.CAN_CANCEL_CHECK_OUT);
+           set.add(Action.CAN_CANCEL_CHECK_OUT);
        }
        if (canCheckIn) {
-           set.add(AllowableActionsEnum.CAN_CHECK_IN);
+           set.add(Action.CAN_CHECK_IN);
        }
-       set.add(AllowableActionsEnum.CAN_GET_ALL_VERSIONS);
+       set.add(Action.CAN_GET_ALL_VERSIONS);
     }
 
     if (isDocument) {
         if (!isVersioned || canCheckIn) {
-            set.add(AllowableActionsEnum.CAN_SET_CONTENT_STREAM);
+            set.add(Action.CAN_SET_CONTENT_STREAM);
         }
     }
 
@@ -137,9 +137,9 @@ public class DataObjectCreator {
     return acl;
   }
 
-  public static PolicyIdListData fillPolicyIds(StoredObject so) {
+  public static PolicyIdList fillPolicyIds(StoredObject so) {
     // TODO: to be completed if policies are implemented
-    PolicyIdListDataImpl polIds = new PolicyIdListDataImpl();
+    PolicyIdListImpl polIds = new PolicyIdListImpl();
     // polIds.setPolicyIds(...);
     return polIds;
   }
@@ -157,9 +157,9 @@ public class DataObjectCreator {
     return renditions;
   }
 
-  public static ChangeEventInfoData fillChangeEventInfo(StoredObject so) {
+  public static ChangeEventInfo fillChangeEventInfo(StoredObject so) {
     // TODO: to be completed if change information is implemented
-    ChangeEventInfoData changeEventInfo = new ChangeEventInfoDataImpl();
+    ChangeEventInfo changeEventInfo = new ChangeEventInfoDataImpl();
     return changeEventInfo;
   }
 }



Mime
View raw message