Merge from SEAMIST3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2008-09-04 11:25:34 +00:00
parent 385ea356c4
commit 40bb33b90e
95 changed files with 5392 additions and 2278 deletions

View File

@@ -36,7 +36,6 @@ import javax.xml.datatype.XMLGregorianCalendar;
import org.alfresco.cmis.CMISService;
import org.alfresco.cmis.dictionary.CMISDictionaryService;
import org.alfresco.cmis.dictionary.CMISMapping;
import org.alfresco.cmis.property.CMISPropertyNameMapping;
import org.alfresco.cmis.property.CMISPropertyService;
import org.alfresco.cmis.search.CMISQueryService;
import org.alfresco.error.AlfrescoRuntimeException;
@@ -108,7 +107,7 @@ public class DMAbstractServicePort
if (filter.allow(name) && value != null)
{
PropertyBooleanType propBoolean = new PropertyBooleanType();
propBoolean.setName(CMISPropertyNameMapping.getWebServiceName(name));
propBoolean.setName(name);
propBoolean.setValue((Boolean) value);
properties.getPropertyBoolean().add(propBoolean);
}
@@ -120,7 +119,7 @@ public class DMAbstractServicePort
if (filter.allow(name) && value != null)
{
PropertyDateTimeType propDateTime = new PropertyDateTimeType();
propDateTime.setName(CMISPropertyNameMapping.getWebServiceName(name));
propDateTime.setName(name);
propDateTime.setValue(convert((Date) value));
properties.getPropertyDateTime().add(propDateTime);
}
@@ -132,7 +131,7 @@ public class DMAbstractServicePort
if (filter.allow(name) && value != null)
{
PropertyIDType propID = new PropertyIDType();
propID.setName(CMISPropertyNameMapping.getWebServiceName(name));
propID.setName(name);
propID.setValue(value.toString());
properties.getPropertyID().add(propID);
}
@@ -144,7 +143,7 @@ public class DMAbstractServicePort
if (filter.allow(name) && value != null)
{
PropertyIntegerType propInteger = new PropertyIntegerType();
propInteger.setName(CMISPropertyNameMapping.getWebServiceName(name));
propInteger.setName(name);
propInteger.setValue(BigInteger.valueOf((Long) value));
properties.getPropertyInteger().add(propInteger);
}
@@ -156,7 +155,7 @@ public class DMAbstractServicePort
if (filter.allow(name) && value != null)
{
PropertyStringType propString = new PropertyStringType();
propString.setName(CMISPropertyNameMapping.getWebServiceName(name));
propString.setName(name);
propString.setValue(value.toString());
properties.getPropertyString().add(propString);
}
@@ -179,7 +178,7 @@ public class DMAbstractServicePort
if (filter.allow(name) && value != null)
{
PropertyURIType propString = new PropertyURIType();
propString.setName(CMISPropertyNameMapping.getWebServiceName(name));
propString.setName(name);
propString.setValue(value.toString());
properties.getPropertyURI().add(propString);
}
@@ -205,7 +204,7 @@ public class DMAbstractServicePort
addBooleanProperty(properties, filter, CMISMapping.PROP_IS_LATEST_VERSION, nodeRef);
addBooleanProperty(properties, filter, CMISMapping.PROP_IS_MAJOR_VERSION, nodeRef);
addBooleanProperty(properties, filter, CMISMapping.PROP_IS_LATEST_MAJOR_VERSION, nodeRef);
addBooleanProperty(properties, filter, CMISMapping.PROP_VERSION_SERIES_IS_CHECKED_OUT, nodeRef);
addBooleanProperty(properties, filter, CMISMapping.PROP_IS_VERSION_SERIES_CHECKED_OUT, nodeRef);
addDateTimeProperty(properties, filter, CMISMapping.PROP_CREATION_DATE, nodeRef);
addDateTimeProperty(properties, filter, CMISMapping.PROP_LAST_MODIFICATION_DATE, nodeRef);
addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_ID, nodeRef);
@@ -229,7 +228,7 @@ public class DMAbstractServicePort
addDateTimeProperty(properties, filter, CMISMapping.PROP_CREATION_DATE, nodeRef);
addDateTimeProperty(properties, filter, CMISMapping.PROP_LAST_MODIFICATION_DATE, nodeRef);
addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_ID, nodeRef);
addIDProperty(properties, filter, CMISMapping.PROP_PARENT, nodeRef);
addIDProperty(properties, filter, CMISMapping.PROP_PARENT_ID, nodeRef);
addStringProperty(properties, filter, CMISMapping.PROP_NAME, nodeRef);
addStringProperty(properties, filter, "baseType", "folder");
addIDProperty(properties, filter, CMISMapping.PROP_OBJECT_TYPE_ID, nodeRef);

View File

@@ -27,7 +27,7 @@ package org.alfresco.repo.cmis.ws;
import java.math.BigInteger;
import java.util.List;
import org.alfresco.cmis.CMISService.TypesFilter;
import org.alfresco.cmis.CMISTypesFilterEnum;
import org.alfresco.cmis.dictionary.CMISMapping;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -75,15 +75,15 @@ public class DMNavigationServicePort extends DMAbstractServicePort implements Na
switch (parameters.getType())
{
case DOCUMENTS:
listing = cmisService.getChildren(folderNodeRef, TypesFilter.Documents);
listing = cmisService.getChildren(folderNodeRef, CMISTypesFilterEnum.DOCUMENTS);
break;
case FOLDERS:
listing = cmisService.getChildren(folderNodeRef, TypesFilter.Folders);
listing = cmisService.getChildren(folderNodeRef, CMISTypesFilterEnum.FOLDERS);
break;
case POLICIES:
throw new OperationNotSupportedException("Policies listing isn't supported", ExceptionUtils.createBasicFault(null, "Policies listing isn't supported"));
case ANY:
listing = cmisService.getChildren(folderNodeRef, TypesFilter.Any);
listing = cmisService.getChildren(folderNodeRef, CMISTypesFilterEnum.ANY);
break;
}

View File

@@ -31,15 +31,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.alfresco.cmis.dictionary.CMISCardinality;
import org.alfresco.cmis.CMISCardinalityEnum;
import org.alfresco.cmis.CMISContentStreamAllowedEnum;
import org.alfresco.cmis.CMISFullTextSearchEnum;
import org.alfresco.cmis.CMISJoinEnum;
import org.alfresco.cmis.CMISPropertyTypeEnum;
import org.alfresco.cmis.CMISUpdatabilityEnum;
import org.alfresco.cmis.dictionary.CMISPropertyDefinition;
import org.alfresco.cmis.dictionary.CMISPropertyType;
import org.alfresco.cmis.dictionary.CMISTypeDefinition;
import org.alfresco.cmis.dictionary.CMISTypeId;
import org.alfresco.cmis.dictionary.CMISUpdatability;
import org.alfresco.cmis.dictionary.ContentStreamAllowed;
import org.alfresco.cmis.search.FullTextSearchSupport;
import org.alfresco.cmis.search.JoinSupport;
import org.alfresco.service.descriptor.Descriptor;
/**
@@ -51,49 +51,49 @@ import org.alfresco.service.descriptor.Descriptor;
@javax.jws.WebService(name = "RepositoryServicePort", serviceName = "RepositoryService", portName = "RepositoryServicePort", targetNamespace = "http://www.cmis.org/ns/1.0", endpointInterface = "org.alfresco.repo.cmis.ws.RepositoryServicePort")
public class DMRepositoryServicePort extends DMAbstractServicePort implements RepositoryServicePort
{
private static Map<FullTextSearchSupport, FulltextEnum> fulltextEnumMapping;
private static Map<JoinSupport, JoinEnum> joinEnumMapping;
private static Map<ContentStreamAllowed, ContentStreamAllowedEnum> contentStreamAllowedEnumMapping;
private static Map<CMISUpdatability, UpdatabilityEnum> updatabilityEnumMapping;
private static Map<CMISCardinality, CardinalityEnum> cardinalityEnumMapping;
private static Map<CMISPropertyType, PropertyTypeEnum> propertyTypeEnumMapping;
private static Map<CMISFullTextSearchEnum, FulltextEnum> fulltextEnumMapping;
private static Map<CMISJoinEnum, JoinEnum> joinEnumMapping;
private static Map<CMISContentStreamAllowedEnum, ContentStreamAllowedEnum> contentStreamAllowedEnumMapping;
private static Map<CMISUpdatabilityEnum, UpdatabilityEnum> updatabilityEnumMapping;
private static Map<CMISCardinalityEnum, CardinalityEnum> cardinalityEnumMapping;
private static Map<CMISPropertyTypeEnum, PropertyTypeEnum> propertyTypeEnumMapping;
static
{
fulltextEnumMapping = new HashMap<FullTextSearchSupport, FulltextEnum>();
fulltextEnumMapping.put(FullTextSearchSupport.NO_FULL_TEXT, FulltextEnum.NO_FULLTEXT);
fulltextEnumMapping.put(FullTextSearchSupport.FULL_TEXT_ONLY, FulltextEnum.FULLTEXT_ONLY);
fulltextEnumMapping.put(FullTextSearchSupport.FULL_TEXT_AND_STRUCTURED, FulltextEnum.FULLTEXT_AND_STRUCTURED);
fulltextEnumMapping = new HashMap<CMISFullTextSearchEnum, FulltextEnum>();
fulltextEnumMapping.put(CMISFullTextSearchEnum.NO_FULL_TEXT, FulltextEnum.NO_FULLTEXT);
fulltextEnumMapping.put(CMISFullTextSearchEnum.FULL_TEXT_ONLY, FulltextEnum.FULLTEXT_ONLY);
fulltextEnumMapping.put(CMISFullTextSearchEnum.FULL_TEXT_AND_STRUCTURED, FulltextEnum.FULLTEXT_AND_STRUCTURED);
joinEnumMapping = new HashMap<JoinSupport, JoinEnum>();
joinEnumMapping.put(JoinSupport.INNER_AND_OUTER_JOIN_SUPPORT, JoinEnum.INNER_AND_OUTER);
joinEnumMapping.put(JoinSupport.INNER_JOIN_SUPPORT, JoinEnum.INNER_ONLY);
joinEnumMapping.put(JoinSupport.NO_JOIN_SUPPORT, JoinEnum.NO_JOIN);
joinEnumMapping = new HashMap<CMISJoinEnum, JoinEnum>();
joinEnumMapping.put(CMISJoinEnum.INNER_AND_OUTER_JOIN_SUPPORT, JoinEnum.INNER_AND_OUTER);
joinEnumMapping.put(CMISJoinEnum.INNER_JOIN_SUPPORT, JoinEnum.INNER_ONLY);
joinEnumMapping.put(CMISJoinEnum.NO_JOIN_SUPPORT, JoinEnum.NO_JOIN);
contentStreamAllowedEnumMapping = new HashMap<ContentStreamAllowed, ContentStreamAllowedEnum>();
contentStreamAllowedEnumMapping.put(ContentStreamAllowed.ALLOWED, ContentStreamAllowedEnum.ALLOWED);
contentStreamAllowedEnumMapping.put(ContentStreamAllowed.NOT_ALLOWED, ContentStreamAllowedEnum.NOT_ALLOWED);
contentStreamAllowedEnumMapping.put(ContentStreamAllowed.REQUIRED, ContentStreamAllowedEnum.REQUIRED);
contentStreamAllowedEnumMapping = new HashMap<CMISContentStreamAllowedEnum, ContentStreamAllowedEnum>();
contentStreamAllowedEnumMapping.put(CMISContentStreamAllowedEnum.ALLOWED, ContentStreamAllowedEnum.ALLOWED);
contentStreamAllowedEnumMapping.put(CMISContentStreamAllowedEnum.NOT_ALLOWED, ContentStreamAllowedEnum.NOT_ALLOWED);
contentStreamAllowedEnumMapping.put(CMISContentStreamAllowedEnum.REQUIRED, ContentStreamAllowedEnum.REQUIRED);
updatabilityEnumMapping = new HashMap<CMISUpdatability, UpdatabilityEnum>();
updatabilityEnumMapping.put(CMISUpdatability.READ_AND_WRITE, UpdatabilityEnum.READ_WRITE);
updatabilityEnumMapping.put(CMISUpdatability.READ_AND_WRITE_WHEN_CHECKED_OUT, UpdatabilityEnum.READ_WRITE_WHEN_CHECKED_OUT);
updatabilityEnumMapping.put(CMISUpdatability.READ_ONLY, UpdatabilityEnum.READ_ONLY);
updatabilityEnumMapping = new HashMap<CMISUpdatabilityEnum, UpdatabilityEnum>();
updatabilityEnumMapping.put(CMISUpdatabilityEnum.READ_AND_WRITE, UpdatabilityEnum.READ_WRITE);
updatabilityEnumMapping.put(CMISUpdatabilityEnum.READ_AND_WRITE_WHEN_CHECKED_OUT, UpdatabilityEnum.READ_WRITE_WHEN_CHECKED_OUT);
updatabilityEnumMapping.put(CMISUpdatabilityEnum.READ_ONLY, UpdatabilityEnum.READ_ONLY);
cardinalityEnumMapping = new HashMap<CMISCardinality, CardinalityEnum>();
cardinalityEnumMapping.put(CMISCardinality.MULTI_VALUED, CardinalityEnum.MULTI_VALUED);
cardinalityEnumMapping.put(CMISCardinality.SINGLE_VALUED, CardinalityEnum.SINGLE_VALUED);
cardinalityEnumMapping = new HashMap<CMISCardinalityEnum, CardinalityEnum>();
cardinalityEnumMapping.put(CMISCardinalityEnum.MULTI_VALUED, CardinalityEnum.MULTI_VALUED);
cardinalityEnumMapping.put(CMISCardinalityEnum.SINGLE_VALUED, CardinalityEnum.SINGLE_VALUED);
propertyTypeEnumMapping = new HashMap<CMISPropertyType, PropertyTypeEnum>();
propertyTypeEnumMapping.put(CMISPropertyType.Boolean, PropertyTypeEnum.BOOLEAN);
propertyTypeEnumMapping.put(CMISPropertyType.DateTime, PropertyTypeEnum.DATE_TIME);
propertyTypeEnumMapping.put(CMISPropertyType.Decimal, PropertyTypeEnum.DECIMAL);
propertyTypeEnumMapping.put(CMISPropertyType.HTML, PropertyTypeEnum.HTML);
propertyTypeEnumMapping.put(CMISPropertyType.ID, PropertyTypeEnum.ID);
propertyTypeEnumMapping.put(CMISPropertyType.Integer, PropertyTypeEnum.INTEGER);
propertyTypeEnumMapping.put(CMISPropertyType.String, PropertyTypeEnum.STRING);
propertyTypeEnumMapping.put(CMISPropertyType.URI, PropertyTypeEnum.URI);
propertyTypeEnumMapping.put(CMISPropertyType.XML, PropertyTypeEnum.XML);
propertyTypeEnumMapping = new HashMap<CMISPropertyTypeEnum, PropertyTypeEnum>();
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.BOOLEAN, PropertyTypeEnum.BOOLEAN);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.DATETIME, PropertyTypeEnum.DATE_TIME);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.DECIMAL, PropertyTypeEnum.DECIMAL);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.HTML, PropertyTypeEnum.HTML);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.ID, PropertyTypeEnum.ID);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.INTEGER, PropertyTypeEnum.INTEGER);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.STRING, PropertyTypeEnum.STRING);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.URI, PropertyTypeEnum.URI);
propertyTypeEnumMapping.put(CMISPropertyTypeEnum.XML, PropertyTypeEnum.XML);
}
public List<RepositoryType> getRepositories() throws RuntimeException, InvalidArgumentException, OperationNotSupportedException, UpdateConflictException,
@@ -102,7 +102,6 @@ public class DMRepositoryServicePort extends DMAbstractServicePort implements Re
RepositoryType repositoryType = new RepositoryType();
Descriptor serverDescriptor = descriptorService.getCurrentRepositoryDescriptor();
repositoryType.setRepositoryID(serverDescriptor.getId());
System.out.println("**** ID: " + serverDescriptor.getId());
repositoryType.setRepositoryName(serverDescriptor.getName());
return Collections.singletonList(repositoryType);
}