From 22be126dec07a1cf675f2cfc5df715ebf0816d7c Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Thu, 4 Sep 2014 06:01:21 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 80966: Revere merged HEAD-BUG-FIX (5.0/Cloud) << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >> 80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud) << And added alfresco-opencmis-extension 1.0 >> 79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128 rather than the changes from V4.2-BUG-FIX >> 79166: Reverse merged V4.2-BUG-FIX (4.2.4) << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0 and Steve is on holiday for a week. >> << The original commits are already merged to HBF for ACE-484 so will revert them too. >> 79070: Merged DEV to V4.2-BUG-FIX (4.2.4) 67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Updated OpenCMIS to 0.11 version. 79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades 80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 79166: Reverse merged V4.2-BUG-FIX (4.2.4) << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0 and Steve is on holiday for a week. >> << The original commits are already merged to HBF for ACE-484 so will revert them too. >> 79070: Merged DEV to V4.2-BUG-FIX (4.2.4) 67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Updated OpenCMIS to 0.11 version. 79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades 80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc 80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again 80814: MNT-11223: Fix build (pt1) - 80366: pom.xml contained a reference to an external surf which is now back in house. 80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions 80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS. 80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor. 80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line Changed Solr to Lucene for tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- pom.xml | 11 +---------- .../framework/webscripts/ResourceWebScriptHelper.java | 4 ++-- .../rest/api/tests/TCKEnterpriseTestFixture.java | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 9fc9e29f72..6451d5cdf8 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ org.alfresco.cmis.client alfresco-opencmis-extension - 1.0 + 0.9 org.apache.ws.commons.schema @@ -85,10 +85,6 @@ org.apache.geronimo.specs geronimo-javamail_1.4_spec - - org.codehaus.woodstox - wstx-asl - @@ -110,11 +106,6 @@ - - org.apache.chemistry.opencmis - chemistry-opencmis-client-impl - ${dependency.opencmis.version} - org.apache.chemistry diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java index c49df16d93..fceb903c97 100644 --- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java +++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java @@ -152,7 +152,6 @@ public class ResourceWebScriptHelper * @param selectParam * @return List bean property names potentially using JSON Pointer syntax */ - @SuppressWarnings("unchecked") public static List getSelectClause(String selectParam) throws InvalidArgumentException { if (selectParam == null) return Collections.emptyList(); @@ -168,7 +167,8 @@ public class ResourceWebScriptHelper { return Arrays.asList(selectedPropsTree.getText()); } - List children = (List) selectedPropsTree.getChildren(); + @SuppressWarnings("unchecked") + List children = (List)selectedPropsTree.getChildren(); if (children!= null && !children.isEmpty()) { List properties = new ArrayList(children.size()); diff --git a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java index 58a7b57840..a2ecf8b0c0 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java +++ b/source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java @@ -12,7 +12,7 @@ public class TCKEnterpriseTestFixture extends EnterpriseTestFixture "rest-api-test-context.xml" }; - public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"}; + public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/solr/"}; private static TCKEnterpriseTestFixture instance;