You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2010/04/15 16:05:42 UTC
svn commit: r934417 [4/7] - in /incubator/chemistry/opencmis/trunk:
chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/
chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/or...
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.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/Converter.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/Converter.java Thu Apr 15 14:05:36 2010
@@ -27,6 +27,7 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.GregorianCalendar;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -54,6 +55,35 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.AclCapabilities;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData;
+import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
+import org.apache.chemistry.opencmis.commons.bindings.Holder;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionDefinition;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionMapping;
+import org.apache.chemistry.opencmis.commons.bindings.PolicyIdListData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyDateTimeData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyDecimalData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyHtmlData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyIdData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyIntegerData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyUriData;
+import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
+import org.apache.chemistry.opencmis.commons.bindings.RepositoryCapabilities;
+import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
@@ -61,7 +91,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
-import org.apache.chemistry.opencmis.commons.enums.CapabilityRendition;
+import org.apache.chemistry.opencmis.commons.enums.CapabilityRenditions;
import org.apache.chemistry.opencmis.commons.enums.Cardinality;
import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed;
import org.apache.chemistry.opencmis.commons.enums.DateTimeResolution;
@@ -115,7 +145,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RelationshipTypeDefinitionImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RenditionDataImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryCapabilitiesDataImpl;
-import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoDataImpl;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionContainerImpl;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.TypeDefinitionListImpl;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisACLCapabilityType;
@@ -190,43 +220,14 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumSupportedPermissions;
import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumTypeOfChanges;
import org.apache.chemistry.opencmis.commons.impl.jaxb.EnumUpdatability;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlList;
-import org.apache.chemistry.opencmis.commons.provider.AclCapabilitiesData;
-import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData;
-import org.apache.chemistry.opencmis.commons.provider.ContentStreamData;
-import org.apache.chemistry.opencmis.commons.provider.FailedToDeleteData;
-import org.apache.chemistry.opencmis.commons.provider.Holder;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderContainer;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.provider.ObjectList;
-import org.apache.chemistry.opencmis.commons.provider.ObjectParentData;
-import org.apache.chemistry.opencmis.commons.provider.PermissionDefinitionData;
-import org.apache.chemistry.opencmis.commons.provider.PermissionMappingData;
-import org.apache.chemistry.opencmis.commons.provider.PolicyIdListData;
-import org.apache.chemistry.opencmis.commons.provider.PropertiesData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyBooleanData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyDateTimeData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyDecimalData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyHtmlData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyIdData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyIntegerData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyStringData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyUriData;
-import org.apache.chemistry.opencmis.commons.provider.RenditionData;
-import org.apache.chemistry.opencmis.commons.provider.RepositoryCapabilitiesData;
-import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData;
import com.sun.xml.ws.developer.StreamingDataHandler;
/**
* Contains converter methods.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
public final class Converter {
@@ -243,12 +244,12 @@ public final class Converter {
/**
* Converts a repository info object.
*/
- public static RepositoryInfoData convert(CmisRepositoryInfoType repositoryInfo) {
+ public static RepositoryInfo convert(CmisRepositoryInfoType repositoryInfo) {
if (repositoryInfo == null) {
return null;
}
- RepositoryInfoDataImpl result = new RepositoryInfoDataImpl();
+ RepositoryInfoImpl result = new RepositoryInfoImpl();
result.setAclCapabilities(convert(repositoryInfo.getAclCapability()));
result.setChangesIncomplete(repositoryInfo.isChangesIncomplete());
@@ -280,7 +281,7 @@ public final class Converter {
/**
* Converts a repository capability object.
*/
- public static RepositoryCapabilitiesData convert(CmisRepositoryCapabilitiesType capabilities) {
+ public static RepositoryCapabilities convert(CmisRepositoryCapabilitiesType capabilities) {
if (capabilities == null) {
return null;
}
@@ -295,7 +296,7 @@ public final class Converter {
capabilities.getCapabilityContentStreamUpdatability()));
result.setCapabilityJoin(convert(CapabilityJoin.class, capabilities.getCapabilityJoin()));
result.setCapabilityQuery(convert(CapabilityQuery.class, capabilities.getCapabilityQuery()));
- result.setCapabilityRendition(convert(CapabilityRendition.class, capabilities
+ result.setCapabilityRendition(convert(CapabilityRenditions.class, capabilities
.getCapabilityRenditions()));
result.setIsPwcSearchable(capabilities.isCapabilityPWCSearchable());
result.setIsPwcUpdatable(capabilities.isCapabilityPWCUpdatable());
@@ -314,7 +315,7 @@ public final class Converter {
/**
* Converts a ACL capability object.
*/
- public static AclCapabilitiesData convert(CmisACLCapabilityType aclCapabilities) {
+ public static AclCapabilities convert(CmisACLCapabilityType aclCapabilities) {
if (aclCapabilities == null) {
return null;
}
@@ -326,7 +327,7 @@ public final class Converter {
result.setAclPropagation(convert(AclPropagation.class, aclCapabilities.getPropagation()));
- List<PermissionDefinitionData> permissionDefinitionList = new ArrayList<PermissionDefinitionData>();
+ List<PermissionDefinition> permissionDefinitionList = new ArrayList<PermissionDefinition>();
for (CmisPermissionDefinition permDef : aclCapabilities.getPermissions()) {
PermissionDefinitionDataImpl permDefData = new PermissionDefinitionDataImpl();
permDefData.setPermission(permDef.getPermission());
@@ -337,15 +338,15 @@ public final class Converter {
}
result.setPermissionDefinitionData(permissionDefinitionList);
- List<PermissionMappingData> permissionMapping = new ArrayList<PermissionMappingData>();
+ Map<String, PermissionMapping> permissionMapping = new LinkedHashMap<String, PermissionMapping>();
for (CmisPermissionMapping permMapping : aclCapabilities.getMapping()) {
if (permMapping.getKey() != null) {
PermissionMappingDataImpl permMappingData = new PermissionMappingDataImpl();
- permMappingData.setKey(permMapping.getKey().value());
+ String key = permMapping.getKey().value();
+ permMappingData.setKey(key);
permMappingData.setPermissions(permMapping.getPermission());
convertExtension(permMapping, permMappingData);
-
- permissionMapping.add(permMappingData);
+ permissionMapping.put(key, permMappingData);
}
}
result.setPermissionMappingData(permissionMapping);
@@ -359,7 +360,7 @@ public final class Converter {
/**
* Converts a repository info object.
*/
- public static CmisRepositoryInfoType convert(RepositoryInfoData repositoryInfo) {
+ public static CmisRepositoryInfoType convert(RepositoryInfo repositoryInfo) {
if (repositoryInfo == null) {
return null;
}
@@ -367,17 +368,17 @@ public final class Converter {
CmisRepositoryInfoType result = new CmisRepositoryInfoType();
result.setAclCapability(convert(repositoryInfo.getAclCapabilities()));
- result.setCapabilities(convert(repositoryInfo.getRepositoryCapabilities()));
- result.setChangesIncomplete(repositoryInfo.changesIncomplete());
+ result.setCapabilities(convert(repositoryInfo.getCapabilities()));
+ result.setChangesIncomplete(repositoryInfo.getChangesIncomplete());
result.setCmisVersionSupported(repositoryInfo.getCmisVersionSupported());
result.setLatestChangeLogToken(repositoryInfo.getLatestChangeLogToken());
- result.setPrincipalAnonymous(repositoryInfo.getPrincipalAnonymous());
- result.setPrincipalAnyone(repositoryInfo.getPrincipalAnyone());
+ result.setPrincipalAnonymous(repositoryInfo.getPrincipalIdAnonymous());
+ result.setPrincipalAnyone(repositoryInfo.getPrincipalIdAnyone());
result.setProductName(repositoryInfo.getProductName());
result.setProductVersion(repositoryInfo.getProductVersion());
- result.setRepositoryDescription(repositoryInfo.getRepositoryDescription());
- result.setRepositoryId(repositoryInfo.getRepositoryId());
- result.setRepositoryName(repositoryInfo.getRepositoryName());
+ result.setRepositoryDescription(repositoryInfo.getDescription());
+ result.setRepositoryId(repositoryInfo.getId());
+ result.setRepositoryName(repositoryInfo.getName());
result.setRootFolderId(repositoryInfo.getRootFolderId());
result.setThinClientURI(repositoryInfo.getThinClientUri());
result.setVendorName(repositoryInfo.getVendorName());
@@ -397,31 +398,31 @@ public final class Converter {
/**
* Converts a repository capability object.
*/
- public static CmisRepositoryCapabilitiesType convert(RepositoryCapabilitiesData capabilities) {
+ public static CmisRepositoryCapabilitiesType convert(RepositoryCapabilities capabilities) {
if (capabilities == null) {
return null;
}
CmisRepositoryCapabilitiesType result = new CmisRepositoryCapabilitiesType();
- result.setCapabilityACL(convert(EnumCapabilityACL.class, capabilities.getCapabilityAcl()));
- result.setCapabilityAllVersionsSearchable(capabilities.allVersionsSearchable());
+ result.setCapabilityACL(convert(EnumCapabilityACL.class, capabilities.getAclCapability()));
+ result.setCapabilityAllVersionsSearchable(capabilities.isAllVersionsSearchableSupported());
result.setCapabilityChanges(convert(EnumCapabilityChanges.class, capabilities
- .getCapabilityChanges()));
+ .getChangesCapability()));
result.setCapabilityContentStreamUpdatability(convert(EnumCapabilityContentStreamUpdates.class,
- capabilities.getCapabilityContentStreamUpdatability()));
- result.setCapabilityGetDescendants(capabilities.supportsGetDescendants());
- result.setCapabilityGetFolderTree(capabilities.supportsGetFolderTree());
- result.setCapabilityJoin(convert(EnumCapabilityJoin.class, capabilities.getCapabilityJoin()));
- result.setCapabilityMultifiling(capabilities.supportsMultifiling());
- result.setCapabilityPWCSearchable(capabilities.isPwcSearchable());
- result.setCapabilityPWCUpdatable(capabilities.isPwcUpdatable());
+ capabilities.getContentStreamUpdatesCapability()));
+ result.setCapabilityGetDescendants(capabilities.isGetDescendantsSupported());
+ result.setCapabilityGetFolderTree(capabilities.isGetFolderTreeSupported());
+ result.setCapabilityJoin(convert(EnumCapabilityJoin.class, capabilities.getJoinCapability()));
+ result.setCapabilityMultifiling(capabilities.isMultifilingSupported());
+ result.setCapabilityPWCSearchable(capabilities.isPwcSearchableSupported());
+ result.setCapabilityPWCUpdatable(capabilities.isPwcUpdatableSupported());
result
- .setCapabilityQuery(convert(EnumCapabilityQuery.class, capabilities.getCapabilityQuery()));
+ .setCapabilityQuery(convert(EnumCapabilityQuery.class, capabilities.getQueryCapability()));
result.setCapabilityRenditions(convert(EnumCapabilityRendition.class, capabilities
- .getCapabilityRenditions()));
- result.setCapabilityUnfiling(capabilities.supportsUnfiling());
- result.setCapabilityVersionSpecificFiling(capabilities.supportsVersionSpecificFiling());
+ .getRenditionsCapability()));
+ result.setCapabilityUnfiling(capabilities.isUnfilingSupported());
+ result.setCapabilityVersionSpecificFiling(capabilities.isVersionSpecificFilingSupported());
// handle extensions
convertExtension(capabilities, result);
@@ -432,7 +433,7 @@ public final class Converter {
/**
* Converts a ACL capability object.
*/
- public static CmisACLCapabilityType convert(AclCapabilitiesData aclCapabilities) {
+ public static CmisACLCapabilityType convert(AclCapabilities aclCapabilities) {
if (aclCapabilities == null) {
return null;
}
@@ -444,19 +445,19 @@ public final class Converter {
result.setPropagation(convert(EnumACLPropagation.class, aclCapabilities.getAclPropagation()));
- if (aclCapabilities.getPermissionDefinitionData() != null) {
- for (PermissionDefinitionData pdd : aclCapabilities.getPermissionDefinitionData()) {
+ if (aclCapabilities.getPermissions() != null) {
+ for (PermissionDefinition pdd : aclCapabilities.getPermissions()) {
CmisPermissionDefinition permDef = new CmisPermissionDefinition();
permDef.setDescription(pdd.getDescription());
- permDef.setPermission(pdd.getPermission());
+ permDef.setPermission(pdd.getId());
convertExtension(pdd, permDef);
result.getPermissions().add(permDef);
}
}
- if (aclCapabilities.getPermissionMappingData() != null) {
- for (PermissionMappingData pmd : aclCapabilities.getPermissionMappingData()) {
+ if (aclCapabilities.getPermissionMapping() != null) {
+ for (PermissionMapping pmd : aclCapabilities.getPermissionMapping().values()) {
CmisPermissionMapping permMap = new CmisPermissionMapping();
permMap.setKey(EnumAllowableActionsKey.fromValue(pmd.getKey()));
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.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/AbstractPropertyData.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AbstractPropertyData.java Thu Apr 15 14:05:36 2010
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PropertyData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
/**
* Abstract property data implementation.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.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/AccessControlEntryImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlEntryImpl.java Thu Apr 15 14:05:36 2010
@@ -20,8 +20,8 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlPrincipalData;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlPrincipalData;
/**
* Access Control Entry data implementation.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.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/AccessControlListImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlListImpl.java Thu Apr 15 14:05:36 2010
@@ -20,8 +20,8 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
/**
* Access control list data implementation.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.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/AccessControlPrincipalDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AccessControlPrincipalDataImpl.java Thu Apr 15 14:05:36 2010
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.commons.impl.dataobjects;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlPrincipalData;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlPrincipalData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.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/AclCapabilitiesDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AclCapabilitiesDataImpl.java Thu Apr 15 14:05:36 2010
@@ -19,29 +19,30 @@
package org.apache.chemistry.opencmis.commons.impl.dataobjects;
import java.util.List;
+import java.util.Map;
+import org.apache.chemistry.opencmis.commons.bindings.AclCapabilities;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionDefinition;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionMapping;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.SupportedPermissions;
-import org.apache.chemistry.opencmis.commons.provider.AclCapabilitiesData;
-import org.apache.chemistry.opencmis.commons.provider.PermissionDefinitionData;
-import org.apache.chemistry.opencmis.commons.provider.PermissionMappingData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
-public class AclCapabilitiesDataImpl extends AbstractExtensionData implements AclCapabilitiesData {
+public class AclCapabilitiesDataImpl extends AbstractExtensionData implements AclCapabilities {
private static final long serialVersionUID = 1L;
private SupportedPermissions fSupportedPermissions;
private AclPropagation fACLPropagation;
- private List<PermissionMappingData> fPermissionMappingList;
- private List<PermissionDefinitionData> fPermissionDefinitionList;
+ private Map<String, PermissionMapping> permissionMapping;
+ private List<PermissionDefinition> fPermissionDefinitionList;
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ACLCapabilitiesData#getACLPropagation()
*/
public SupportedPermissions getSupportedPermissions() {
@@ -54,7 +55,7 @@ public class AclCapabilitiesDataImpl ext
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ACLCapabilitiesData#getACLPropagation()
*/
public AclPropagation getAclPropagation() {
@@ -67,39 +68,39 @@ public class AclCapabilitiesDataImpl ext
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ACLCapabilitiesData#getPermissionMappingData()
*/
- public List<PermissionMappingData> getPermissionMappingData() {
- return fPermissionMappingList;
+ public Map<String, PermissionMapping> getPermissionMapping() {
+ return permissionMapping;
}
- public void setPermissionMappingData(List<PermissionMappingData> permissionMappingList) {
- fPermissionMappingList = permissionMappingList;
+ public void setPermissionMappingData(Map<String, PermissionMapping> permissionMapping) {
+ this.permissionMapping = permissionMapping;
}
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.opencmis.client.provider.ACLCapabilitiesData#getPermissionDefinitionData()
*/
- public List<PermissionDefinitionData> getPermissionDefinitionData() {
+ public List<PermissionDefinition> getPermissions() {
return fPermissionDefinitionList;
}
- public void setPermissionDefinitionData(List<PermissionDefinitionData> permissionDefinitionList) {
+ public void setPermissionDefinitionData(List<PermissionDefinition> permissionDefinitionList) {
fPermissionDefinitionList = permissionDefinitionList;
}
/*
* (non-Javadoc)
- *
+ *
* @see java.lang.Object#toString()
*/
@Override
public String toString() {
return "ACL Capabilities [ACL propagation=" + fACLPropagation + ", permission definition list="
- + fPermissionDefinitionList + ", permission mappings=" + fPermissionMappingList + "]"
+ + fPermissionDefinitionList + ", permission mappings=" + permissionMapping + "]"
+ super.toString();
}
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.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/AllowableActionsDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/AllowableActionsDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.Map;
-import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.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/BindingsObjectFactoryImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/BindingsObjectFactoryImpl.java Thu Apr 15 14:05:36 2010
@@ -25,20 +25,20 @@ import java.math.BigInteger;
import java.util.GregorianCalendar;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlEntry;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlList;
-import org.apache.chemistry.opencmis.commons.provider.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.provider.ContentStreamData;
-import org.apache.chemistry.opencmis.commons.provider.PropertiesData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyBooleanData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyDateTimeData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyDecimalData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyHtmlData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyIdData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyIntegerData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyStringData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyUriData;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlEntry;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyDateTimeData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyDecimalData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyHtmlData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyIdData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyIntegerData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyUriData;
/**
* CMIS binding object factory implementation.
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=934417&r1=934416&r2=934417&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 Thu Apr 15 14:05:36 2010
@@ -20,8 +20,8 @@ package org.apache.chemistry.opencmis.co
import java.util.GregorianCalendar;
+import org.apache.chemistry.opencmis.commons.bindings.ChangeEventInfoData;
import org.apache.chemistry.opencmis.commons.enums.TypeOfChanges;
-import org.apache.chemistry.opencmis.commons.provider.ChangeEventInfoData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.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/ContentStreamDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ContentStreamDataImpl.java Thu Apr 15 14:05:36 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.co
import java.io.InputStream;
import java.math.BigInteger;
-import org.apache.chemistry.opencmis.commons.provider.ContentStreamData;
+import org.apache.chemistry.opencmis.commons.bindings.ContentStreamData;
/**
* Content stream data implementation.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.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/FailedToDeleteDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/FailedToDeleteDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.FailedToDeleteData;
+import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
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=934417&r1=934416&r2=934417&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 Thu Apr 15 14:05:36 2010
@@ -21,15 +21,15 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
+import org.apache.chemistry.opencmis.commons.bindings.ChangeEventInfoData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.bindings.PolicyIdListData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlList;
-import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData;
-import org.apache.chemistry.opencmis.commons.provider.ChangeEventInfoData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
-import org.apache.chemistry.opencmis.commons.provider.PolicyIdListData;
-import org.apache.chemistry.opencmis.commons.provider.PropertiesData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyData;
-import org.apache.chemistry.opencmis.commons.provider.RenditionData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.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/ObjectInFolderContainerImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderContainerImpl.java Thu Apr 15 14:05:36 2010
@@ -20,8 +20,8 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderContainer;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.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/ObjectInFolderDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderDataImpl.java Thu Apr 15 14:05:36 2010
@@ -18,8 +18,8 @@
*/
package org.apache.chemistry.opencmis.commons.impl.dataobjects;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.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/ObjectInFolderListImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectInFolderListImpl.java Thu Apr 15 14:05:36 2010
@@ -21,8 +21,8 @@ package org.apache.chemistry.opencmis.co
import java.math.BigInteger;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.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/ObjectListImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectListImpl.java Thu Apr 15 14:05:36 2010
@@ -21,8 +21,8 @@ package org.apache.chemistry.opencmis.co
import java.math.BigInteger;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectList;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.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/ObjectParentDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/ObjectParentDataImpl.java Thu Apr 15 14:05:36 2010
@@ -18,8 +18,8 @@
*/
package org.apache.chemistry.opencmis.commons.impl.dataobjects;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
-import org.apache.chemistry.opencmis.commons.provider.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.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/PermissionDefinitionDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionDefinitionDataImpl.java Thu Apr 15 14:05:36 2010
@@ -23,7 +23,7 @@ package org.apache.chemistry.opencmis.co
*
*/
public class PermissionDefinitionDataImpl extends AbstractExtensionData implements
- org.apache.chemistry.opencmis.commons.provider.PermissionDefinitionData {
+ org.apache.chemistry.opencmis.commons.bindings.PermissionDefinition {
private static final long serialVersionUID = 1L;
@@ -35,7 +35,7 @@ public class PermissionDefinitionDataImp
*
* @see org.apache.opencmis.client.provider.PermissionDefinitionData#getPermission()
*/
- public String getPermission() {
+ public String getId() {
return fPermission;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionMappingDataImpl.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/PermissionMappingDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionMappingDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/PermissionMappingDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,14 +20,14 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PermissionMappingData;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionMapping;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
*
*/
public class PermissionMappingDataImpl extends AbstractExtensionData implements
- PermissionMappingData {
+ PermissionMapping {
private static final long serialVersionUID = 1L;
Modified: 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/PolicyIdListDataImpl.java?rev=934417&r1=934416&r2=934417&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/PolicyIdListDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PolicyIdListData;
+import org.apache.chemistry.opencmis.commons.bindings.PolicyIdListData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: 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/PropertiesDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertiesDataImpl.java Thu Apr 15 14:05:36 2010
@@ -23,8 +23,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.chemistry.opencmis.commons.provider.PropertiesData;
-import org.apache.chemistry.opencmis.commons.provider.PropertyData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
/**
* Properties data implementation.
Modified: 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/PropertyBooleanDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyBooleanDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PropertyBooleanData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyBooleanData;
/**
* Boolean property data implementation.
Modified: 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/PropertyDateTimeDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyDateTimeDataImpl.java Thu Apr 15 14:05:36 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.provider.PropertyDateTimeData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyDateTimeData;
/**
* DateTime property data implementation.
Modified: 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/PropertyDecimalDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyDecimalDataImpl.java Thu Apr 15 14:05:36 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.provider.PropertyDecimalData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyDecimalData;
/**
* Decimal property data implementation.
Modified: 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/PropertyHtmlDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyHtmlDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PropertyHtmlData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyHtmlData;
/**
* Html property data implementation.
Modified: 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/PropertyIdDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyIdDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PropertyIdData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyIdData;
/**
* Id property data implementation.
Modified: 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/PropertyIntegerDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyIntegerDataImpl.java Thu Apr 15 14:05:36 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.provider.PropertyIntegerData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyIntegerData;
/**
* Integer property data implementation.
Modified: 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/PropertyStringDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyStringDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PropertyStringData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyStringData;
/**
* String property data implementation.
Modified: 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/PropertyUriDataImpl.java?rev=934417&r1=934416&r2=934417&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/PropertyUriDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
-import org.apache.chemistry.opencmis.commons.provider.PropertyUriData;
+import org.apache.chemistry.opencmis.commons.bindings.PropertyUriData;
/**
* Uri property data implementation.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.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/RenditionDataImpl.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RenditionDataImpl.java Thu Apr 15 14:05:36 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.math.BigInteger;
-import org.apache.chemistry.opencmis.commons.provider.RenditionData;
+import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
Modified: 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/RepositoryCapabilitiesDataImpl.java?rev=934417&r1=934416&r2=934417&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/RepositoryCapabilitiesDataImpl.java Thu Apr 15 14:05:36 2010
@@ -18,20 +18,20 @@
*/
package org.apache.chemistry.opencmis.commons.impl.dataobjects;
+import org.apache.chemistry.opencmis.commons.bindings.RepositoryCapabilities;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
-import org.apache.chemistry.opencmis.commons.enums.CapabilityRendition;
-import org.apache.chemistry.opencmis.commons.provider.RepositoryCapabilitiesData;
+import org.apache.chemistry.opencmis.commons.enums.CapabilityRenditions;
/**
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
*
*/
public class RepositoryCapabilitiesDataImpl extends AbstractExtensionData implements
- RepositoryCapabilitiesData {
+ RepositoryCapabilities {
private static final long serialVersionUID = 1L;
@@ -41,7 +41,7 @@ public class RepositoryCapabilitiesDataI
private CapabilityContentStreamUpdates fCapabilityContentStreamUpdates;
private CapabilityJoin fCapabilityJoin;
private CapabilityQuery fCapabilityQuery;
- private CapabilityRendition fCapabilityRendition;
+ private CapabilityRenditions fCapabilityRendition;
private Boolean fIsPwcSearchable;
private Boolean fIsPwcUpdatable;
private Boolean fSupportsGetDescendants;
@@ -61,7 +61,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#allVersionsSearchable()
*/
- public Boolean allVersionsSearchable() {
+ public Boolean isAllVersionsSearchableSupported() {
return fAllVersionsSearchable;
}
@@ -74,7 +74,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#getCapabilityACL()
*/
- public CapabilityAcl getCapabilityAcl() {
+ public CapabilityAcl getAclCapability() {
return fCapabilityAcl;
}
@@ -87,7 +87,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#getCapabilityChanges()
*/
- public CapabilityChanges getCapabilityChanges() {
+ public CapabilityChanges getChangesCapability() {
return fCapabilityChanges;
}
@@ -102,7 +102,7 @@ public class RepositoryCapabilitiesDataI
* org.apache.opencmis.client.provider.RepositoryCapabilitiesData#getCapabilityContentStreamUpdatability
* ()
*/
- public CapabilityContentStreamUpdates getCapabilityContentStreamUpdatability() {
+ public CapabilityContentStreamUpdates getContentStreamUpdatesCapability() {
return fCapabilityContentStreamUpdates;
}
@@ -116,7 +116,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#getCapabilityJoin()
*/
- public CapabilityJoin getCapabilityJoin() {
+ public CapabilityJoin getJoinCapability() {
return fCapabilityJoin;
}
@@ -129,7 +129,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#getCapabilityQuery()
*/
- public CapabilityQuery getCapabilityQuery() {
+ public CapabilityQuery getQueryCapability() {
return fCapabilityQuery;
}
@@ -142,11 +142,11 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#getCapabilityRenditions()
*/
- public CapabilityRendition getCapabilityRenditions() {
+ public CapabilityRenditions getRenditionsCapability() {
return fCapabilityRendition;
}
- public void setCapabilityRendition(CapabilityRendition capabilityRendition) {
+ public void setCapabilityRendition(CapabilityRenditions capabilityRendition) {
fCapabilityRendition = capabilityRendition;
}
@@ -155,7 +155,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#isPwcSearchable()
*/
- public Boolean isPwcSearchable() {
+ public Boolean isPwcSearchableSupported() {
return fIsPwcSearchable;
}
@@ -168,7 +168,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#isPwcUpdatable()
*/
- public Boolean isPwcUpdatable() {
+ public Boolean isPwcUpdatableSupported() {
return fIsPwcUpdatable;
}
@@ -181,7 +181,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#supportsGetDescendants()
*/
- public Boolean supportsGetDescendants() {
+ public Boolean isGetDescendantsSupported() {
return fSupportsGetDescendants;
}
@@ -194,7 +194,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#supportsGetFolderTree()
*/
- public Boolean supportsGetFolderTree() {
+ public Boolean isGetFolderTreeSupported() {
return fSupportsGetFolderTree;
}
@@ -207,7 +207,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#supportsMultifiling()
*/
- public Boolean supportsMultifiling() {
+ public Boolean isMultifilingSupported() {
return fSupportsMultifiling;
}
@@ -220,7 +220,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#supportsUnfiling()
*/
- public Boolean supportsUnfiling() {
+ public Boolean isUnfilingSupported() {
return fSupportsUnfiling;
}
@@ -233,7 +233,7 @@ public class RepositoryCapabilitiesDataI
*
* @see org.apache.opencmis.client.provider.RepositoryCapabilitiesData#supportsVersionSpecificFiling()
*/
- public Boolean supportsVersionSpecificFiling() {
+ public Boolean isVersionSpecificFilingSupported() {
return fSupportsVersionSpecificFiling;
}
Copied: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoImpl.java (from r934373, incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoDataImpl.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/RepositoryInfoImpl.java?p2=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoImpl.java&p1=incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoDataImpl.java&r1=934373&r2=934417&rev=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoDataImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoImpl.java Thu Apr 15 14:05:36 2010
@@ -20,18 +20,18 @@ package org.apache.chemistry.opencmis.co
import java.util.List;
+import org.apache.chemistry.opencmis.commons.bindings.AclCapabilities;
+import org.apache.chemistry.opencmis.commons.bindings.RepositoryCapabilities;
+import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
-import org.apache.chemistry.opencmis.commons.provider.AclCapabilitiesData;
-import org.apache.chemistry.opencmis.commons.provider.RepositoryCapabilitiesData;
-import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData;
/**
* Repository info data implementation.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
-public class RepositoryInfoDataImpl extends AbstractExtensionData implements RepositoryInfoData {
+public class RepositoryInfoImpl extends AbstractExtensionData implements RepositoryInfo {
private static final long serialVersionUID = 1L;
@@ -39,9 +39,9 @@ public class RepositoryInfoDataImpl exte
private String fName;
private String fDescription;
private String fVersionSupported;
- private RepositoryCapabilitiesData fCapabilities;
+ private RepositoryCapabilities fCapabilities;
private String fRootFolderId;
- private AclCapabilitiesData fAclCapabilities;
+ private AclCapabilities fAclCapabilities;
private String fPrincipalAnonymous;
private String fPrincipalAnyone;
private String fThinClientUri;
@@ -55,10 +55,29 @@ public class RepositoryInfoDataImpl exte
/**
* Constructor.
*/
- public RepositoryInfoDataImpl() {
+ public RepositoryInfoImpl() {
}
- public String getRepositoryId() {
+ public RepositoryInfoImpl(RepositoryInfo data) {
+ fId = data.getId();
+ fName = data.getName();
+ fDescription = data.getDescription();
+ fVersionSupported = data.getCmisVersionSupported();
+ fCapabilities = data.getCapabilities();
+ fRootFolderId = data.getRootFolderId();
+ fAclCapabilities = data.getAclCapabilities();
+ fPrincipalAnonymous = data.getPrincipalIdAnonymous();
+ fPrincipalAnyone = data.getPrincipalIdAnyone();
+ fThinClientUri = data.getThinClientUri();
+ fChangesIncomplete = data.getChangesIncomplete();
+ fChangesOnType = data.getChangesOnType();
+ fLatestChangeLogToken = data.getLatestChangeLogToken();
+ fVendorName = data.getVendorName();
+ fProductName = data.getProductName();
+ fProductVersion = data.getProductVersion();
+}
+
+public String getId() {
return fId;
}
@@ -66,7 +85,7 @@ public class RepositoryInfoDataImpl exte
fId = id;
}
- public String getRepositoryName() {
+ public String getName() {
return fName;
}
@@ -74,7 +93,7 @@ public class RepositoryInfoDataImpl exte
fName = name;
}
- public String getRepositoryDescription() {
+ public String getDescription() {
return fDescription;
}
@@ -90,11 +109,11 @@ public class RepositoryInfoDataImpl exte
fVersionSupported = versionSupported;
}
- public RepositoryCapabilitiesData getRepositoryCapabilities() {
+ public RepositoryCapabilities getCapabilities() {
return fCapabilities;
}
- public void setRepositoryCapabilities(RepositoryCapabilitiesData capabilities) {
+ public void setRepositoryCapabilities(RepositoryCapabilities capabilities) {
fCapabilities = capabilities;
}
@@ -106,15 +125,15 @@ public class RepositoryInfoDataImpl exte
fRootFolderId = rootFolderId;
}
- public AclCapabilitiesData getAclCapabilities() {
+ public AclCapabilities getAclCapabilities() {
return fAclCapabilities;
}
- public void setAclCapabilities(AclCapabilitiesData aclCapabilities) {
+ public void setAclCapabilities(AclCapabilities aclCapabilities) {
fAclCapabilities = aclCapabilities;
}
- public String getPrincipalAnonymous() {
+ public String getPrincipalIdAnonymous() {
return fPrincipalAnonymous;
}
@@ -122,7 +141,7 @@ public class RepositoryInfoDataImpl exte
fPrincipalAnonymous = principalAnonymous;
}
- public String getPrincipalAnyone() {
+ public String getPrincipalIdAnyone() {
return fPrincipalAnyone;
}
@@ -138,7 +157,7 @@ public class RepositoryInfoDataImpl exte
fThinClientUri = thinClientUri;
}
- public Boolean changesIncomplete() {
+ public Boolean getChangesIncomplete() {
return fChangesIncomplete;
}
Propchange: incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/main/java/org/apache/chemistry/opencmis/commons/impl/dataobjects/RepositoryInfoImpl.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=934417&r1=934416&r2=934417&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 Thu Apr 15 14:05:36 2010
@@ -25,12 +25,17 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import junit.framework.TestCase;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionDefinition;
+import org.apache.chemistry.opencmis.commons.bindings.PermissionMapping;
+import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
@@ -38,7 +43,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
import org.apache.chemistry.opencmis.commons.enums.CapabilityJoin;
import org.apache.chemistry.opencmis.commons.enums.CapabilityQuery;
-import org.apache.chemistry.opencmis.commons.enums.CapabilityRendition;
+import org.apache.chemistry.opencmis.commons.enums.CapabilityRenditions;
import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed;
import org.apache.chemistry.opencmis.commons.impl.Converter;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.AclCapabilitiesDataImpl;
@@ -47,29 +52,25 @@ import org.apache.chemistry.opencmis.com
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.RepositoryInfoDataImpl;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
-import org.apache.chemistry.opencmis.commons.provider.PermissionDefinitionData;
-import org.apache.chemistry.opencmis.commons.provider.PermissionMappingData;
-import org.apache.chemistry.opencmis.commons.provider.RepositoryInfoData;
+import org.apache.chemistry.opencmis.commons.impl.dataobjects.RepositoryInfoImpl;
/**
* Tests converter methods.
- *
+ *
* @author <a href="mailto:fmueller@opentext.com">Florian Müller</a>
- *
+ *
*/
public class ConverterTest extends TestCase {
public void testRepositoryInfo() throws Exception {
// dry run
- RepositoryInfoDataImpl obj1 = new RepositoryInfoDataImpl();
- RepositoryInfoData obj2 = Converter.convert(Converter.convert(obj1));
+ RepositoryInfoImpl obj1 = new RepositoryInfoImpl();
+ RepositoryInfo obj2 = Converter.convert(Converter.convert(obj1));
assertDataObjectsEquals("RepositoryInfo", obj1, obj2);
// values
- obj1 = new RepositoryInfoDataImpl();
+ obj1 = new RepositoryInfoImpl();
obj1.setChangesIncomplete(Boolean.TRUE);
obj1.setChangesOnType(Collections.singletonList(BaseObjectTypeIds.CMIS_DOCUMENT));
obj1.setCmisVersionSupported("1.0");
@@ -92,7 +93,7 @@ public class ConverterTest extends TestC
cap1.setCapabilityContentStreamUpdates(CapabilityContentStreamUpdates.ANYTIME);
cap1.setCapabilityJoin(CapabilityJoin.INNERANDOUTER);
cap1.setCapabilityQuery(CapabilityQuery.BOTHCOMBINED);
- cap1.setCapabilityRendition(CapabilityRendition.READ);
+ cap1.setCapabilityRendition(CapabilityRenditions.READ);
cap1.setIsPwcSearchable(Boolean.TRUE);
cap1.setIsPwcUpdatable(Boolean.TRUE);
cap1.setSupportsGetDescendants(Boolean.TRUE);
@@ -104,7 +105,7 @@ public class ConverterTest extends TestC
AclCapabilitiesDataImpl acl1 = new AclCapabilitiesDataImpl();
acl1.setAclPropagation(AclPropagation.PROPAGATE);
- List<PermissionDefinitionData> pddList = new ArrayList<PermissionDefinitionData>();
+ List<PermissionDefinition> pddList = new ArrayList<PermissionDefinition>();
PermissionDefinitionDataImpl pdd1 = new PermissionDefinitionDataImpl();
pdd1.setPermission("test:perm1");
pdd1.setDescription("Permission1");
@@ -114,16 +115,16 @@ public class ConverterTest extends TestC
pdd2.setDescription("Permission2");
pddList.add(pdd2);
acl1.setPermissionDefinitionData(pddList);
- List<PermissionMappingData> pmdList = new ArrayList<PermissionMappingData>();
+ Map<String, PermissionMapping> pmd = new LinkedHashMap<String, PermissionMapping>();
PermissionMappingDataImpl pmd1 = new PermissionMappingDataImpl();
- pmd1.setKey(PermissionMappingData.KEY_CAN_CREATE_DOCUMENT_FOLDER);
+ pmd1.setKey(PermissionMapping.CAN_CREATE_DOCUMENT_FOLDER);
pmd1.setPermissions(Arrays.asList(new String[] { "p1", "p2" }));
- pmdList.add(pmd1);
+ pmd.put(pmd1.getKey(), pmd1);
PermissionMappingDataImpl pmd2 = new PermissionMappingDataImpl();
- pmd2.setKey(PermissionMappingData.KEY_CAN_DELETE_OBJECT);
+ pmd2.setKey(PermissionMapping.CAN_DELETE_OBJECT);
pmd2.setPermissions(Arrays.asList(new String[] { "p3", "p4" }));
- pmdList.add(pmd2);
- acl1.setPermissionMappingData(pmdList);
+ pmd.put(pmd2.getKey(), pmd2);
+ acl1.setPermissionMappingData(pmd);
obj1.setAclCapabilities(acl1);
obj2 = Converter.convert(Converter.convert(obj1));
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.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/AclDocument.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclDocument.java Thu Apr 15 14:05:36 2010
@@ -25,9 +25,9 @@ import java.io.OutputStream;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisAccessControlListType;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlList;
/**
* ACL document.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.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/AclService.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AclService.java Thu Apr 15 14:05:36 2010
@@ -28,13 +28,13 @@ import javax.servlet.http.HttpServletRes
import javax.xml.bind.JAXBElement;
import javax.xml.bind.Unmarshaller;
+import org.apache.chemistry.opencmis.commons.bindings.AccessControlList;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.chemistry.opencmis.commons.impl.Constants;
import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisAccessControlListType;
-import org.apache.chemistry.opencmis.commons.provider.AccessControlList;
import org.apache.chemistry.opencmis.server.spi.AbstractServicesFactory;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisAclService;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.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/AllowableActionsDocument.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AllowableActionsDocument.java Thu Apr 15 14:05:36 2010
@@ -25,9 +25,9 @@ import java.io.OutputStream;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
+import org.apache.chemistry.opencmis.commons.bindings.AllowableActionsData;
import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisAllowableActionsType;
-import org.apache.chemistry.opencmis.commons.provider.AllowableActionsData;
/**
* Allowable Actions document.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntry.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/AtomEntry.java?rev=934417&r1=934416&r2=934417&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntry.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomEntry.java Thu Apr 15 14:05:36 2010
@@ -25,11 +25,11 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
+import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
import org.apache.chemistry.opencmis.commons.impl.Constants;
import org.apache.chemistry.opencmis.commons.impl.JaxBHelper;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisObjectType;
import org.apache.chemistry.opencmis.commons.impl.jaxb.CmisTypeDefinitionType;
-import org.apache.chemistry.opencmis.commons.provider.ObjectData;
import org.apache.chemistry.opencmis.server.spi.ObjectInfo;
/**