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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
75551: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      74584: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
         << Requires more work on the EOL branch >>
         74416: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
            74309: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Start replacing references to the original CMIS code with Alfresco and chemistry Open CMIS classes 
            74342: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               - Switch ServiceRegistry over to using Open CMIS classes 
            74406: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
               << Compiles and starts Share without error >>
               - Removed Original CMIS classes from the repository, remote-api and thor
               - Moved the CMIS.DictionaryBootstrap bean into opencmis-context.xml before removing cmis-api-context.xml
               - Some code was left under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ...........................................................\client
                   ...........................................................\ws
                   ...........................................................\rest
                   ................................test-java\org\alfresco\repo\cmis
                   ................................................................\ws
                   ................................................................\rest
                 Will have to see if it should be be removed too, or if it is common with OpenCMIS
            74407: ACE-2010 EOL Legally CMIS Inputs (2) in 5.0
               - Removed left over code under:
                   root\projects\remote-api\source\java\org\alfresco\repo\cmis
                   ................................test-java\org\alfresco\repo\cmis
               - Removed an authentication URL test in QuickShareRestApiTest which was failing in
                 the same way as the tests above.
               - Removed CXFAuthenticationSystemTest which appears to be using the original CMIS
         74465: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
            74464: ACE-2010 EOL Legacey CMIS Inputs (2) in 5.0
               - New failure in QuickShareRestApiTest
               - CXFAuthenticationSystemTest (deleted) was still referenced in MiscSystemTestSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-22 12:58:48 +00:00
parent 8db8094c57
commit a89276be19
163 changed files with 44 additions and 29865 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/test-java/org/alfresco/opencmis/CMISTest.java
View File

@@ -37,11 +37,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.cmis.CMISAccessControlService;
import org.alfresco.cmis.CMISChangeEvent;
import org.alfresco.cmis.CMISChangeLog;
import org.alfresco.cmis.CMISChangeLogService;
import org.alfresco.cmis.CMISDictionaryModel;
import org.alfresco.model.ContentModel;
import org.alfresco.opencmis.search.CMISQueryOptions;
import org.alfresco.opencmis.search.CMISQueryOptions.CMISQueryMode;
@@ -81,6 +79,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.Pair;
import org.apache.chemistry.opencmis.commons.BasicPermissions;
import org.apache.chemistry.opencmis.commons.PropertyIds;
import org.apache.chemistry.opencmis.commons.data.Ace;
import org.apache.chemistry.opencmis.commons.data.AllowableActions;
@@ -404,15 +403,15 @@ public class CMISTest
PropertyData<?> propIsLatestMajorVersion = null;
for (PropertyData<?> property : properties)
{
if (property.getId().equals(CMISDictionaryModel.PROP_IS_LATEST_MAJOR_VERSION))
if (property.getId().equals(PropertyIds.IS_LATEST_MAJOR_VERSION))
{
found = true;
propIsLatestMajorVersion = property;
break;
}
}
//properties..contains(CMISDictionaryModel.PROP_IS_LATEST_MAJOR_VERSION);
assertTrue("The CMISDictionaryModel.PROP_IS_LATEST_MAJOR_VERSION property was not found", found);
//properties..contains(PropertyIds.IS_LATEST_MAJOR_VERSION);
assertTrue("The PropertyIds.IS_LATEST_MAJOR_VERSION property was not found", found);
if (found)
{
return propIsLatestMajorVersion;
@@ -1667,7 +1666,7 @@ public class CMISTest
PropertyData<?> propIsLatestMajorVersion = null;
for (PropertyData<?> property : properties)
{
if (property.getId().equals(CMISDictionaryModel.PROP_IS_LATEST_MAJOR_VERSION))
if (property.getId().equals(PropertyIds.IS_LATEST_MAJOR_VERSION))
{
found = true;
propIsLatestMajorVersion = property;
@@ -2122,9 +2121,9 @@ public class CMISTest
AccessControlEntryImpl ace = new AccessControlEntryImpl();
ace.setPrincipal(new AccessControlPrincipalDataImpl(testGroup));
List<String> putPermissions = new ArrayList<String>();
putPermissions.add(CMISAccessControlService.CMIS_ALL_PERMISSION);
putPermissions.add(CMISAccessControlService.CMIS_READ_PERMISSION);
putPermissions.add(CMISAccessControlService.CMIS_WRITE_PERMISSION);
putPermissions.add(BasicPermissions.ALL);
putPermissions.add(BasicPermissions.READ);
putPermissions.add(BasicPermissions.WRITE);
ace.setPermissions(putPermissions);
ace.setDirect(true);
acesList.add(ace);