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 11:59:20 UTC
svn commit: r934728 [2/2] - 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/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=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-commons/chemistry-opencmis-commons-impl/src/test/java/org/apache/chemistry/opencmis/commons/impl/misc/ConverterTest.java Fri Apr 16 09:59:18 2010
@@ -37,7 +37,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
@@ -72,7 +72,7 @@ public class ConverterTest extends TestC
// values
obj1 = new RepositoryInfoImpl();
obj1.setChangesIncomplete(Boolean.TRUE);
- obj1.setChangesOnType(Collections.singletonList(BaseObjectTypeIds.CMIS_DOCUMENT));
+ obj1.setChangesOnType(Collections.singletonList(BaseTypeId.CMIS_DOCUMENT));
obj1.setCmisVersionSupported("1.0");
obj1.setLatestChangeLogToken("changeLogToken");
obj1.setPrincipalAnonymous("principalAnonymous");
@@ -141,7 +141,7 @@ public class ConverterTest extends TestC
// simple values
obj1 = new DocumentTypeDefinitionImpl();
- obj1.setBaseId(BaseObjectTypeIds.CMIS_DOCUMENT);
+ obj1.setBaseTypeId(BaseTypeId.CMIS_DOCUMENT);
obj1.setContentStreamAllowed(ContentStreamAllowed.ALLOWED);
obj1.setDescription("description");
obj1.setDisplayName("displayName");
@@ -155,7 +155,7 @@ public class ConverterTest extends TestC
obj1.setIsVersionable(Boolean.TRUE);
obj1.setLocalName("localName");
obj1.setLocalNamespace("localNamespace");
- obj1.setParentId("parentId");
+ obj1.setParentTypeId("parentId");
obj1.setQueryName("queryName");
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/AtomPubUtils.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/AtomPubUtils.java Fri Apr 16 09:59:18 2010
@@ -34,7 +34,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.PropertyData;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisRuntimeException;
import org.apache.chemistry.opencmis.commons.impl.Constants;
@@ -307,7 +307,7 @@ public final class AtomPubUtils {
Constants.MEDIATYPE_FEED);
}
- if (info.getBaseType() == BaseObjectTypeIds.CMIS_FOLDER) {
+ if (info.getBaseType() == BaseTypeId.CMIS_FOLDER) {
entry.writeDownLink(compileUrl(baseUrl, RESOURCE_CHILDREN, info.getId()),
Constants.MEDIATYPE_FEED);
@@ -447,14 +447,14 @@ public final class AtomPubUtils {
entry.writeSelfLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getId()), type.getId());
entry.writeEnclosureLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getId()));
- if (type.getParentId() != null) {
- entry.writeUpLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getParentId()),
+ if (type.getParentTypeId() != null) {
+ entry.writeUpLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getParentTypeId()),
Constants.MEDIATYPE_ENTRY);
}
UrlBuilder downLink = compileUrlBuilder(baseUrl, RESOURCE_TYPES, null);
downLink.addParameter(Constants.PARAM_TYPE_ID, type.getId());
entry.writeDownLink(downLink.toString(), Constants.MEDIATYPE_CHILDREN);
- entry.writeDescribedByLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getBaseId().value()));
+ entry.writeDescribedByLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getBaseTypeId().value()));
// write children
if ((children != null) && (children.size() > 0)) {
@@ -493,8 +493,8 @@ public final class AtomPubUtils {
downLink.addParameter(Constants.PARAM_TYPE_ID, type.getId());
feed.writeDownLink(downLink.toString(), Constants.MEDIATYPE_FEED);
- if (type.getParentId() != null) {
- feed.writeUpLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getParentId()),
+ if (type.getParentTypeId() != null) {
+ feed.writeUpLink(compileUrl(baseUrl, RESOURCE_TYPE, type.getParentTypeId()),
Constants.MEDIATYPE_ENTRY);
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RepositoryService.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/RepositoryService.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RepositoryService.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/atompub/RepositoryService.java Fri Apr 16 09:59:18 2010
@@ -274,7 +274,7 @@ public final class RepositoryService {
TypeDefinition typeDefinition = service
.getTypeDefinition(context, repositoryId, typeId, null);
- parentTypeId = (typeDefinition == null ? null : typeDefinition.getParentId());
+ parentTypeId = (typeDefinition == null ? null : typeDefinition.getParentTypeId());
typeName = (typeDefinition == null ? typeId : typeDefinition.getDisplayName());
}
@@ -359,7 +359,7 @@ public final class RepositoryService {
TypeDefinition typeDefinition = service
.getTypeDefinition(context, repositoryId, typeId, null);
- parentTypeId = (typeDefinition == null ? null : typeDefinition.getParentId());
+ parentTypeId = (typeDefinition == null ? null : typeDefinition.getParentTypeId());
typeName = (typeDefinition == null ? typeId : typeDefinition.getDisplayName());
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/DocumentInfo.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/DocumentInfo.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/DocumentInfo.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/DocumentInfo.java Fri Apr 16 09:59:18 2010
@@ -18,13 +18,13 @@
*/
package org.apache.chemistry.opencmis.fileshare;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.server.spi.ObjectInfoImpl;
public class DocumentInfo extends ObjectInfoImpl {
public DocumentInfo() {
- setBaseType(BaseObjectTypeIds.CMIS_DOCUMENT);
+ setBaseType(BaseTypeId.CMIS_DOCUMENT);
setHasAcl(true);
setHasContent(true);
setHasParent(true);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FileShareRepository.java Fri Apr 16 09:59:18 2010
@@ -70,7 +70,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionList;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.AllowableActionsEnum;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
@@ -364,10 +364,10 @@ public class FileShareRepository {
}
String objectId = null;
- if (type.getBaseId() == BaseObjectTypeIds.CMIS_DOCUMENT) {
+ if (type.getBaseTypeId() == BaseTypeId.CMIS_DOCUMENT) {
objectId = createDocument(context, properties, folderId, contentStream, versioningState);
}
- else if (type.getBaseId() == BaseObjectTypeIds.CMIS_FOLDER) {
+ else if (type.getBaseTypeId() == BaseTypeId.CMIS_FOLDER) {
objectId = createFolder(context, properties, folderId);
}
else {
@@ -1389,7 +1389,7 @@ public class FileShareRepository {
if (file.isDirectory()) {
// base type and type name
addPropertyId(result, typeId, filter, PropertyIds.BASE_TYPE_ID,
- BaseObjectTypeIds.CMIS_FOLDER.value());
+ BaseTypeId.CMIS_FOLDER.value());
addPropertyId(result, typeId, filter, PropertyIds.OBJECT_TYPE_ID,
TypeManager.FOLDER_TYPE_ID);
String path = getRepositoryPath(file);
@@ -1409,7 +1409,7 @@ public class FileShareRepository {
else {
// base type and type name
addPropertyId(result, typeId, filter, PropertyIds.BASE_TYPE_ID,
- BaseObjectTypeIds.CMIS_DOCUMENT.value());
+ BaseTypeId.CMIS_DOCUMENT.value());
addPropertyId(result, typeId, filter, PropertyIds.OBJECT_TYPE_ID,
TypeManager.DOCUMENT_TYPE_ID);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FolderInfo.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FolderInfo.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FolderInfo.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/FolderInfo.java Fri Apr 16 09:59:18 2010
@@ -18,13 +18,13 @@
*/
package org.apache.chemistry.opencmis.fileshare;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.server.spi.ObjectInfoImpl;
public class FolderInfo extends ObjectInfoImpl {
public FolderInfo() {
- setBaseType(BaseObjectTypeIds.CMIS_FOLDER);
+ setBaseType(BaseTypeId.CMIS_FOLDER);
setContentType(null);
setFileName(null);
setHasAcl(true);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-fileshare/src/main/java/org/apache/chemistry/opencmis/fileshare/TypeManager.java Fri Apr 16 09:59:18 2010
@@ -29,7 +29,7 @@ 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.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.Cardinality;
import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed;
import org.apache.chemistry.opencmis.commons.enums.PropertyType;
@@ -89,7 +89,7 @@ public class TypeManager {
// folder type
FolderTypeDefinitionImpl folderType = new FolderTypeDefinitionImpl();
- folderType.setBaseId(BaseObjectTypeIds.CMIS_FOLDER);
+ folderType.setBaseTypeId(BaseTypeId.CMIS_FOLDER);
folderType.setIsControllableAcl(false);
folderType.setIsControllablePolicy(false);
folderType.setIsCreatable(true);
@@ -111,7 +111,7 @@ public class TypeManager {
// document type
DocumentTypeDefinitionImpl documentType = new DocumentTypeDefinitionImpl();
- documentType.setBaseId(BaseObjectTypeIds.CMIS_DOCUMENT);
+ documentType.setBaseTypeId(BaseTypeId.CMIS_DOCUMENT);
documentType.setIsControllableAcl(false);
documentType.setIsControllablePolicy(false);
documentType.setIsCreatable(true);
@@ -136,7 +136,7 @@ public class TypeManager {
// relationship types
RelationshipTypeDefinitionImpl relationshipType = new RelationshipTypeDefinitionImpl();
- relationshipType.setBaseId(BaseObjectTypeIds.CMIS_RELATIONSHIP);
+ relationshipType.setBaseTypeId(BaseTypeId.CMIS_RELATIONSHIP);
relationshipType.setIsControllableAcl(false);
relationshipType.setIsControllablePolicy(false);
relationshipType.setIsCreatable(false);
@@ -157,7 +157,7 @@ public class TypeManager {
// policy type
PolicyTypeDefinitionImpl policyType = new PolicyTypeDefinitionImpl();
- policyType.setBaseId(BaseObjectTypeIds.CMIS_POLICY);
+ policyType.setBaseTypeId(BaseTypeId.CMIS_POLICY);
policyType.setIsControllableAcl(false);
policyType.setIsControllablePolicy(false);
policyType.setIsCreatable(false);
@@ -335,22 +335,22 @@ public class TypeManager {
return false;
}
- if (type.getBaseId() == null) {
+ if (type.getBaseTypeId() == null) {
return false;
}
// find base type
TypeDefinition baseType = null;
- if (type.getBaseId() == BaseObjectTypeIds.CMIS_DOCUMENT) {
+ if (type.getBaseTypeId() == BaseTypeId.CMIS_DOCUMENT) {
baseType = copyTypeDefintion(fTypes.get(DOCUMENT_TYPE_ID).getTypeDefinition());
}
- else if (type.getBaseId() == BaseObjectTypeIds.CMIS_FOLDER) {
+ else if (type.getBaseTypeId() == BaseTypeId.CMIS_FOLDER) {
baseType = copyTypeDefintion(fTypes.get(FOLDER_TYPE_ID).getTypeDefinition());
}
- else if (type.getBaseId() == BaseObjectTypeIds.CMIS_RELATIONSHIP) {
+ else if (type.getBaseTypeId() == BaseTypeId.CMIS_RELATIONSHIP) {
baseType = copyTypeDefintion(fTypes.get(RELATIONSHIP_TYPE_ID).getTypeDefinition());
}
- else if (type.getBaseId() == BaseObjectTypeIds.CMIS_POLICY) {
+ else if (type.getBaseTypeId() == BaseTypeId.CMIS_POLICY) {
baseType = copyTypeDefintion(fTypes.get(POLICY_TYPE_ID).getTypeDefinition());
}
else {
@@ -390,8 +390,8 @@ public class TypeManager {
tc.setTypeDefinition(type);
// add to parent
- if (type.getParentId() != null) {
- TypeDefinitionContainerImpl tdc = fTypes.get(type.getParentId());
+ if (type.getParentTypeId() != null) {
+ TypeDefinitionContainerImpl tdc = fTypes.get(type.getParentTypeId());
if (tdc != null) {
if (tdc.getChildren() == null) {
tdc.setChildren(new ArrayList<TypeDefinitionContainer>());
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManager.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManager.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManager.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeManager.java Fri Apr 16 09:59:18 2010
@@ -73,7 +73,7 @@ public class TypeManager {
List<TypeDefinitionContainer> typeRoots = new ArrayList<TypeDefinitionContainer>();
// iterate types map and return a list collecting the root types:
for (TypeDefinitionContainer typeDef : fTypesMap.values()) {
- if (typeDef.getTypeDefinition().getParentId()==null)
+ if (typeDef.getTypeDefinition().getParentTypeId()==null)
typeRoots.add(typeDef);
}
@@ -135,12 +135,12 @@ public class TypeManager {
TypeDefinitionContainerImpl typeContainer = new TypeDefinitionContainerImpl(cmisType);
- if (!fTypesMap.containsKey(cmisType.getParentId()))
+ if (!fTypesMap.containsKey(cmisType.getParentTypeId()))
throw new RuntimeException("Cannot add type, because parent with id "
- + cmisType.getParentId() + " does not exist.");
+ + cmisType.getParentTypeId() + " does not exist.");
// add new type to children of parent types
- TypeDefinitionContainer parentTypeContainer = fTypesMap.get(cmisType.getParentId());
+ TypeDefinitionContainer parentTypeContainer = fTypesMap.get(cmisType.getParentTypeId());
parentTypeContainer.getChildren().add(typeContainer);
// recursively add inherited properties
@@ -173,7 +173,7 @@ public class TypeManager {
addInheritedPropertyDefinitions(propDefs, typeDefinition.getPropertyDefinitions());
// propDefs.putAll(typeDefinition.getPropertyDefinitions());
- TypeDefinitionContainer parentTypeContainer = fTypesMap.get(typeDefinition.getParentId());
+ TypeDefinitionContainer parentTypeContainer = fTypesMap.get(typeDefinition.getParentTypeId());
TypeDefinition parentType = (null == parentTypeContainer ? null : parentTypeContainer
.getTypeDefinition());
addInheritedProperties(propDefs, parentType);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/TypeValidator.java Fri Apr 16 09:59:18 2010
@@ -37,7 +37,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.PropertyIntegerDefinition;
import org.apache.chemistry.opencmis.commons.api.PropertyStringDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.Cardinality;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
@@ -243,7 +243,7 @@ public class TypeValidator {
for (PropertyData<?> prop : properties.getProperties().values()) {
String propertyId = prop.getId();
- BaseObjectTypeIds baseTypeId = typeDef.getBaseId();
+ BaseTypeId baseTypeId = typeDef.getBaseTypeId();
if (isSystemProperty(baseTypeId, propertyId))
continue; // ignore system properties for validation
@@ -331,7 +331,7 @@ public class TypeValidator {
return (PropertyDefinition<T>)propDef;
}
- private static boolean isSystemProperty(BaseObjectTypeIds baseTypeId, String propertyId) {
+ private static boolean isSystemProperty(BaseTypeId baseTypeId, String propertyId) {
if (propertyId.equals(PropertyIds.NAME)) {
return true;
@@ -361,7 +361,7 @@ public class TypeValidator {
return true;
}
- if (baseTypeId.equals(BaseObjectTypeIds.CMIS_DOCUMENT)) {
+ if (baseTypeId.equals(BaseTypeId.CMIS_DOCUMENT)) {
if (propertyId.equals(PropertyIds.IS_IMMUTABLE)) {
return true;
}
@@ -411,7 +411,7 @@ public class TypeValidator {
return false;
}
}
- else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_FOLDER)) {
+ else if (baseTypeId.equals(BaseTypeId.CMIS_FOLDER)) {
if (propertyId.equals(PropertyIds.PARENT_ID)) {
return true;
}
@@ -425,7 +425,7 @@ public class TypeValidator {
return false;
}
}
- else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_POLICY)) {
+ else if (baseTypeId.equals(BaseTypeId.CMIS_POLICY)) {
if (propertyId.equals(PropertyIds.SOURCE_ID)) {
return true;
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/AtomLinkInfoProvider.java Fri Apr 16 09:59:18 2010
@@ -77,7 +77,7 @@ public class AtomLinkInfoProvider {
objInfo.setCreationDate(so.getCreatedAt()); //!
objInfo.setLastModificationDate(so.getModifiedAt());
objInfo.setTypeId(so.getTypeId());
- objInfo.setBaseType(typeDef.getBaseId());
+ objInfo.setBaseType(typeDef.getBaseTypeId());
// versioning information:
if (so instanceof DocumentVersion) {
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryObjectServiceImpl.java Fri Apr 16 09:59:18 2010
@@ -38,7 +38,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.RenditionData;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
import org.apache.chemistry.opencmis.commons.api.TypeDefinitionContainer;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
import org.apache.chemistry.opencmis.commons.enums.Updatability;
@@ -245,20 +245,20 @@ public class InMemoryObjectServiceImpl e
throw new RuntimeException("Cannot create object, a type with id " + typeId + " is unknown");
// check if the given type is a document type
- BaseObjectTypeIds typeBaseId = typeDefC.getTypeDefinition().getBaseId();
+ BaseTypeId typeBaseId = typeDefC.getTypeDefinition().getBaseTypeId();
StoredObject so = null;
- if (typeBaseId.equals(InMemoryDocumentTypeDefinition.getRootDocumentType().getBaseId())) {
+ if (typeBaseId.equals(InMemoryDocumentTypeDefinition.getRootDocumentType().getBaseTypeId())) {
so = createDocumentIntern(repositoryId, properties, folderId, contentStream,
versioningState, null, null, null, null);
}
- else if (typeBaseId.equals(InMemoryFolderTypeDefinition.getRootFolderType().getBaseId())) {
+ else if (typeBaseId.equals(InMemoryFolderTypeDefinition.getRootFolderType().getBaseTypeId())) {
so = createFolderIntern(repositoryId, properties, folderId, null, null, null, null);
}
- else if (typeBaseId.equals(InMemoryPolicyTypeDefinition.getRootPolicyType().getBaseId())) {
+ else if (typeBaseId.equals(InMemoryPolicyTypeDefinition.getRootPolicyType().getBaseTypeId())) {
so = createPolicyIntern(repositoryId, properties, folderId, null, null, null, null);
}
else if (typeBaseId.equals(InMemoryRelationshipTypeDefinition.getRootRelationshipType()
- .getBaseId())) {
+ .getBaseTypeId())) {
so = createRelationshipIntern(repositoryId, properties, null, null, null, null);
}
else
@@ -810,7 +810,7 @@ public class InMemoryObjectServiceImpl e
}
// check if the given type is a document type
- if (!typeDef.getBaseId().equals(BaseObjectTypeIds.CMIS_DOCUMENT))
+ if (!typeDef.getBaseTypeId().equals(BaseTypeId.CMIS_DOCUMENT))
throw new RuntimeException("Cannot create a document, with a non-document type: "
+ typeDef.getId());
@@ -889,7 +889,7 @@ public class InMemoryObjectServiceImpl e
TypeDefinition typeDef = getTypeDefinition(repositoryId, properties);
// check if the given type is a folder type
- if (!typeDef.getBaseId().equals(BaseObjectTypeIds.CMIS_FOLDER))
+ if (!typeDef.getBaseTypeId().equals(BaseTypeId.CMIS_FOLDER))
throw new RuntimeException("Cannot create a folder, with a non-folder type: "
+ typeDef.getId());
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/InMemoryVersioningServiceImpl.java Fri Apr 16 09:59:18 2010
@@ -29,7 +29,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.ObjectData;
import org.apache.chemistry.opencmis.commons.api.PropertiesData;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.exceptions.CmisNotSupportedException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisUpdateConflictException;
@@ -124,7 +124,7 @@ public class InMemoryVersioningServiceIm
StoredObject so = checkStandardParameters(repositoryId, objectId.getValue());
TypeDefinition typeDef = getTypeDefinition(repositoryId, so);
- if (!typeDef.getBaseId().equals(BaseObjectTypeIds.CMIS_DOCUMENT))
+ if (!typeDef.getBaseTypeId().equals(BaseTypeId.CMIS_DOCUMENT))
throw new CmisNotSupportedException("Only documents can be checked-out.");
else if (!((DocumentTypeDefinition) typeDef).isVersionable())
throw new CmisNotSupportedException("Object can't be checked-out, type is not versionable.");
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/server/ServiceFactory.java Fri Apr 16 09:59:18 2010
@@ -28,7 +28,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.ObjectService;
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.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.BindingsObjectFactoryImpl;
import org.apache.chemistry.opencmis.inmemory.ConfigConstants;
import org.apache.chemistry.opencmis.inmemory.clientprovider.NavigationServiceImpl;
@@ -214,11 +214,11 @@ public class ServiceFactory extends Abst
String documentTypeId = parameters.get(ConfigConstants.FILLER_DOCUMENT_TYPE_ID);
if (null == documentTypeId)
- documentTypeId = BaseObjectTypeIds.CMIS_DOCUMENT.value();
+ documentTypeId = BaseTypeId.CMIS_DOCUMENT.value();
String folderTypeId = parameters.get(ConfigConstants.FILLER_FOLDER_TYPE_ID);
if (null == folderTypeId)
- folderTypeId = BaseObjectTypeIds.CMIS_FOLDER.value();
+ folderTypeId = BaseTypeId.CMIS_FOLDER.value();
int contentSizeKB = 0;
String contentSizeKBStr = parameters.get(ConfigConstants.FILLER_CONTENT_SIZE);
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/storedobj/impl/ObjectStoreImpl.java Fri Apr 16 09:59:18 2010
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.Document;
import org.apache.chemistry.opencmis.inmemory.storedobj.api.DocumentVersion;
@@ -221,7 +221,7 @@ public class ObjectStoreImpl implements
FolderImpl rootFolder = new FolderImpl(this);
rootFolder.setName("RootFolder");
rootFolder.setParent(null);
- rootFolder.setTypeId(BaseObjectTypeIds.CMIS_FOLDER.value());
+ rootFolder.setTypeId(BaseTypeId.CMIS_FOLDER.value());
rootFolder.setCreatedBy("Admin");
rootFolder.setModifiedBy("Admin");
rootFolder.setModifiedAtNow();
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryDocumentTypeDefinition.java Fri Apr 16 09:59:18 2010
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.ContentStreamAllowed;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.DocumentTypeDefinitionImpl;
@@ -45,8 +45,8 @@ public class InMemoryDocumentTypeDefinit
/* This constructor is just for creating the root document */
public InMemoryDocumentTypeDefinition() {
- init(BaseObjectTypeIds.CMIS_DOCUMENT.value(), "CMIS Document");
- setParentId(null);
+ init(BaseTypeId.CMIS_DOCUMENT.value(), "CMIS Document");
+ setParentTypeId(null);
// set base properties
Map<String, PropertyDefinition<?>> props = getPropertyDefinitions();
DocumentTypeCreationHelper.setBasicDocumentPropertyDefinitions(props);
@@ -54,18 +54,18 @@ public class InMemoryDocumentTypeDefinit
public InMemoryDocumentTypeDefinition(String id, String displayName) {
init(id, displayName);
- setParentId(DOCUMENT_TYPE.getId());
+ setParentTypeId(DOCUMENT_TYPE.getId());
}
public InMemoryDocumentTypeDefinition(String id, String displayName, InMemoryDocumentTypeDefinition parentType) {
// get root type
init(id, displayName);
if (parentType != null)
- setBaseId(parentType.getBaseId());
+ setBaseTypeId(parentType.getBaseTypeId());
else
throw new IllegalArgumentException(
"Must provide a parent type when creating a document type definition");
- setParentId(parentType.getId());
+ setParentTypeId(parentType.getId());
}
/*
@@ -87,7 +87,7 @@ public class InMemoryDocumentTypeDefinit
if (!NameValidator.isValidId(id))
throw new CmisInvalidArgumentException(NameValidator.ERROR_ILLEGAL_ID);
- setBaseId(BaseObjectTypeIds.CMIS_DOCUMENT);
+ setBaseTypeId(BaseTypeId.CMIS_DOCUMENT);
setId(id);
if (displayName == null)
displayName = '#' + id + '#';
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryFolderTypeDefinition.java Fri Apr 16 09:59:18 2010
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.FolderTypeDefinitionImpl;
import org.apache.chemistry.opencmis.inmemory.NameValidator;
@@ -39,8 +39,8 @@ public class InMemoryFolderTypeDefinitio
/* This constructor is just for creating the root document */
public InMemoryFolderTypeDefinition() {
- init(BaseObjectTypeIds.CMIS_FOLDER.value(), "CMIS Folder");
- setParentId(null);
+ init(BaseTypeId.CMIS_FOLDER.value(), "CMIS Folder");
+ setParentTypeId(null);
// set base properties
Map<String, PropertyDefinition<?>> props = getPropertyDefinitions();
DocumentTypeCreationHelper.setBasicFolderPropertyDefinitions(props);
@@ -48,18 +48,18 @@ public class InMemoryFolderTypeDefinitio
public InMemoryFolderTypeDefinition(String id, String displayName) {
init(id, displayName);
- setParentId(FOLDER_TYPE.getId());
+ setParentTypeId(FOLDER_TYPE.getId());
}
public InMemoryFolderTypeDefinition(String id, String displayName, InMemoryFolderTypeDefinition parentType) {
// get root type
init(id, displayName);
if (parentType != null)
- setBaseId(parentType.getBaseId());
+ setBaseTypeId(parentType.getBaseTypeId());
else
throw new IllegalArgumentException(
"Must provide a parent type when creating a folder type definition");
- setParentId(parentType.getId());
+ setParentTypeId(parentType.getId());
}
/*
@@ -76,7 +76,7 @@ public class InMemoryFolderTypeDefinitio
if (!NameValidator.isValidId(id))
throw new CmisInvalidArgumentException(NameValidator.ERROR_ILLEGAL_NAME);
- setBaseId(BaseObjectTypeIds.CMIS_FOLDER);
+ setBaseTypeId(BaseTypeId.CMIS_FOLDER);
setId(id);
if (displayName == null)
displayName = '#' + id + '#';
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryPolicyTypeDefinition.java Fri Apr 16 09:59:18 2010
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.PolicyTypeDefinitionImpl;
import org.apache.chemistry.opencmis.inmemory.NameValidator;
@@ -39,8 +39,8 @@ public class InMemoryPolicyTypeDefinitio
/* This constructor is just for creating the root document */
public InMemoryPolicyTypeDefinition() {
- init(BaseObjectTypeIds.CMIS_POLICY.value(), "CMIS Policy");
- setParentId(null);
+ init(BaseTypeId.CMIS_POLICY.value(), "CMIS Policy");
+ setParentTypeId(null);
Map<String, PropertyDefinition<?>> props = getPropertyDefinitions();
DocumentTypeCreationHelper.setBasicPolicyPropertyDefinitions(props);
@@ -48,18 +48,18 @@ public class InMemoryPolicyTypeDefinitio
public InMemoryPolicyTypeDefinition(String id, String displayName) {
init(id, displayName);
- setParentId(POLICY_TYPE.getId());
+ setParentTypeId(POLICY_TYPE.getId());
}
public InMemoryPolicyTypeDefinition(String id, String displayName, InMemoryPolicyTypeDefinition parentType) {
// get root type
init(id, displayName);
if (parentType != null)
- setBaseId(parentType.getBaseId());
+ setBaseTypeId(parentType.getBaseTypeId());
else
throw new IllegalArgumentException(
"Must provide a parent type when creating a policy definition");
- setParentId(parentType.getId());
+ setParentTypeId(parentType.getId());
}
/*
@@ -76,7 +76,7 @@ public class InMemoryPolicyTypeDefinitio
if (!NameValidator.isValidId(id))
throw new CmisInvalidArgumentException(NameValidator.ERROR_ILLEGAL_NAME);
- setBaseId(BaseObjectTypeIds.CMIS_POLICY);
+ setBaseTypeId(BaseTypeId.CMIS_POLICY);
setId(id);
if (displayName == null)
displayName = '#' + id + '#';
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/InMemoryRelationshipTypeDefinition.java Fri Apr 16 09:59:18 2010
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.chemistry.opencmis.commons.api.PropertyDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentException;
import org.apache.chemistry.opencmis.commons.impl.dataobjects.RelationshipTypeDefinitionImpl;
import org.apache.chemistry.opencmis.inmemory.NameValidator;
@@ -39,8 +39,8 @@ public class InMemoryRelationshipTypeDef
/* This constructor is just for creating the root document */
public InMemoryRelationshipTypeDefinition() {
- init(BaseObjectTypeIds.CMIS_RELATIONSHIP.value(), "CMIS Relation");
- setParentId(null);
+ init(BaseTypeId.CMIS_RELATIONSHIP.value(), "CMIS Relation");
+ setParentTypeId(null);
Map<String, PropertyDefinition<?>> props = getPropertyDefinitions();
DocumentTypeCreationHelper.setBasicRelationshipPropertyDefinitions(props);
@@ -48,7 +48,7 @@ public class InMemoryRelationshipTypeDef
public InMemoryRelationshipTypeDefinition(String id, String displayName) {
init(id, displayName);
- setParentId(RELATIONSHIP_TYPE.getId());
+ setParentTypeId(RELATIONSHIP_TYPE.getId());
}
public InMemoryRelationshipTypeDefinition(String id, String displayName,
@@ -56,11 +56,11 @@ public class InMemoryRelationshipTypeDef
// get root type
init(id, displayName);
if (parentType != null)
- setBaseId(parentType.getBaseId());
+ setBaseTypeId(parentType.getBaseTypeId());
else
throw new IllegalArgumentException(
"Must provide a parent type when creating a relationship definition");
- setParentId(parentType.getId());
+ setParentTypeId(parentType.getId());
}
/*
@@ -77,7 +77,7 @@ public class InMemoryRelationshipTypeDef
if (!NameValidator.isValidId(id))
throw new CmisInvalidArgumentException(NameValidator.ERROR_ILLEGAL_NAME);
- setBaseId(BaseObjectTypeIds.CMIS_RELATIONSHIP);
+ setBaseTypeId(BaseTypeId.CMIS_RELATIONSHIP);
setId(id);
if (displayName == null)
displayName = '#' + id + '#';
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/main/java/org/apache/chemistry/opencmis/inmemory/types/PropertyCreationHelper.java Fri Apr 16 09:59:18 2010
@@ -222,7 +222,7 @@ public class PropertyCreationHelper {
+ " is unknown");
} else {
TypeDefinition typeDef = typeDefC.getTypeDefinition();
- String baseTypeId = typeDef.getBaseId().value();
+ String baseTypeId = typeDef.getBaseTypeId().value();
properties.put(PropertyIds.BASE_TYPE_ID, objectFactory.createPropertyIdData(PropertyIds.BASE_TYPE_ID, baseTypeId));
}
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/MultiFilingTest.java Fri Apr 16 09:59:18 2010
@@ -35,7 +35,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.ObjectParentData;
import org.apache.chemistry.opencmis.commons.api.PropertiesData;
import org.apache.chemistry.opencmis.commons.api.PropertyData;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
@@ -202,7 +202,7 @@ public class MultiFilingTest extends Abs
assertEquals(3, res.size());
for (ObjectParentData opd : res) {
assertTrue(folderIds.contains(opd.getObject().getId()));
- assertEquals(BaseObjectTypeIds.CMIS_FOLDER, opd.getObject().getBaseTypeId());
+ assertEquals(BaseTypeId.CMIS_FOLDER, opd.getObject().getBaseTypeId());
assertEquals(UNFILED_DOC_NAME, opd.getRelativePathSegment());
}
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/RepositoryServiceTest.java Fri Apr 16 09:59:18 2010
@@ -33,7 +33,7 @@ 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.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.CapabilityChanges;
import org.apache.chemistry.opencmis.commons.enums.CapabilityContentStreamUpdates;
@@ -191,9 +191,9 @@ public class RepositoryServiceTest exten
TypeDefinition typeDef = type.getTypeDefinition();
assertNotNull(typeDef);
assertNotNull(typeDef.getId());
- assertNotNull(typeDef.getBaseId());
+ assertNotNull(typeDef.getBaseTypeId());
log.info("Found type: " + typeDef.getId() + ", display name is: " + typeDef.getDisplayName());
- log.info(" Base type is: " + typeDef.getBaseId());
+ log.info(" Base type is: " + typeDef.getBaseTypeId());
log.info(" Number of children types is: " + type.getChildren().size());
Map<String, PropertyDefinition<?>> propDefs = type.getTypeDefinition().getPropertyDefinitions();
log.info(" Number of properties is: " + (propDefs==null ? 0 : propDefs.size()));
@@ -212,7 +212,7 @@ public class RepositoryServiceTest exten
// get types
int depth = 1;
List<TypeDefinitionContainer> types = fRepSvc.getTypeDescendants(
- repositoryId, BaseObjectTypeIds.CMIS_DOCUMENT.value(), BigInteger.valueOf(depth), Boolean.TRUE, null);
+ repositoryId, BaseTypeId.CMIS_DOCUMENT.value(), BigInteger.valueOf(depth), Boolean.TRUE, null);
assertNotNull(types);
log.info("Found in repository " + repositoryId + " " + types.size() + " type(s) with depth "
+ depth + ".");
@@ -220,15 +220,15 @@ public class RepositoryServiceTest exten
for (TypeDefinitionContainer type : types) {
TypeDefinition typeDef = type.getTypeDefinition();
log.info("Found type: " + typeDef.getId() + ", display name is: " + typeDef.getDisplayName());
- log.info(" Base type is: " + typeDef.getBaseId());
+ log.info(" Base type is: " + typeDef.getBaseTypeId());
log.info(" Number of children types is: " + type.getChildren().size());
containsAllBasePropertyDefinitions(typeDef);
}
int totalSize = getRecursiveSize(types);
assertEquals(4, totalSize); // all RepositoryTestTypeSystemCreator types minus one in level two plus cmis.docment
- assertFalse(containsTypeByIdRecursive(BaseObjectTypeIds.CMIS_DOCUMENT.value(), types));
- assertFalse(containsTypeByIdRecursive(BaseObjectTypeIds.CMIS_FOLDER.value(), types));
+ assertFalse(containsTypeByIdRecursive(BaseTypeId.CMIS_DOCUMENT.value(), types));
+ assertFalse(containsTypeByIdRecursive(BaseTypeId.CMIS_FOLDER.value(), types));
assertTrue(containsTypeByIdRecursive("MyDocType1", types));
assertTrue(containsTypeByIdRecursive("MyDocType2", types));
@@ -240,7 +240,7 @@ public class RepositoryServiceTest exten
TypeDefinition typeDef = type.getTypeDefinition();
assertNotNull(typeDef);
assertNotNull(typeDef.getId());
- assertNotNull(typeDef.getBaseId());
+ assertNotNull(typeDef.getBaseTypeId());
}
log.info("... testGetAllTypesLimitedDepth() finished.");
@@ -271,9 +271,9 @@ public class RepositoryServiceTest exten
TypeDefinition typeDef = type.getTypeDefinition();
assertNotNull(typeDef);
assertNotNull(typeDef.getId());
- assertNotNull(typeDef.getBaseId());
+ assertNotNull(typeDef.getBaseTypeId());
log.info("Found type: " + typeDef.getId() + ", display name is: " + typeDef.getDisplayName());
- log.info(" Base type is: " + typeDef.getBaseId());
+ log.info(" Base type is: " + typeDef.getBaseTypeId());
log.info(" Number of children types is: " + type.getChildren().size());
containsAllBasePropertyDefinitions(typeDef);
}
@@ -286,7 +286,7 @@ public class RepositoryServiceTest exten
log.info("");
log.info("starting testGetTypesWithoutProperties()...");
String repositoryId = getRepositoryId();
- String typeId = BaseObjectTypeIds.CMIS_DOCUMENT.value();
+ String typeId = BaseTypeId.CMIS_DOCUMENT.value();
// get types
List<TypeDefinitionContainer> types = fRepSvc.getTypeDescendants(
@@ -305,7 +305,7 @@ public class RepositoryServiceTest exten
TypeDefinition typeDef = typeWithProps.getTypeDefinition();
Map<String, PropertyDefinition<?>> propDefs = typeDef.getPropertyDefinitions();
log.info("Found type: " + typeDef.getId() + ", display name is: " + typeDef.getDisplayName());
- log.info(" Base type is: " + typeDef.getBaseId());
+ log.info(" Base type is: " + typeDef.getBaseTypeId());
log.info(" Number of properties is: " + (propDefs==null ? 0 : propDefs.size()));
assertTrue(propDefs==null || propDefs.size()==0);
log.info("... testGetTypesWithoutProperties() finished.");
@@ -520,7 +520,7 @@ public class RepositoryServiceTest exten
private void containsAllBasePropertyDefinitions(TypeDefinition typeDef) {
Map<String, PropertyDefinition<?>> propDefs = typeDef.getPropertyDefinitions();
- String baseTypeId = typeDef.getBaseId().value();
+ String baseTypeId = typeDef.getBaseTypeId().value();
assertTrue(propDefs.containsKey(PropertyIds.NAME));
assertTrue(propDefs.containsKey(PropertyIds.OBJECT_ID));
@@ -532,7 +532,7 @@ public class RepositoryServiceTest exten
assertTrue(propDefs.containsKey(PropertyIds.LAST_MODIFICATION_DATE));
assertTrue(propDefs.containsKey(PropertyIds.CHANGE_TOKEN));
- if (baseTypeId.equals(BaseObjectTypeIds.CMIS_DOCUMENT.value())) {
+ if (baseTypeId.equals(BaseTypeId.CMIS_DOCUMENT.value())) {
assertTrue(propDefs.containsKey(PropertyIds.IS_IMMUTABLE));
assertTrue(propDefs.containsKey(PropertyIds.IS_LATEST_VERSION));
assertTrue(propDefs.containsKey(PropertyIds.IS_MAJOR_VERSION));
@@ -548,13 +548,13 @@ public class RepositoryServiceTest exten
assertTrue(propDefs.containsKey(PropertyIds.CONTENT_STREAM_FILE_NAME));
assertTrue(propDefs.containsKey(PropertyIds.CONTENT_STREAM_ID));
assertTrue(propDefs.containsKey(PropertyIds.CHANGE_TOKEN));
- } else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_FOLDER.value())) {
+ } else if (baseTypeId.equals(BaseTypeId.CMIS_FOLDER.value())) {
assertTrue(propDefs.containsKey(PropertyIds.PARENT_ID));
assertTrue(propDefs.containsKey(PropertyIds.ALLOWED_CHILD_OBJECT_TYPE_IDS));
assertTrue(propDefs.containsKey(PropertyIds.PATH));
- } else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_POLICY.value())) {
+ } else if (baseTypeId.equals(BaseTypeId.CMIS_POLICY.value())) {
assertTrue(propDefs.containsKey(PropertyIds.POLICY_TEXT));
- } else if (baseTypeId.equals(BaseObjectTypeIds.CMIS_RELATIONSHIP.value())) {
+ } else if (baseTypeId.equals(BaseTypeId.CMIS_RELATIONSHIP.value())) {
assertTrue(propDefs.containsKey(PropertyIds.SOURCE_ID));
assertTrue(propDefs.containsKey(PropertyIds.TARGET_ID));
} else
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-inmemory/src/test/java/org/apache/chemistry/opencmis/inmemory/VersioningTest.java Fri Apr 16 09:59:18 2010
@@ -45,7 +45,7 @@ import org.apache.chemistry.opencmis.com
import org.apache.chemistry.opencmis.commons.api.PropertyIdData;
import org.apache.chemistry.opencmis.commons.api.PropertyStringData;
import org.apache.chemistry.opencmis.commons.api.TypeDefinition;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
import org.apache.chemistry.opencmis.commons.exceptions.CmisConstraintException;
@@ -442,7 +442,7 @@ public class VersioningTest extends Abst
List<PropertyData<?>> properties = new ArrayList<PropertyData<?>>();
properties.add(fFactory.createPropertyIdData(PropertyIds.NAME, "Folder " + i));
properties.add(fFactory.createPropertyIdData(PropertyIds.OBJECT_TYPE_ID,
- BaseObjectTypeIds.CMIS_FOLDER.value()));
+ BaseTypeId.CMIS_FOLDER.value()));
PropertiesData props = fFactory.createPropertiesData(properties);
String id = fObjSvc.createFolder(fRepositoryId, props, fRootFolderId, null, null, null, null);
res[i] = id;
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfo.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfo.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfo.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfo.java Fri Apr 16 09:59:18 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se
import java.util.GregorianCalendar;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
/**
* This class contains information about an object. This data is used to generate the appropriate
@@ -65,7 +65,7 @@ public interface ObjectInfo {
/**
* Returns the base type.
*/
- BaseObjectTypeIds getBaseType();
+ BaseTypeId getBaseType();
/**
* Returns <code>true</code> if the object is a document and if it is the current version or it is
Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfoImpl.java
URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfoImpl.java?rev=934728&r1=934727&r2=934728&view=diff
==============================================================================
--- incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfoImpl.java (original)
+++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-spi/src/main/java/org/apache/chemistry/opencmis/server/spi/ObjectInfoImpl.java Fri Apr 16 09:59:18 2010
@@ -21,7 +21,7 @@ package org.apache.chemistry.opencmis.se
import java.util.GregorianCalendar;
import java.util.List;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
/**
* Implementation of the {@link ObjectInfo} interface.
@@ -37,7 +37,7 @@ public class ObjectInfoImpl implements O
private GregorianCalendar fCreationDate;
private GregorianCalendar fLastModificationDate;
private String fTypeId;
- private BaseObjectTypeIds fBaseObjectTypeId;
+ private BaseTypeId fBaseObjectTypeId;
private boolean fIsCurrentVersion = true;
private String fVersionSeriesId = null;
private String fWorkingCopyId = null;
@@ -58,7 +58,7 @@ public class ObjectInfoImpl implements O
public ObjectInfoImpl() {
}
- public ObjectInfoImpl(String id, BaseObjectTypeIds baseObjectTypeId) {
+ public ObjectInfoImpl(String id, BaseTypeId baseObjectTypeId) {
fId = id;
fBaseObjectTypeId = baseObjectTypeId;
}
@@ -111,11 +111,11 @@ public class ObjectInfoImpl implements O
fTypeId = typeId;
}
- public BaseObjectTypeIds getBaseType() {
+ public BaseTypeId getBaseType() {
return fBaseObjectTypeId;
}
- public void setBaseType(BaseObjectTypeIds baseObjectTypeId) {
+ public void setBaseType(BaseTypeId baseObjectTypeId) {
fBaseObjectTypeId = baseObjectTypeId;
}
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=934728&r1=934727&r2=934728&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 09:59:18 2010
@@ -39,7 +39,7 @@ import org.apache.chemistry.opencmis.com
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.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.CapabilityAcl;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.server.spi.CallContext;
@@ -184,9 +184,9 @@ public class ObjectInfoHelper
TypeDefinitionList children = _repSvc.getTypeChildren(context, repositoryId, null, false,
BigInteger.valueOf(100), BigInteger.ZERO, null);
for (TypeDefinition typeDefinition : children.getList()) {
- if (typeDefinition.getId().equals(BaseObjectTypeIds.CMIS_RELATIONSHIP))
+ if (typeDefinition.getId().equals(BaseTypeId.CMIS_RELATIONSHIP))
supportsRelationships = true;
- if (typeDefinition.getId().equals(BaseObjectTypeIds.CMIS_POLICY))
+ if (typeDefinition.getId().equals(BaseTypeId.CMIS_POLICY))
supportsPolicies = true;
}
_mapRelationships.put(repositoryId, supportsRelationships);
@@ -202,7 +202,7 @@ public class ObjectInfoHelper
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));
+ objInfo.setBaseType(BaseTypeId.fromValue(baseId));
boolean isVersioned = getStringProperty(properties, PropertyIds.VERSION_SERIES_ID) != null;
// versioning information:
@@ -233,9 +233,9 @@ public class ObjectInfoHelper
objInfo.setFileName(null);
}
- if (objInfo.getBaseType() == BaseObjectTypeIds.CMIS_FOLDER)
+ if (objInfo.getBaseType() == BaseTypeId.CMIS_FOLDER)
objInfo.setHasParent(getStringProperty(properties, PropertyIds.PARENT_ID) != null);
- else if (objInfo.getBaseType() == BaseObjectTypeIds.CMIS_DOCUMENT) {
+ else if (objInfo.getBaseType() == BaseTypeId.CMIS_DOCUMENT) {
if (repoCaps.isUnfilingSupported())
objInfo.setHasParent(documentHasParent(context, repositoryId, objData.getId()));
else
@@ -260,7 +260,7 @@ public class ObjectInfoHelper
objInfo.setHasAcl(repoCaps.getAclCapability() != CapabilityAcl.NONE);
String baseTypeId = getStringProperty(properties, PropertyIds.BASE_TYPE_ID);
- boolean isFolder = baseTypeId != null && baseTypeId.equals(BaseObjectTypeIds.CMIS_FOLDER.value());
+ boolean isFolder = baseTypeId != null && baseTypeId.equals(BaseTypeId.CMIS_FOLDER.value());
objInfo.setSupportsDescendants(isFolder && repoCaps.isGetDescendantsSupported());;
objInfo.setSupportsFolderTree(isFolder && repoCaps.isGetFolderTreeSupported());
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=934728&r1=934727&r2=934728&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 09:59:18 2010
@@ -31,7 +31,7 @@ import org.apache.chemistry.opencmis.cli
import org.apache.chemistry.opencmis.client.api.util.Container;
import org.apache.chemistry.opencmis.client.api.util.PagingList;
import org.apache.chemistry.opencmis.commons.api.RepositoryInfo;
-import org.apache.chemistry.opencmis.commons.enums.BaseObjectTypeIds;
+import org.apache.chemistry.opencmis.commons.enums.BaseTypeId;
import org.apache.chemistry.opencmis.fit.SessionFactory;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -96,11 +96,11 @@ public abstract class AbstractSampleIT {
// check document type definition
ObjectType documentType = getSession().getTypeDefinition(documentBaseId);
- checkBaseType(documentBaseId, BaseObjectTypeIds.CMIS_DOCUMENT, documentType);
+ checkBaseType(documentBaseId, BaseTypeId.CMIS_DOCUMENT, documentType);
// check folder type definition
ObjectType folderType = getSession().getTypeDefinition(folderBaseId);
- checkBaseType(folderBaseId, BaseObjectTypeIds.CMIS_FOLDER, folderType);
+ checkBaseType(folderBaseId, BaseTypeId.CMIS_FOLDER, folderType);
// get base types via getTypesChildren
PagingList<ObjectType> baseTypes = getSession().getTypeChildren(null, true, 10);
@@ -157,7 +157,7 @@ public abstract class AbstractSampleIT {
/**
* Checks a base type.
*/
- private void checkBaseType(String id, BaseObjectTypeIds baseType, ObjectType objectType) {
+ private void checkBaseType(String id, BaseTypeId baseType, ObjectType objectType) {
assertNotNull(objectType);
if (id != null) {
assertEquals(id, objectType.getId());
@@ -167,8 +167,8 @@ public abstract class AbstractSampleIT {
}
assertTrue(objectType.isBaseType());
assertNull(objectType.getBaseType());
- assertNull(objectType.getParent());
- assertNotNull(objectType.getPropertyDefintions());
- assertFalse(objectType.getPropertyDefintions().isEmpty());
+ assertNull(objectType.getParentType());
+ assertNotNull(objectType.getPropertyDefinitions());
+ assertFalse(objectType.getPropertyDefinitions().isEmpty());
}
}
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=934728&r1=934727&r2=934728&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 09:59:18 2010
@@ -36,7 +36,7 @@ import org.apache.chemistry.opencmis.com
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.enums.BaseTypeId;
import org.apache.chemistry.opencmis.commons.exceptions.CmisBaseException;
public class ObjGenApp {
@@ -106,9 +106,9 @@ public class ObjGenApp {
fCmd = parser.accepts(CMD).withRequiredArg().describedAs("Command to perform (see below)");
fRepoId = parser.accepts(REPOSITORY_ID).withOptionalArg().describedAs("Repository used");
fDocType = parser.accepts(FILLER_DOCUMENT_TYPE_ID).withOptionalArg().defaultsTo(
- BaseObjectTypeIds.CMIS_DOCUMENT.value()).describedAs("Document type created");
+ BaseTypeId.CMIS_DOCUMENT.value()).describedAs("Document type created");
fFolderType = parser.accepts(FILLER_FOLDER_TYPE_ID).withOptionalArg().defaultsTo(
- BaseObjectTypeIds.CMIS_FOLDER.value()).describedAs("Folder type created");
+ BaseTypeId.CMIS_FOLDER.value()).describedAs("Folder type created");
fDocsPerFolder = parser.accepts(FILLER_DOCS_PER_FOLDER).withOptionalArg().ofType(Integer.class)
.describedAs("Documents on each level").defaultsTo(1);
fFolderPerFolder = parser.accepts(FILLER_FOLDERS_PER_FOLDER).withOptionalArg().ofType(
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=934728&r1=934727&r2=934728&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 09:59:18 2010
@@ -41,7 +41,7 @@ import org.apache.chemistry.opencmis.com
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.BaseTypeId;
import org.apache.chemistry.opencmis.commons.enums.IncludeRelationships;
import org.apache.chemistry.opencmis.commons.enums.UnfileObjects;
import org.apache.chemistry.opencmis.commons.enums.VersioningState;
@@ -78,12 +78,12 @@ public class ObjectGenerator {
/**
* The type id of the document id that is created.
*/
- private String fDocTypeId = BaseObjectTypeIds.CMIS_DOCUMENT.value();
+ private String fDocTypeId = BaseTypeId.CMIS_DOCUMENT.value();
/**
* The type id of the folder that is created.
*/
- private String fFolderTypeId = BaseObjectTypeIds.CMIS_FOLDER.value();
+ private String fFolderTypeId = BaseTypeId.CMIS_FOLDER.value();
/**
* A list of property ids. For each element in this list a String property value
@@ -246,7 +246,7 @@ public class ObjectGenerator {
for (int i=0; i<children.size(); i++) {
ObjectData child = children.get(i).getObject();
docId = (String) child.getProperties().getProperties().get(PropertyIds.OBJECT_ID).getFirstValue();
- if (child.getBaseTypeId().equals(BaseObjectTypeIds.CMIS_DOCUMENT)) {
+ if (child.getBaseTypeId().equals(BaseTypeId.CMIS_DOCUMENT)) {
if (numDocsFound == index)
return docId;
else
@@ -551,10 +551,10 @@ public class ObjectGenerator {
+ folder.getPathSegment());
dumpObjectProperties(folder.getObject(), depth, propertyFilter, !allRequiredPropertiesArePresent);
String objectTypeBaseId = folder.getObject().getBaseTypeId().value();
- if (objectTypeBaseId.equals(BaseObjectTypeIds.CMIS_FOLDER.value())) {
+ if (objectTypeBaseId.equals(BaseTypeId.CMIS_FOLDER.value())) {
dumpFolder(folder.getObject().getId(), propertyFilter, depth+1);
}
- else if (objectTypeBaseId.equals(BaseObjectTypeIds.CMIS_DOCUMENT.value())) {
+ else if (objectTypeBaseId.equals(BaseTypeId.CMIS_DOCUMENT.value())) {
dumpObjectProperties(folder.getObject(), depth+1, propertyFilter, !allRequiredPropertiesArePresent);
}
}