inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-21 18:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Abdera CMIS Extension tidy up:

Browse Source 
- move from package org.apache.abdera.ext.cmis to org.alfresco.abdera.ext.cmis (note: apparently, it's not permitted to use org.apache package, unless an Apache project)
- fill in some extra 0.61 pieces
- sort out comments

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2009-05-06 15:31:20 +00:00
parent 965d72670f
commit fe75d397a6
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/cmis/rest/CMISQueryReader.java
View File

@@ -33,12 +33,12 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.alfresco.abdera.ext.cmis.CMISConstants;
import org.alfresco.util.Content;
import org.alfresco.web.scripts.FormatReader;
import org.alfresco.web.scripts.WebScriptException;
import org.alfresco.web.scripts.WebScriptRequest;
import org.alfresco.web.scripts.WebScriptResponse;
import org.apache.abdera.ext.cmis.CMISConstants;
/**

12
source/java/org/alfresco/repo/cmis/rest/test/BaseCMISWebScriptTest.java
View File

@@ -40,6 +40,11 @@ import javax.xml.validation.Validator;
import junit.framework.Test;
import org.alfresco.abdera.ext.cmis.CMISCapabilities;
import org.alfresco.abdera.ext.cmis.CMISConstants;
import org.alfresco.abdera.ext.cmis.CMISExtensionFactory;
import org.alfresco.abdera.ext.cmis.CMISObject;
import org.alfresco.abdera.ext.cmis.CMISRepositoryInfo;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.cmis.rest.xsd.CMISValidator;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
@@ -52,11 +57,6 @@ import org.alfresco.web.scripts.TestWebScriptServer.Request;
import org.alfresco.web.scripts.TestWebScriptServer.Response;
import org.alfresco.web.scripts.atom.AbderaService;
import org.alfresco.web.scripts.atom.AbderaServiceImpl;
import org.apache.abdera.ext.cmis.CMISCapabilities;
import org.apache.abdera.ext.cmis.CMISConstants;
import org.apache.abdera.ext.cmis.CMISExtensionFactory;
import org.apache.abdera.ext.cmis.CMISObject;
import org.apache.abdera.ext.cmis.CMISRepositoryInfo;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Collection;
import org.apache.abdera.model.Entry;
@@ -383,7 +383,7 @@ public class BaseCMISWebScriptTest extends BaseWebScriptTest
assertNotNull(repoInfo);
CMISCapabilities capabilities = repoInfo.getCapabilities();
assertNotNull(repoInfo);
queryCapability = capabilities.getJoin();
queryCapability = capabilities.getQuery();
assertNotNull(queryCapability);
}
return queryCapability;

8
source/java/org/alfresco/repo/cmis/rest/test/CMISCustomTypeTest.java
View File

@@ -27,6 +27,10 @@ package org.alfresco.repo.cmis.rest.test;
import java.io.StringReader;
import java.util.List;
import org.alfresco.abdera.ext.cmis.CMISConstants;
import org.alfresco.abdera.ext.cmis.CMISObject;
import org.alfresco.abdera.ext.cmis.CMISProperties;
import org.alfresco.abdera.ext.cmis.CMISProperty;
import org.alfresco.util.GUID;
import org.alfresco.web.scripts.Format;
import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest;
@@ -35,10 +39,6 @@ import org.alfresco.web.scripts.TestWebScriptServer.PatchRequest;
import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
import org.alfresco.web.scripts.TestWebScriptServer.Response;
import org.apache.abdera.ext.cmis.CMISConstants;
import org.apache.abdera.ext.cmis.CMISObject;
import org.apache.abdera.ext.cmis.CMISProperties;
import org.apache.abdera.ext.cmis.CMISProperty;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;

12
source/java/org/alfresco/repo/cmis/rest/test/CMISTest.java
View File

@@ -32,6 +32,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.abdera.ext.cmis.CMISAllowableAction;
import org.alfresco.abdera.ext.cmis.CMISAllowableActions;
import org.alfresco.abdera.ext.cmis.CMISConstants;
import org.alfresco.abdera.ext.cmis.CMISObject;
import org.alfresco.util.GUID;
import org.alfresco.web.scripts.Format;
import org.alfresco.web.scripts.TestWebScriptServer.DeleteRequest;
@@ -40,10 +44,6 @@ import org.alfresco.web.scripts.TestWebScriptServer.PatchRequest;
import org.alfresco.web.scripts.TestWebScriptServer.PostRequest;
import org.alfresco.web.scripts.TestWebScriptServer.PutRequest;
import org.alfresco.web.scripts.TestWebScriptServer.Response;
import org.apache.abdera.ext.cmis.CMISAllowableAction;
import org.apache.abdera.ext.cmis.CMISAllowableActions;
import org.apache.abdera.ext.cmis.CMISConstants;
import org.apache.abdera.ext.cmis.CMISObject;
import org.apache.abdera.i18n.iri.IRI;
import org.apache.abdera.model.Element;
import org.apache.abdera.model.Entry;
@@ -1160,7 +1160,7 @@ public class CMISTest extends BaseCMISWebScriptTest
// retrieve query request document
String queryDoc = loadString("/org/alfresco/repo/cmis/rest/test/query.cmisquery.xml");
if (queryCapability.equals("metadataonly") || queryCapability.equals("bothseperate"))
if (queryCapability.equals("metadataonly") || queryCapability.equals("bothseperate") || queryCapability.equals("bothcombined"))
{
{
// meta data only query against folder
@@ -1204,7 +1204,7 @@ public class CMISTest extends BaseCMISWebScriptTest
}
}
if (queryCapability.equals("fulltextonly") || queryCapability.equals("bothseperate"))
if (queryCapability.equals("fulltextonly") || queryCapability.equals("bothseperate") || queryCapability.equals("bothcombined"))
{
// full text only query
String query = "SELECT ObjectId, ObjectTypeId, Name FROM Document " +