Cleanly split CMIS interfaces from CMIS implementation.

- org.alfresco.cmis => public interfaces
- org.alfresco.cmis.mapping / dictionary / search => implementation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-04-02 13:50:10 +00:00
parent 0f33af5dc1
commit 3205b2c98c
21 changed files with 59 additions and 59 deletions

View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.rest;
import java.util.List; import java.util.List;
import org.alfresco.cmis.CMISService; import org.alfresco.cmis.CMISServices;
import org.alfresco.cmis.CMISTypesFilterEnum; import org.alfresco.cmis.CMISTypesFilterEnum;
import org.alfresco.repo.template.TemplateNode; import org.alfresco.repo.template.TemplateNode;
import org.alfresco.repo.web.scripts.RepositoryImageResolver; import org.alfresco.repo.web.scripts.RepositoryImageResolver;
@@ -51,14 +51,14 @@ import freemarker.template.TemplateScalarModel;
*/ */
public class CMISChildrenMethod implements TemplateMethodModelEx public class CMISChildrenMethod implements TemplateMethodModelEx
{ {
private CMISService cmisService; private CMISServices cmisService;
private ServiceRegistry serviceRegistry; private ServiceRegistry serviceRegistry;
private TemplateImageResolver imageResolver; private TemplateImageResolver imageResolver;
/** /**
* Construct * Construct
*/ */
public CMISChildrenMethod(CMISService cmisService, ServiceRegistry serviceRegistry, RepositoryImageResolver imageResolver) public CMISChildrenMethod(CMISServices cmisService, ServiceRegistry serviceRegistry, RepositoryImageResolver imageResolver)
{ {
this.cmisService = cmisService; this.cmisService = cmisService;
this.serviceRegistry = serviceRegistry; this.serviceRegistry = serviceRegistry;

View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.rest;
import java.util.List; import java.util.List;
import org.alfresco.cmis.CMISService; import org.alfresco.cmis.CMISServices;
import org.alfresco.repo.template.TemplateNode; import org.alfresco.repo.template.TemplateNode;
import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeanModel;
@@ -45,12 +45,12 @@ import freemarker.template.TemplateScalarModel;
*/ */
public final class CMISPropertyValueMethod implements TemplateMethodModelEx public final class CMISPropertyValueMethod implements TemplateMethodModelEx
{ {
private CMISService cmisService; private CMISServices cmisService;
/** /**
* Construct * Construct
*/ */
public CMISPropertyValueMethod(CMISService cmisService) public CMISPropertyValueMethod(CMISServices cmisService)
{ {
this.cmisService = cmisService; this.cmisService = cmisService;
} }

View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.rest;
import java.util.List; import java.util.List;
import org.alfresco.cmis.search.CMISResultSet; import org.alfresco.cmis.CMISResultSet;
import org.alfresco.repo.web.scripts.RepositoryImageResolver; import org.alfresco.repo.web.scripts.RepositoryImageResolver;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.cmr.repository.TemplateImageResolver;

View File

@@ -27,17 +27,17 @@ package org.alfresco.repo.cmis.rest;
import java.util.Collection; import java.util.Collection;
import java.util.Iterator; import java.util.Iterator;
import org.alfresco.cmis.CMISDictionaryService;
import org.alfresco.cmis.CMISFullTextSearchEnum; import org.alfresco.cmis.CMISFullTextSearchEnum;
import org.alfresco.cmis.CMISJoinEnum; import org.alfresco.cmis.CMISJoinEnum;
import org.alfresco.cmis.CMISPropertyDefinition;
import org.alfresco.cmis.CMISQueryEnum; import org.alfresco.cmis.CMISQueryEnum;
import org.alfresco.cmis.CMISService; import org.alfresco.cmis.CMISQueryOptions;
import org.alfresco.cmis.CMISQueryService;
import org.alfresco.cmis.CMISResultSet;
import org.alfresco.cmis.CMISServices;
import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.cmis.CMISTypesFilterEnum; import org.alfresco.cmis.CMISTypesFilterEnum;
import org.alfresco.cmis.dictionary.CMISDictionaryService;
import org.alfresco.cmis.dictionary.CMISPropertyDefinition;
import org.alfresco.cmis.dictionary.CMISTypeDefinition;
import org.alfresco.cmis.search.CMISQueryOptions;
import org.alfresco.cmis.search.CMISQueryService;
import org.alfresco.cmis.search.CMISResultSet;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.jscript.BaseScopableProcessorExtension; import org.alfresco.repo.jscript.BaseScopableProcessorExtension;
import org.alfresco.repo.jscript.ScriptNode; import org.alfresco.repo.jscript.ScriptNode;
@@ -60,7 +60,7 @@ public class CMISScript extends BaseScopableProcessorExtension
{ {
private ServiceRegistry services; private ServiceRegistry services;
private Repository repository; private Repository repository;
private CMISService cmisService; private CMISServices cmisService;
private CMISDictionaryService cmisDictionaryService; private CMISDictionaryService cmisDictionaryService;
private CMISQueryService cmisQueryService; private CMISQueryService cmisQueryService;
private Paging paging; private Paging paging;
@@ -101,7 +101,7 @@ public class CMISScript extends BaseScopableProcessorExtension
* *
* @param cmisService * @param cmisService
*/ */
public void setCMISService(CMISService cmisService) public void setCMISService(CMISServices cmisService)
{ {
this.cmisService = cmisService; this.cmisService = cmisService;
} }

View File

@@ -31,10 +31,10 @@ import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import org.alfresco.cmis.search.CMISResultSet; import org.alfresco.cmis.CMISResultSet;
import org.alfresco.cmis.search.CMISResultSetColumn; import org.alfresco.cmis.CMISResultSetColumn;
import org.alfresco.cmis.search.CMISResultSetMetaData; import org.alfresco.cmis.CMISResultSetMetaData;
import org.alfresco.cmis.search.CMISResultSetRow; import org.alfresco.cmis.CMISResultSetRow;
import org.alfresco.repo.template.TemplateNode; import org.alfresco.repo.template.TemplateNode;
import org.alfresco.service.ServiceRegistry; import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;

View File

@@ -26,8 +26,8 @@ package org.alfresco.repo.cmis.rest;
import java.util.List; import java.util.List;
import org.alfresco.cmis.dictionary.CMISDictionaryService; import org.alfresco.cmis.CMISDictionaryService;
import org.alfresco.cmis.dictionary.CMISTypeDefinition; import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.repo.template.TemplateNode; import org.alfresco.repo.template.TemplateNode;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;

View File

@@ -39,12 +39,12 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.XMLGregorianCalendar;
import org.alfresco.cmis.CMISService; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryService;
import org.alfresco.cmis.dictionary.CMISDictionaryService; import org.alfresco.cmis.CMISQueryService;
import org.alfresco.cmis.dictionary.CMISScope; import org.alfresco.cmis.CMISScope;
import org.alfresco.cmis.dictionary.CMISTypeDefinition; import org.alfresco.cmis.CMISServices;
import org.alfresco.cmis.search.CMISQueryService; import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.cmis.PropertyFilter; import org.alfresco.repo.cmis.PropertyFilter;
import org.alfresco.repo.cmis.ws.utils.CmisObjectsUtils; import org.alfresco.repo.cmis.ws.utils.CmisObjectsUtils;
@@ -83,7 +83,7 @@ public class DMAbstractServicePort
protected ObjectFactory cmisObjectFactory = new ObjectFactory(); protected ObjectFactory cmisObjectFactory = new ObjectFactory();
protected CMISDictionaryService cmisDictionaryService; protected CMISDictionaryService cmisDictionaryService;
protected CMISQueryService cmisQueryService; protected CMISQueryService cmisQueryService;
protected CMISService cmisService; protected CMISServices cmisService;
protected DescriptorService descriptorService; protected DescriptorService descriptorService;
protected NodeService nodeService; protected NodeService nodeService;
protected VersionService versionService; protected VersionService versionService;
@@ -93,7 +93,7 @@ public class DMAbstractServicePort
protected CmisObjectsUtils cmisObjectsUtils; protected CmisObjectsUtils cmisObjectsUtils;
public void setCmisService(CMISService cmisService) public void setCmisService(CMISServices cmisService)
{ {
this.cmisService = cmisService; this.cmisService = cmisService;
} }

View File

@@ -28,11 +28,11 @@ import java.io.Serializable;
import java.util.Map; import java.util.Map;
import org.alfresco.cmis.CMISDataTypeEnum; import org.alfresco.cmis.CMISDataTypeEnum;
import org.alfresco.cmis.search.CMISQueryOptions; import org.alfresco.cmis.CMISQueryOptions;
import org.alfresco.cmis.search.CMISResultSet; import org.alfresco.cmis.CMISResultSet;
import org.alfresco.cmis.search.CMISResultSetColumn; import org.alfresco.cmis.CMISResultSetColumn;
import org.alfresco.cmis.search.CMISResultSetMetaData; import org.alfresco.cmis.CMISResultSetMetaData;
import org.alfresco.cmis.search.CMISResultSetRow; import org.alfresco.cmis.CMISResultSetRow;
import org.alfresco.repo.cmis.PropertyFilter; import org.alfresco.repo.cmis.PropertyFilter;
/** /**

View File

@@ -34,9 +34,9 @@ import java.util.Map;
import javax.activation.DataHandler; import javax.activation.DataHandler;
import javax.xml.ws.Holder; import javax.xml.ws.Holder;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.dictionary.CMISScope; import org.alfresco.cmis.CMISScope;
import org.alfresco.cmis.dictionary.CMISTypeDefinition; import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.cmis.PropertyFilter; import org.alfresco.repo.cmis.PropertyFilter;
import org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete; import org.alfresco.repo.cmis.ws.DeleteTreeResponse.FailedToDelete;

View File

@@ -28,9 +28,9 @@ import java.math.BigInteger;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.alfresco.cmis.dictionary.CMISScope; import org.alfresco.cmis.CMISScope;
import org.alfresco.cmis.dictionary.CMISTypeDefinition; import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.cmis.dictionary.CMISTypeId; import org.alfresco.cmis.CMISTypeId;
import org.alfresco.repo.cmis.PropertyFilter; import org.alfresco.repo.cmis.PropertyFilter;
import org.alfresco.repo.cmis.ws.utils.AlfrescoObjectType; import org.alfresco.repo.cmis.ws.utils.AlfrescoObjectType;
import org.alfresco.repo.web.util.paging.Cursor; import org.alfresco.repo.web.util.paging.Cursor;

View File

@@ -37,15 +37,15 @@ import java.util.Map;
import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBElement;
import org.alfresco.cmis.CMISCardinalityEnum; import org.alfresco.cmis.CMISCardinalityEnum;
import org.alfresco.cmis.CMISChoice;
import org.alfresco.cmis.CMISContentStreamAllowedEnum; import org.alfresco.cmis.CMISContentStreamAllowedEnum;
import org.alfresco.cmis.CMISDataTypeEnum; import org.alfresco.cmis.CMISDataTypeEnum;
import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.CMISFullTextSearchEnum; import org.alfresco.cmis.CMISFullTextSearchEnum;
import org.alfresco.cmis.CMISJoinEnum; import org.alfresco.cmis.CMISJoinEnum;
import org.alfresco.cmis.CMISPropertyDefinition;
import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.cmis.CMISUpdatabilityEnum; import org.alfresco.cmis.CMISUpdatabilityEnum;
import org.alfresco.cmis.dictionary.CMISChoice;
import org.alfresco.cmis.dictionary.CMISDictionaryModel;
import org.alfresco.cmis.dictionary.CMISPropertyDefinition;
import org.alfresco.cmis.dictionary.CMISTypeDefinition;
import org.alfresco.repo.web.util.paging.Cursor; import org.alfresco.repo.web.util.paging.Cursor;
import org.alfresco.service.descriptor.Descriptor; import org.alfresco.service.descriptor.Descriptor;

View File

@@ -28,7 +28,7 @@ import java.util.List;
import javax.xml.ws.Holder; import javax.xml.ws.Holder;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.cmis.PropertyFilter; import org.alfresco.repo.cmis.PropertyFilter;
import org.alfresco.repo.cmis.ws.utils.AlfrescoObjectType; import org.alfresco.repo.cmis.ws.utils.AlfrescoObjectType;

View File

@@ -28,7 +28,7 @@ import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
/** /**

View File

@@ -27,10 +27,10 @@ package org.alfresco.repo.cmis.ws.utils;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import org.alfresco.cmis.dictionary.CMISDictionaryService; import org.alfresco.cmis.CMISDictionaryService;
import org.alfresco.cmis.dictionary.CMISScope; import org.alfresco.cmis.CMISScope;
import org.alfresco.cmis.dictionary.CMISTypeDefinition; import org.alfresco.cmis.CMISTypeDefinition;
import org.alfresco.cmis.dictionary.CMISTypeId; import org.alfresco.cmis.CMISTypeId;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.cmis.ws.EnumObjectType; import org.alfresco.repo.cmis.ws.EnumObjectType;
import org.alfresco.repo.cmis.ws.InvalidArgumentException; import org.alfresco.repo.cmis.ws.InvalidArgumentException;

View File

@@ -28,7 +28,7 @@ import java.util.List;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
/** /**
* @author Michael Shavnev * @author Michael Shavnev

View File

@@ -44,8 +44,8 @@ import javax.xml.ws.Service;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.dictionary.CMISTypeId; import org.alfresco.cmis.CMISTypeId;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor; import org.apache.cxf.binding.soap.saaj.SAAJOutInterceptor;
import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Client;

View File

@@ -26,7 +26,7 @@ package org.alfresco.repo.cmis.ws;
import javax.xml.namespace.QName; import javax.xml.namespace.QName;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
public class DMMultiFilingServiceTest extends AbstractServiceTest public class DMMultiFilingServiceTest extends AbstractServiceTest
{ {

View File

@@ -28,7 +28,7 @@ import java.math.BigInteger;
import javax.xml.ws.Holder; import javax.xml.ws.Holder;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
/** /**
* @author Alexander Tsvetkov * @author Alexander Tsvetkov

View File

@@ -30,7 +30,7 @@ import java.util.List;
import javax.activation.DataHandler; import javax.activation.DataHandler;
import javax.xml.ws.Holder; import javax.xml.ws.Holder;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.cmis.mapping.CMISMapping; import org.alfresco.cmis.mapping.CMISMapping;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;

View File

@@ -27,7 +27,7 @@ package org.alfresco.repo.cmis.ws;
import javax.activation.DataHandler; import javax.activation.DataHandler;
import javax.xml.ws.Holder; import javax.xml.ws.Holder;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
public class DMVersioningServiceTest extends AbstractServiceTest public class DMVersioningServiceTest extends AbstractServiceTest

View File

@@ -28,7 +28,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import org.alfresco.cmis.dictionary.CMISDictionaryModel; import org.alfresco.cmis.CMISDictionaryModel;
public class MultiThreadsServiceTest extends AbstractServiceTest public class MultiThreadsServiceTest extends AbstractServiceTest
{ {