You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chemistry.apache.org by fg...@apache.org on 2010/04/16 10:52:16 UTC
svn commit: r934714 [8/8] - in /incubator/chemistry/opencmis/trunk:
chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/
chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/or...
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AbstractServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -20,9 +20,9 @@ package org.apache.chemistry.opencmis.se
import java.math.BigInteger;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/AclServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -18,8 +18,8 @@
*/
package org.apache.chemistry.opencmis.server.support;
+import org.apache.chemistry.opencmis.commons.api.Acl;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
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-support/src/main/java/org/apache/chemistry/opencmis/server/support/DiscoveryServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/DiscoveryServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/DiscoveryServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/DiscoveryServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -21,8 +21,8 @@ package org.apache.chemistry.opencmis.se
import java.math.BigInteger;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisDiscoveryService;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MultiFilingServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MultiFilingServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MultiFilingServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/MultiFilingServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -19,7 +19,7 @@
package org.apache.chemistry.opencmis.server.support;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisMultiFilingService;
import org.apache.chemistry.opencmis.server.spi.ObjectInfoHolder;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/NavigationServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/NavigationServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/NavigationServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/NavigationServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -22,11 +22,11 @@ import java.math.BigInteger;
import java.util.List;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderContainer;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderContainer;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisNavigationService;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectInfoHelper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectInfoHelper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectInfoHelper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectInfoHelper.java Fri Apr 16 08:52:10 2010
@@ -27,18 +27,18 @@ import java.util.List;
import java.util.Map;
import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderContainer;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.RenditionData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryCapabilities;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
-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.PropertyData;
-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.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
@@ -127,23 +127,23 @@ public class ObjectInfoHelper
return false;
if (filter.equals("*"))
return true;
- if (!filter.contains(PropertyIds.CMIS_NAME))
+ if (!filter.contains(PropertyIds.NAME))
return false;
- if (!filter.contains(PropertyIds.CMIS_CREATED_BY))
+ if (!filter.contains(PropertyIds.CREATED_BY))
return false;
- if (!filter.contains(PropertyIds.CMIS_CREATION_DATE))
+ if (!filter.contains(PropertyIds.CREATION_DATE))
return false;
- if (!filter.contains(PropertyIds.CMIS_LAST_MODIFICATION_DATE))
+ if (!filter.contains(PropertyIds.LAST_MODIFICATION_DATE))
return false;
- if (!filter.contains(PropertyIds.CMIS_OBJECT_TYPE_ID))
+ if (!filter.contains(PropertyIds.OBJECT_TYPE_ID))
return false;
- if (!filter.contains(PropertyIds.CMIS_BASE_TYPE_ID))
+ if (!filter.contains(PropertyIds.BASE_TYPE_ID))
return false;
- if (!filter.contains(PropertyIds.CMIS_CONTENT_STREAM_FILE_NAME))
+ if (!filter.contains(PropertyIds.CONTENT_STREAM_FILE_NAME))
return false;
- if (!filter.contains(PropertyIds.CMIS_CONTENT_STREAM_MIME_TYPE))
+ if (!filter.contains(PropertyIds.CONTENT_STREAM_MIME_TYPE))
return false;
- if (!filter.contains(PropertyIds.CMIS_CONTENT_STREAM_ID))
+ if (!filter.contains(PropertyIds.CONTENT_STREAM_ID))
return false;
return true;
@@ -196,20 +196,20 @@ public class ObjectInfoHelper
ObjectInfoImpl objInfo = new ObjectInfoImpl();
// Fill all setters:
objInfo.setId(objData.getId());
- objInfo.setName(getStringProperty(properties, PropertyIds.CMIS_NAME));
- objInfo.setCreatedBy(getStringProperty(properties, PropertyIds.CMIS_CREATED_BY));
- objInfo.setCreationDate(getDateProperty(properties, PropertyIds.CMIS_CREATION_DATE));
- objInfo.setLastModificationDate(getDateProperty(properties, PropertyIds.CMIS_LAST_MODIFICATION_DATE));
- objInfo.setTypeId(getStringProperty(properties, PropertyIds.CMIS_OBJECT_TYPE_ID));
- String baseId = getStringProperty(properties, PropertyIds.CMIS_BASE_TYPE_ID);
+ objInfo.setName(getStringProperty(properties, PropertyIds.NAME));
+ objInfo.setCreatedBy(getStringProperty(properties, PropertyIds.CREATED_BY));
+ objInfo.setCreationDate(getDateProperty(properties, PropertyIds.CREATION_DATE));
+ objInfo.setLastModificationDate(getDateProperty(properties, PropertyIds.LAST_MODIFICATION_DATE));
+ objInfo.setTypeId(getStringProperty(properties, PropertyIds.OBJECT_TYPE_ID));
+ String baseId = getStringProperty(properties, PropertyIds.BASE_TYPE_ID);
objInfo.setBaseType(BaseObjectTypeIds.fromValue(baseId));
- boolean isVersioned = getStringProperty(properties, PropertyIds.CMIS_VERSION_SERIES_ID) != null;
+ boolean isVersioned = getStringProperty(properties, PropertyIds.VERSION_SERIES_ID) != null;
// versioning information:
if (isVersioned) {
- objInfo.setIsCurrentVersion(getBooleanProperty(properties, PropertyIds.CMIS_IS_LATEST_VERSION));
- objInfo.setVersionSeriesId(getStringProperty(properties, PropertyIds.CMIS_VERSION_SERIES_ID));
- objInfo.setWorkingCopyId(getStringProperty(properties, PropertyIds.CMIS_VERSION_SERIES_CHECKED_OUT_ID));
+ objInfo.setIsCurrentVersion(getBooleanProperty(properties, PropertyIds.IS_LATEST_VERSION));
+ objInfo.setVersionSeriesId(getStringProperty(properties, PropertyIds.VERSION_SERIES_ID));
+ objInfo.setWorkingCopyId(getStringProperty(properties, PropertyIds.VERSION_SERIES_CHECKED_OUT_ID));
objInfo.setWorkingCopyOriginalId(null);
} else { // unversioned document
objInfo.setIsCurrentVersion (true);
@@ -218,10 +218,10 @@ public class ObjectInfoHelper
objInfo.setWorkingCopyOriginalId(null);
}
- String fileName = getStringProperty(properties, PropertyIds.CMIS_CONTENT_STREAM_FILE_NAME);
- String mimeType = getStringProperty(properties, PropertyIds.CMIS_CONTENT_STREAM_MIME_TYPE);
- String streamId = getStringProperty(properties, PropertyIds.CMIS_CONTENT_STREAM_ID);
- BigInteger length = getIntegerProperty(properties, PropertyIds.CMIS_CONTENT_STREAM_LENGTH);
+ String fileName = getStringProperty(properties, PropertyIds.CONTENT_STREAM_FILE_NAME);
+ String mimeType = getStringProperty(properties, PropertyIds.CONTENT_STREAM_MIME_TYPE);
+ String streamId = getStringProperty(properties, PropertyIds.CONTENT_STREAM_ID);
+ BigInteger length = getIntegerProperty(properties, PropertyIds.CONTENT_STREAM_LENGTH);
boolean hasContent = fileName != null || mimeType != null || streamId != null || length != null;
if (hasContent) {
objInfo.setHasContent(hasContent);
@@ -234,7 +234,7 @@ public class ObjectInfoHelper
}
if (objInfo.getBaseType() == BaseObjectTypeIds.CMIS_FOLDER)
- objInfo.setHasParent(getStringProperty(properties, PropertyIds.CMIS_PARENT_ID) != null);
+ objInfo.setHasParent(getStringProperty(properties, PropertyIds.PARENT_ID) != null);
else if (objInfo.getBaseType() == BaseObjectTypeIds.CMIS_DOCUMENT) {
if (repoCaps.isUnfilingSupported())
objInfo.setHasParent(documentHasParent(context, repositoryId, objData.getId()));
@@ -259,7 +259,7 @@ public class ObjectInfoHelper
objInfo.setHasAcl(repoCaps.getAclCapability() != CapabilityAcl.NONE);
- String baseTypeId = getStringProperty(properties, PropertyIds.CMIS_BASE_TYPE_ID);
+ String baseTypeId = getStringProperty(properties, PropertyIds.BASE_TYPE_ID);
boolean isFolder = baseTypeId != null && baseTypeId.equals(BaseObjectTypeIds.CMIS_FOLDER.value());
objInfo.setSupportsDescendants(isFolder && repoCaps.isGetDescendantsSupported());;
@@ -485,9 +485,9 @@ public class ObjectInfoHelper
String objectId = objData.getId();
for (ObjectData rel : objData.getRelationships()) {
- String relId = getStringProperty(rel.getProperties().getProperties(), PropertyIds.CMIS_OBJECT_ID);
- String sourceId = getStringProperty(rel.getProperties().getProperties(), PropertyIds.CMIS_SOURCE_ID);
- String targetId = getStringProperty(rel.getProperties().getProperties(), PropertyIds.CMIS_TARGET_ID);
+ String relId = getStringProperty(rel.getProperties().getProperties(), PropertyIds.OBJECT_ID);
+ String sourceId = getStringProperty(rel.getProperties().getProperties(), PropertyIds.SOURCE_ID);
+ String targetId = getStringProperty(rel.getProperties().getProperties(), PropertyIds.TARGET_ID);
if (objectId.equals(sourceId))
sourceIds.add(relId);
if (objectId.equals(targetId))
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/ObjectServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -21,15 +21,15 @@ package org.apache.chemistry.opencmis.se
import java.math.BigInteger;
import java.util.List;
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.AllowableActions;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.AllowableActions;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.FailedToDeleteData;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.RenditionData;
+import org.apache.chemistry.opencmis.commons.api.FailedToDeleteData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.RenditionData;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/PolicyServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/PolicyServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/PolicyServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/PolicyServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se
import java.util.List;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisPolicyService;
import org.apache.chemistry.opencmis.server.spi.ObjectInfoHolder;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RelationshipServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RelationshipServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RelationshipServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RelationshipServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se
import java.math.BigInteger;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectList;
+import org.apache.chemistry.opencmis.commons.api.ObjectList;
import org.apache.chemistry.opencmis.commons.enums.RelationshipDirection;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisRelationshipService;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RepositoryServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RepositoryServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RepositoryServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/RepositoryServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -22,10 +22,10 @@ import java.math.BigInteger;
import java.util.List;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisRepositoryService;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-support/src/main/java/org/apache/chemistry/opencmis/server/support/VersioningServiceWrapper.java Fri Apr 16 08:52:10 2010
@@ -20,12 +20,12 @@ package org.apache.chemistry.opencmis.se
import java.util.List;
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.Holder;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.Holder;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.server.spi.CallContext;
import org.apache.chemistry.opencmis.server.spi.CmisVersioningService;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/SessionFactory.java Fri Apr 16 08:52:10 2010
@@ -25,7 +25,7 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.Session;
import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory;
import org.apache.chemistry.opencmis.commons.SessionParameter;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
import org.apache.chemistry.opencmis.commons.enums.BindingType;
/**
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractBindingIT.java Fri Apr 16 08:52:10 2010
@@ -24,10 +24,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
import org.junit.AfterClass;
import org.junit.Before;
@@ -112,9 +112,9 @@ public abstract class AbstractBindingIT
// set up properties
List<PropertyData<?>> propertyList = new ArrayList<PropertyData<?>>();
propertyList.add(getBinding().getObjectFactory().createPropertyStringData(
- PropertyIds.CMIS_NAME, "provider-tests-" + System.currentTimeMillis()));
+ PropertyIds.NAME, "provider-tests-" + System.currentTimeMillis()));
propertyList.add(getBinding().getObjectFactory().createPropertyIdData(
- PropertyIds.CMIS_OBJECT_TYPE_ID, FOLDER_TYPE));
+ PropertyIds.OBJECT_TYPE_ID, FOLDER_TYPE));
PropertiesData properties = getBinding().getObjectFactory().createPropertiesData(propertyList);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AbstractSimpleBindingIT.java Fri Apr 16 08:52:10 2010
@@ -27,11 +27,11 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+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.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.junit.Test;
@@ -62,9 +62,9 @@ public abstract class AbstractSimpleBind
// set up properties
List<PropertyData<?>> propertyList = new ArrayList<PropertyData<?>>();
propertyList.add(getBinding().getObjectFactory().createPropertyStringData(
- PropertyIds.CMIS_NAME, "testdoc.txt"));
+ PropertyIds.NAME, "testdoc.txt"));
propertyList.add(getBinding().getObjectFactory().createPropertyIdData(
- PropertyIds.CMIS_OBJECT_TYPE_ID, DOCUMENT_TYPE));
+ PropertyIds.OBJECT_TYPE_ID, DOCUMENT_TYPE));
PropertiesData properties = getBinding().getObjectFactory().createPropertiesData(propertyList);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AtomPubSimpleBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AtomPubSimpleBindingIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AtomPubSimpleBindingIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/AtomPubSimpleBindingIT.java Fri Apr 16 08:52:10 2010
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.fit.bindings;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
import org.apache.chemistry.opencmis.fit.SessionFactory;
/**
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/WebServicesSimpleBindingIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/WebServicesSimpleBindingIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/WebServicesSimpleBindingIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/bindings/WebServicesSimpleBindingIT.java Fri Apr 16 08:52:10 2010
@@ -18,7 +18,7 @@
*/
package org.apache.chemistry.opencmis.fit.bindings;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
import org.apache.chemistry.opencmis.fit.SessionFactory;
/**
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/FixtureSetup.java Fri Apr 16 08:52:10 2010
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.SessionParameter;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
import org.apache.chemistry.opencmis.util.repository.ObjectGenerator;
import org.junit.Assert;
@@ -77,9 +77,9 @@ public class FixtureSetup {
// create test root folder
List<PropertyData<?>> propList = new ArrayList<PropertyData<?>>();
propList.add(this.binding.getObjectFactory().createPropertyStringData(
- PropertyIds.CMIS_NAME, Fixture.TEST_ROOT_FOLDER_NAME));
+ PropertyIds.NAME, Fixture.TEST_ROOT_FOLDER_NAME));
propList.add(this.binding.getObjectFactory().createPropertyIdData(
- PropertyIds.CMIS_OBJECT_TYPE_ID, folderTypeId));
+ PropertyIds.OBJECT_TYPE_ID, folderTypeId));
PropertiesData properties = this.binding.getObjectFactory()
.createPropertiesData(propList);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyAclCapabilityIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyAclCapabilityIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyAclCapabilityIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyAclCapabilityIT.java Fri Apr 16 08:52:10 2010
@@ -20,10 +20,10 @@ package org.apache.chemistry.opencmis.fi
import java.util.List;
-import org.apache.chemistry.opencmis.commons.bindings.AclCapabilities;
-import org.apache.chemistry.opencmis.commons.bindings.PermissionMapping;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryCapabilities;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.AclCapabilities;
+import org.apache.chemistry.opencmis.commons.api.PermissionMapping;
+import org.apache.chemistry.opencmis.commons.api.RepositoryCapabilities;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.junit.Assert;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyContentStreamIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyContentStreamIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyContentStreamIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyContentStreamIT.java Fri Apr 16 08:52:10 2010
@@ -25,7 +25,7 @@ import java.io.InputStream;
import junit.framework.Assert;
import org.apache.chemistry.opencmis.client.api.Document;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
import org.junit.Test;
public class ReadOnlyContentStreamIT extends AbstractSessionTest {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyObjectIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyObjectIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyObjectIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyObjectIT.java Fri Apr 16 08:52:10 2010
@@ -30,8 +30,8 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.Folder;
import org.apache.chemistry.opencmis.client.api.Property;
import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
+import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.SessionParameter;
-import org.apache.chemistry.opencmis.commons.enums.CmisProperties;
import org.apache.chemistry.opencmis.commons.enums.PropertyType;
import org.junit.Test;
@@ -40,254 +40,253 @@ import org.junit.Test;
*/
public class ReadOnlyObjectIT extends AbstractSessionTest {
- @Test
- public void verifyRoot() {
- Folder root = this.session.getRootFolder();
- Assert.assertNotNull(root);
-
- root.getName();
- Assert.assertNotNull(root.getId());
- Assert.assertNull(root.getFolderParent());
- Assert.assertNotNull(root.getType());
- Assert.assertEquals(FixtureData.FOLDER_TYPE_ID.toString(), root
- .getType().getId());
- }
-
- @Test
- public void readTestFolder() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME;
- Folder folder = (Folder) this.session.getObjectByPath(path);
- Assert.assertNotNull("folder not found: " + path, folder);
-
- Assert.assertEquals(Fixture.TEST_ROOT_FOLDER_NAME, folder.getName());
- Assert.assertNotNull(folder.getId());
- Assert.assertNotNull(folder.getFolderParent());
- Assert.assertNotNull(folder.getType());
- Assert.assertEquals(FixtureData.FOLDER_TYPE_ID.toString(), folder
- .getType().getId());
- Assert.assertNotNull(folder.getBaseType());
- Assert.assertEquals(ObjectType.FOLDER_BASETYPE_ID, folder.getBaseType()
- .getId());
-
- Assert.assertNotNull(folder.getCreatedBy());
- Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
- folder.getCreatedBy());
- Assert.assertNotNull(folder.getLastModifiedBy());
- Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
- folder.getLastModifiedBy());
- Assert.assertNotNull(folder.getLastModificationDate());
- Assert.assertNotNull(folder.getCreationDate());
-
- }
-
- @Test
- public void readTestDocument() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
- + FixtureData.DOCUMENT1_NAME;
- Document document = (Document) this.session.getObjectByPath(path);
- Assert.assertNotNull("document not found: " + path, document);
-
- Assert.assertNotNull(document.getId());
- Assert.assertNotNull(document.getBaseType());
- Assert.assertEquals(ObjectType.DOCUMENT_BASETYPE_ID, document
- .getBaseType().getId());
- Assert.assertEquals(FixtureData.DOCUMENT1_NAME.toString(), document
- .getName());
- Assert.assertNotNull(document.getType());
- Assert.assertEquals(FixtureData.DOCUMENT_TYPE_ID.toString(), document
- .getType().getId());
- }
-
- public void readDocumentDefaultProperties() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
- + FixtureData.DOCUMENT1_NAME;
- Document document = (Document) this.session.getObjectByPath(path);
- Assert.assertNotNull("document not found: " + path, document);
-
- Assert.assertNotNull(document.getCreatedBy());
- Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
- document.getCreatedBy());
- Assert.assertNotNull(document.getLastModifiedBy());
- Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
- document.getLastModifiedBy());
- Assert.assertNotNull(document.getLastModificationDate());
- Assert.assertNotNull(document.getCreationDate());
- }
-
- @Test
- public void readDocumentPropertiesWithFilter() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
- + FixtureData.DOCUMENT1_NAME;
- Document document = (Document) this.session.getObjectByPath(path);
- Assert.assertNotNull("document not found: " + path, document);
-
- List<Property<?>> l = document.getProperties();
- Assert.assertNotNull(l);
- Assert.assertEquals(false, l.isEmpty());
- Iterator<Property<?>> i = l.iterator();
- while (i.hasNext()) {
- Property<?> p = i.next();
- Object value = p.getValue();
- PropertyType t = p.getType();
-
- Assert.assertNotNull(p);
- Assert.assertNotNull(t);
-
- switch (t) {
- case INTEGER:
- BigInteger n = (BigInteger) value;
- Assert.assertNotNull(n);
- break;
- case STRING:
- // String s = (String) value;
- // can be null Assert.assertNotNull(s);
- break;
- case BOOLEAN:
- Boolean b = (Boolean) value;
- Assert.assertNotNull(b);
- break;
- case DATETIME:
- Calendar c = (Calendar) value;
- Assert.assertNotNull(c);
- break;
- case DECIMAL:
- Number num = (Number) value;
- if (num instanceof Double) {
- Double d = (Double) num;
- Assert.assertNotNull(d);
- } else if (num instanceof Float) {
- Float f = (Float) num;
- Assert.assertNotNull(f);
- } else {
- Assert.fail("Number not supported: " + num.toString());
- }
- break;
- case HTML:
- String html = (String) value;
- Assert.assertNotNull(html);
- break;
- case ID:
- // String id = (String) value;
- // can be null Assert.assertNotNull(id);
- break;
- case URI:
- URI uri = (URI) value;
- Assert.assertNotNull(uri);
- break;
- default:
- Assert.fail("PropertyType not supported: " + t);
- }
- }
-
- }
-
- @Test
- public void readDocumentProperties() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
- + FixtureData.DOCUMENT1_NAME;
- Document document = (Document) this.session.getObjectByPath(path);
- Assert.assertNotNull("document not found: " + path, document);
-
- List<Property<?>> l = document.getProperties();
- Assert.assertNotNull(l);
- Assert.assertEquals(false, l.isEmpty());
- Iterator<Property<?>> i = l.iterator();
- while (i.hasNext()) {
- Property<?> p = i.next();
- Object value = p.getValue();
- PropertyType t = p.getType();
-
- Assert.assertNotNull(p);
- Assert.assertNotNull(t);
-
- switch (t) {
- case INTEGER:
- BigInteger n = (BigInteger) value;
- Assert.assertNotNull(n);
- break;
- case STRING:
- // String s = (String) value;
- // can be null Assert.assertNotNull(s);
- break;
- case BOOLEAN:
- Boolean b = (Boolean) value;
- Assert.assertNotNull(b);
- break;
- case DATETIME:
- Calendar c = (Calendar) value;
- Assert.assertNotNull(c);
- break;
- case DECIMAL:
- Number num = (Number) value;
- if (num instanceof Double) {
- Double d = (Double) num;
- Assert.assertNotNull(d);
- } else if (num instanceof Float) {
- Float f = (Float) num;
- Assert.assertNotNull(f);
- } else {
- Assert.fail("Number not supported: " + num.toString());
- }
- break;
- case HTML:
- String html = (String) value;
- Assert.assertNotNull(html);
- break;
- case ID:
- // String id = (String) value;
- // can be null Assert.assertNotNull(id);
- break;
- case URI:
- URI uri = (URI) value;
- Assert.assertNotNull(uri);
- break;
- default:
- Assert.fail("PropertyType not supported: " + t);
- }
- }
- }
-
- @Test
- public void readSingleProperty() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
- + FixtureData.DOCUMENT1_NAME;
- Document document = (Document) this.session.getObjectByPath(path);
- Assert.assertNotNull("document not found: " + path, document);
-
- Property<String> p = document.getProperty(CmisProperties.OBJECT_ID
- .value());
- Assert.assertNotNull(p);
- String v1 = p.getValue();
- Assert.assertNotNull(v1);
-
- String v2 = document.getPropertyValue(CmisProperties.OBJECT_ID.value());
- Assert.assertNotNull(v2);
- Assert.assertEquals(v1, v2);
-
- }
-
- @Test
- public void readMultiValueProperty() {
- String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
- + FixtureData.DOCUMENT1_NAME;
- Document document = (Document) this.session.getObjectByPath(path);
- Assert.assertNotNull("document not found: " + path, document);
-
- Property<String> p = document
- .getProperty(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
- .toString());
- if (p != null) {
- Assert.assertTrue(p.isMultiValued());
- List<String> v1 = p.getValues();
- Assert.assertNotNull(v1);
- Assert.assertFalse(v1.isEmpty());
-
- List<String> v2 = document
- .getPropertyMultivalue(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
- .toString());
- Assert.assertNotNull(v2);
- Assert.assertFalse(v2.isEmpty());
- Assert.assertEquals(v1, v2);
- }
- }
+ @Test
+ public void verifyRoot() {
+ Folder root = this.session.getRootFolder();
+ Assert.assertNotNull(root);
+
+ root.getName();
+ Assert.assertNotNull(root.getId());
+ Assert.assertNull(root.getFolderParent());
+ Assert.assertNotNull(root.getType());
+ Assert.assertEquals(FixtureData.FOLDER_TYPE_ID.toString(), root
+ .getType().getId());
+ }
+
+ @Test
+ public void readTestFolder() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME;
+ Folder folder = (Folder) this.session.getObjectByPath(path);
+ Assert.assertNotNull("folder not found: " + path, folder);
+
+ Assert.assertEquals(Fixture.TEST_ROOT_FOLDER_NAME, folder.getName());
+ Assert.assertNotNull(folder.getId());
+ Assert.assertNotNull(folder.getFolderParent());
+ Assert.assertNotNull(folder.getType());
+ Assert.assertEquals(FixtureData.FOLDER_TYPE_ID.toString(), folder
+ .getType().getId());
+ Assert.assertNotNull(folder.getBaseType());
+ Assert.assertEquals(ObjectType.FOLDER_BASETYPE_ID, folder.getBaseType()
+ .getId());
+
+ Assert.assertNotNull(folder.getCreatedBy());
+ Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
+ folder.getCreatedBy());
+ Assert.assertNotNull(folder.getLastModifiedBy());
+ Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
+ folder.getLastModifiedBy());
+ Assert.assertNotNull(folder.getLastModificationDate());
+ Assert.assertNotNull(folder.getCreationDate());
+
+ }
+
+ @Test
+ public void readTestDocument() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
+ + FixtureData.DOCUMENT1_NAME;
+ Document document = (Document) this.session.getObjectByPath(path);
+ Assert.assertNotNull("document not found: " + path, document);
+
+ Assert.assertNotNull(document.getId());
+ Assert.assertNotNull(document.getBaseType());
+ Assert.assertEquals(ObjectType.DOCUMENT_BASETYPE_ID, document
+ .getBaseType().getId());
+ Assert.assertEquals(FixtureData.DOCUMENT1_NAME.toString(), document
+ .getName());
+ Assert.assertNotNull(document.getType());
+ Assert.assertEquals(FixtureData.DOCUMENT_TYPE_ID.toString(), document
+ .getType().getId());
+ }
+
+ public void readDocumentDefaultProperties() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
+ + FixtureData.DOCUMENT1_NAME;
+ Document document = (Document) this.session.getObjectByPath(path);
+ Assert.assertNotNull("document not found: " + path, document);
+
+ Assert.assertNotNull(document.getCreatedBy());
+ Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
+ document.getCreatedBy());
+ Assert.assertNotNull(document.getLastModifiedBy());
+ Assert.assertEquals(Fixture.getParamter().get(SessionParameter.USER),
+ document.getLastModifiedBy());
+ Assert.assertNotNull(document.getLastModificationDate());
+ Assert.assertNotNull(document.getCreationDate());
+ }
+
+ @Test
+ public void readDocumentPropertiesWithFilter() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
+ + FixtureData.DOCUMENT1_NAME;
+ Document document = (Document) this.session.getObjectByPath(path);
+ Assert.assertNotNull("document not found: " + path, document);
+
+ List<Property<?>> l = document.getProperties();
+ Assert.assertNotNull(l);
+ Assert.assertEquals(false, l.isEmpty());
+ Iterator<Property<?>> i = l.iterator();
+ while (i.hasNext()) {
+ Property<?> p = i.next();
+ Object value = p.getValue();
+ PropertyType t = p.getType();
+
+ Assert.assertNotNull(p);
+ Assert.assertNotNull(t);
+
+ switch (t) {
+ case INTEGER:
+ BigInteger n = (BigInteger) value;
+ Assert.assertNotNull(n);
+ break;
+ case STRING:
+ // String s = (String) value;
+ // can be null Assert.assertNotNull(s);
+ break;
+ case BOOLEAN:
+ Boolean b = (Boolean) value;
+ Assert.assertNotNull(b);
+ break;
+ case DATETIME:
+ Calendar c = (Calendar) value;
+ Assert.assertNotNull(c);
+ break;
+ case DECIMAL:
+ Number num = (Number) value;
+ if (num instanceof Double) {
+ Double d = (Double) num;
+ Assert.assertNotNull(d);
+ } else if (num instanceof Float) {
+ Float f = (Float) num;
+ Assert.assertNotNull(f);
+ } else {
+ Assert.fail("Number not supported: " + num.toString());
+ }
+ break;
+ case HTML:
+ String html = (String) value;
+ Assert.assertNotNull(html);
+ break;
+ case ID:
+ // String id = (String) value;
+ // can be null Assert.assertNotNull(id);
+ break;
+ case URI:
+ URI uri = (URI) value;
+ Assert.assertNotNull(uri);
+ break;
+ default:
+ Assert.fail("PropertyType not supported: " + t);
+ }
+ }
+
+ }
+
+ @Test
+ public void readDocumentProperties() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
+ + FixtureData.DOCUMENT1_NAME;
+ Document document = (Document) this.session.getObjectByPath(path);
+ Assert.assertNotNull("document not found: " + path, document);
+
+ List<Property<?>> l = document.getProperties();
+ Assert.assertNotNull(l);
+ Assert.assertEquals(false, l.isEmpty());
+ Iterator<Property<?>> i = l.iterator();
+ while (i.hasNext()) {
+ Property<?> p = i.next();
+ Object value = p.getValue();
+ PropertyType t = p.getType();
+
+ Assert.assertNotNull(p);
+ Assert.assertNotNull(t);
+
+ switch (t) {
+ case INTEGER:
+ BigInteger n = (BigInteger) value;
+ Assert.assertNotNull(n);
+ break;
+ case STRING:
+ // String s = (String) value;
+ // can be null Assert.assertNotNull(s);
+ break;
+ case BOOLEAN:
+ Boolean b = (Boolean) value;
+ Assert.assertNotNull(b);
+ break;
+ case DATETIME:
+ Calendar c = (Calendar) value;
+ Assert.assertNotNull(c);
+ break;
+ case DECIMAL:
+ Number num = (Number) value;
+ if (num instanceof Double) {
+ Double d = (Double) num;
+ Assert.assertNotNull(d);
+ } else if (num instanceof Float) {
+ Float f = (Float) num;
+ Assert.assertNotNull(f);
+ } else {
+ Assert.fail("Number not supported: " + num.toString());
+ }
+ break;
+ case HTML:
+ String html = (String) value;
+ Assert.assertNotNull(html);
+ break;
+ case ID:
+ // String id = (String) value;
+ // can be null Assert.assertNotNull(id);
+ break;
+ case URI:
+ URI uri = (URI) value;
+ Assert.assertNotNull(uri);
+ break;
+ default:
+ Assert.fail("PropertyType not supported: " + t);
+ }
+ }
+ }
+
+ @Test
+ public void readSingleProperty() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
+ + FixtureData.DOCUMENT1_NAME;
+ Document document = (Document) this.session.getObjectByPath(path);
+ Assert.assertNotNull("document not found: " + path, document);
+
+ Property<String> p = document.getProperty(PropertyIds.OBJECT_ID);
+ Assert.assertNotNull(p);
+ String v1 = p.getValue();
+ Assert.assertNotNull(v1);
+
+ String v2 = document.getPropertyValue(PropertyIds.OBJECT_ID);
+ Assert.assertNotNull(v2);
+ Assert.assertEquals(v1, v2);
+
+ }
+
+ @Test
+ public void readMultiValueProperty() {
+ String path = "/" + Fixture.TEST_ROOT_FOLDER_NAME + "/"
+ + FixtureData.DOCUMENT1_NAME;
+ Document document = (Document) this.session.getObjectByPath(path);
+ Assert.assertNotNull("document not found: " + path, document);
+
+ Property<String> p = document
+ .getProperty(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
+ .toString());
+ if (p != null) {
+ Assert.assertTrue(p.isMultiValued());
+ List<String> v1 = p.getValues();
+ Assert.assertNotNull(v1);
+ Assert.assertFalse(v1.isEmpty());
+
+ List<String> v2 = document
+ .getPropertyMultivalue(FixtureData.PROPERTY_NAME_STRING_MULTI_VALUED
+ .toString());
+ Assert.assertNotNull(v2);
+ Assert.assertFalse(v2.isEmpty());
+ Assert.assertEquals(v1, v2);
+ }
+ }
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyRepositoryInfoIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyRepositoryInfoIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyRepositoryInfoIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/ReadOnlyRepositoryInfoIT.java Fri Apr 16 08:52:10 2010
@@ -20,8 +20,8 @@ package org.apache.chemistry.opencmis.fi
import junit.framework.Assert;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryCapabilities;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.RepositoryCapabilities;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/runtime/WriteObjectIT.java Fri Apr 16 08:52:10 2010
@@ -32,8 +32,7 @@ import java.util.UUID;
import org.apache.chemistry.opencmis.client.api.Document;
import org.apache.chemistry.opencmis.client.api.ObjectId;
import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.enums.CmisProperties;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
import org.junit.Test;
@@ -80,8 +79,8 @@ public class WriteObjectIT extends Abstr
*/
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(PropertyIds.CMIS_NAME, folderName);
- properties.put(PropertyIds.CMIS_OBJECT_TYPE_ID, typeId);
+ properties.put(PropertyIds.NAME, folderName);
+ properties.put(PropertyIds.OBJECT_TYPE_ID, typeId);
ObjectId id = this.session.createFolder(properties, parentId, null,
null, null);
@@ -133,8 +132,8 @@ public class WriteObjectIT extends Abstr
*/
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(PropertyIds.CMIS_NAME, folderName);
- properties.put(PropertyIds.CMIS_OBJECT_TYPE_ID, typeId);
+ properties.put(PropertyIds.NAME, folderName);
+ properties.put(PropertyIds.OBJECT_TYPE_ID, typeId);
String filename = UUID.randomUUID().toString();
String mimetype = "text/html; charset=UTF-8";
@@ -194,7 +193,7 @@ public class WriteObjectIT extends Abstr
String name = UUID.randomUUID().toString();
Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(PropertyIds.CMIS_NAME, name);
+ properties.put(PropertyIds.NAME, name);
ObjectId dstDocumentId = this.session.createDocumentFromSource(
srcDocument, properties, parentFolder,
@@ -261,7 +260,7 @@ public class WriteObjectIT extends Abstr
Document document = (Document) this.session.getObjectByPath(path);
assertNotNull("Document not found: " + path, document);
- document.setProperty(CmisProperties.NAME.value(), "Neuer Name");
+ document.setProperty(PropertyIds.NAME, "Neuer Name");
document.updateProperties();
assertTrue(true);
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/sample/AbstractSampleIT.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/sample/AbstractSampleIT.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/sample/AbstractSampleIT.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-fit/src/test/java/org/apache/chemistry/opencmis/fit/sample/AbstractSampleIT.java Fri Apr 16 08:52:10 2010
@@ -30,7 +30,7 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.objecttype.ObjectType;
import org.apache.chemistry.opencmis.client.api.util.Container;
import org.apache.chemistry.opencmis.client.api.util.PagingList;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.fit.SessionFactory;
import org.junit.Before;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Command.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Command.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Command.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Command.java Fri Apr 16 08:52:10 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.io.PrintWriter;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
/**
* Command interface.
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/Commander.java Fri Apr 16 08:52:10 2010
@@ -28,7 +28,7 @@ import java.util.Properties;
import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory;
import org.apache.chemistry.opencmis.commons.SessionParameter;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
/**
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/DeleteCommand.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/DeleteCommand.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/DeleteCommand.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/DeleteCommand.java Fri Apr 16 08:52:10 2010
@@ -20,7 +20,7 @@ package org.apache.chemistry.opencmis.co
import java.io.PrintWriter;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
public class DeleteCommand implements Command {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/InfosCommand.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/InfosCommand.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/InfosCommand.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/InfosCommand.java Fri Apr 16 08:52:10 2010
@@ -21,8 +21,8 @@ package org.apache.chemistry.opencmis.co
import java.io.PrintWriter;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
public class InfosCommand implements Command {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/ListCommand.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/ListCommand.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/ListCommand.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-tools/src/main/java/org/apache/chemistry/opencmis/commander/ListCommand.java Fri Apr 16 08:52:10 2010
@@ -21,10 +21,10 @@ package org.apache.chemistry.opencmis.co
import java.io.PrintWriter;
import org.apache.chemistry.opencmis.commons.PropertyIds;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
public class ListCommand implements Command {
@@ -59,9 +59,9 @@ public class ListCommand implements Comm
null, null, null, null, null, null, null, null, null);
for (ObjectInFolderData object : list.getObjects()) {
- output.println(getPropertyValue(object, PropertyIds.CMIS_OBJECT_ID) + "\t"
- + getPropertyValue(object, PropertyIds.CMIS_NAME) + "\t"
- + getPropertyValue(object, PropertyIds.CMIS_OBJECT_TYPE_ID));
+ output.println(getPropertyValue(object, PropertyIds.OBJECT_ID) + "\t"
+ + getPropertyValue(object, PropertyIds.NAME) + "\t"
+ + getPropertyValue(object, PropertyIds.OBJECT_TYPE_ID));
}
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/MultiThreadedObjectGenerator.java Fri Apr 16 08:52:10 2010
@@ -18,12 +18,12 @@
*/
package org.apache.chemistry.opencmis.util.repository;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.NavigationService;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectService;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryService;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.NavigationService;
+import org.apache.chemistry.opencmis.commons.api.ObjectService;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.RepositoryService;
public class MultiThreadedObjectGenerator {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjGenApp.java Fri Apr 16 08:52:10 2010
@@ -33,9 +33,9 @@ import joptsimple.OptionSpec;
import org.apache.chemistry.opencmis.client.bindings.factory.CmisBindingFactory;
import org.apache.chemistry.opencmis.commons.SessionParameter;
-import org.apache.chemistry.opencmis.commons.bindings.CmisBinding;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.bindings.RepositoryService;
+import org.apache.chemistry.opencmis.commons.api.CmisBinding;
+import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
+import org.apache.chemistry.opencmis.commons.api.RepositoryService;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java?rev=934714&r1=934713&r2=934714&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-test/chemistry-opencmis-test-util/src/main/java/org/apache/chemistry/opencmis/util/repository/ObjectGenerator.java Fri Apr 16 08:52:10 2010
@@ -30,17 +30,17 @@ import java.util.Map;
import java.util.UUID;
import org.apache.chemistry.opencmis.commons.PropertyIds;
+import org.apache.chemistry.opencmis.commons.api.Acl;
+import org.apache.chemistry.opencmis.commons.api.BindingsObjectFactory;
+import org.apache.chemistry.opencmis.commons.api.ContentStream;
import org.apache.chemistry.opencmis.commons.api.ExtensionsData;
-import org.apache.chemistry.opencmis.commons.bindings.Acl;
-import org.apache.chemistry.opencmis.commons.bindings.BindingsObjectFactory;
-import org.apache.chemistry.opencmis.commons.bindings.ContentStream;
-import org.apache.chemistry.opencmis.commons.bindings.NavigationService;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderData;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectInFolderList;
-import org.apache.chemistry.opencmis.commons.bindings.ObjectService;
-import org.apache.chemistry.opencmis.commons.bindings.PropertiesData;
-import org.apache.chemistry.opencmis.commons.bindings.PropertyData;
+import org.apache.chemistry.opencmis.commons.api.NavigationService;
+import org.apache.chemistry.opencmis.commons.api.ObjectData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderData;
+import org.apache.chemistry.opencmis.commons.api.ObjectInFolderList;
+import org.apache.chemistry.opencmis.commons.api.ObjectService;
+import org.apache.chemistry.opencmis.commons.api.PropertiesData;
+import org.apache.chemistry.opencmis.commons.api.PropertyData;
import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
@@ -213,15 +213,15 @@ public class ObjectGenerator {
*/
public String getFolderId(String rootId, int level, int index) {
String objectId = rootId;
- final String requiredProperties = PropertyIds.CMIS_OBJECT_ID + "," + PropertyIds.CMIS_OBJECT_TYPE_ID +
- "," + PropertyIds.CMIS_BASE_TYPE_ID;
+ final String requiredProperties = PropertyIds.OBJECT_ID + "," + PropertyIds.OBJECT_TYPE_ID +
+ "," + PropertyIds.BASE_TYPE_ID;
// Note: This works because first folders are created then documents
for (int i=0; i<level; i++) {
- ObjectInFolderList result = fNavSvc.getChildren(fRepositoryId, objectId, requiredProperties, PropertyIds.CMIS_OBJECT_TYPE_ID, false,
+ ObjectInFolderList result = fNavSvc.getChildren(fRepositoryId, objectId, requiredProperties, PropertyIds.OBJECT_TYPE_ID, false,
IncludeRelationships.NONE, null, true, BigInteger.valueOf(-1), BigInteger.valueOf(-1), null);
List<ObjectInFolderData> children = result.getObjects();
ObjectData child = children.get(index).getObject();
- objectId = (String) child.getProperties().getProperties().get(PropertyIds.CMIS_OBJECT_ID).getFirstValue();
+ objectId = (String) child.getProperties().getProperties().get(PropertyIds.OBJECT_ID).getFirstValue();
}
return objectId;
}
@@ -236,16 +236,16 @@ public class ObjectGenerator {
*/
public String getDocumentId(String folderId, int index) {
String docId = null;
- final String requiredProperties = PropertyIds.CMIS_OBJECT_ID + "," + PropertyIds.CMIS_OBJECT_TYPE_ID +
- "," + PropertyIds.CMIS_BASE_TYPE_ID;
+ final String requiredProperties = PropertyIds.OBJECT_ID + "," + PropertyIds.OBJECT_TYPE_ID +
+ "," + PropertyIds.BASE_TYPE_ID;
ObjectInFolderList result = fNavSvc.getChildren(fRepositoryId, folderId, requiredProperties,
- PropertyIds.CMIS_OBJECT_TYPE_ID, false, IncludeRelationships.NONE, null, true, BigInteger
+ PropertyIds.OBJECT_TYPE_ID, false, IncludeRelationships.NONE, null, true, BigInteger
.valueOf(-1), BigInteger.valueOf(-1), null);
List<ObjectInFolderData> children = result.getObjects();
int numDocsFound = 0;
for (int i=0; i<children.size(); i++) {
ObjectData child = children.get(i).getObject();
- docId = (String) child.getProperties().getProperties().get(PropertyIds.CMIS_OBJECT_ID).getFirstValue();
+ docId = (String) child.getProperties().getProperties().get(PropertyIds.OBJECT_ID).getFirstValue();
if (child.getBaseTypeId().equals(BaseObjectTypeIds.CMIS_DOCUMENT)) {
if (numDocsFound == index)
return docId;
@@ -470,8 +470,8 @@ public class ObjectGenerator {
private PropertiesData createFolderProperties(int no, int level) {
List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
- properties.add(fFactory.createPropertyStringData(PropertyIds.CMIS_NAME, generateFolderNameValue(no, level)));
- properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, fFolderTypeId));
+ properties.add(fFactory.createPropertyStringData(PropertyIds.NAME, generateFolderNameValue(no, level)));
+ properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, fFolderTypeId));
// Generate some property values for custom attributes
for (String stringPropId : fStringPropertyIdsToSetForFolder) {
properties.add(fFactory.createPropertyStringData(stringPropId, generateStringPropValueFolder()));
@@ -482,8 +482,8 @@ public class ObjectGenerator {
private PropertiesData createDocumentProperties(int no, int level) {
List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
- properties.add(fFactory.createPropertyStringData(PropertyIds.CMIS_NAME, generateDocNameValue(no, level)));
- properties.add(fFactory.createPropertyIdData(PropertyIds.CMIS_OBJECT_TYPE_ID, fDocTypeId));
+ properties.add(fFactory.createPropertyStringData(PropertyIds.NAME, generateDocNameValue(no, level)));
+ properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID, fDocTypeId));
// Generate some property values for custom attributes
for (String stringPropId : fStringPropertyIdsToSetForDocument) {
properties.add(fFactory.createPropertyStringData(stringPropId, generateStringPropValueDoc()));
@@ -526,8 +526,8 @@ public class ObjectGenerator {
log.info("starting dumpFolder() id " + folderId + " ...");
boolean allRequiredPropertiesArePresent = propertyFilter!= null && propertyFilter.equals("*"); // can be optimized
final String requiredProperties = allRequiredPropertiesArePresent ? propertyFilter :
- PropertyIds.CMIS_OBJECT_ID+","+PropertyIds.CMIS_NAME + ","+PropertyIds.CMIS_OBJECT_TYPE_ID +
- ","+PropertyIds.CMIS_BASE_TYPE_ID;
+ PropertyIds.OBJECT_ID+","+PropertyIds.NAME + ","+PropertyIds.OBJECT_TYPE_ID +
+ ","+PropertyIds.BASE_TYPE_ID;
// if all required properties are contained in the filter use we use the filter otherwise
// we use our own set and get those from the filter later in an extra call
String propertyFilterIntern = allRequiredPropertiesArePresent ? propertyFilter : requiredProperties;
@@ -571,7 +571,7 @@ public class ObjectGenerator {
log.info(prefix + "found object id " + object.getId());
Map<String, PropertyData<?>> propMap;
if (mustFetchProperties) {
- String objId = (String) object.getProperties().getProperties().get(PropertyIds.CMIS_OBJECT_ID).getFirstValue();
+ String objId = (String) object.getProperties().getProperties().get(PropertyIds.OBJECT_ID).getFirstValue();
PropertiesData props = fObjSvc.getProperties(fRepositoryId, objId, propertyFilter, null);
propMap = props.getProperties();
} else {