From f9a98f5466b88f52da23ac51182e3728ae88c3e1 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 3 Sep 2014 15:29:34 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    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

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                                               | 11 ++++++++++-
 .../framework/webscripts/ResourceWebScriptHelper.java |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6451d5cdf8..9fc9e29f72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.alfresco.cmis.client</groupId>
             <artifactId>alfresco-opencmis-extension</artifactId>
-            <version>0.9</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
@@ -85,6 +85,10 @@
                     <groupId>org.apache.geronimo.specs</groupId>
                     <artifactId>geronimo-javamail_1.4_spec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>wstx-asl</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -106,6 +110,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.chemistry.opencmis</groupId>
+            <artifactId>chemistry-opencmis-client-impl</artifactId>
+            <version>${dependency.opencmis.version}</version>
+        </dependency>
         <!-- ALF-19407 chemistry-tck-atompub and junit are dependencies of CMISTestRunnerWebScript, which is not a test -->
         <dependency>
             <groupId>org.apache.chemistry</groupId>
diff --git a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
index fceb903c97..c49df16d93 100644
--- a/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
+++ b/source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptHelper.java
@@ -152,6 +152,7 @@ public class ResourceWebScriptHelper
      * @param selectParam
      * @return List<String> bean property names potentially using JSON Pointer syntax
      */
+    @SuppressWarnings("unchecked")
     public static List<String> getSelectClause(String selectParam) throws InvalidArgumentException
     {
         if (selectParam == null) return Collections.emptyList();
@@ -167,8 +168,7 @@ public class ResourceWebScriptHelper
 			{
 				return Arrays.asList(selectedPropsTree.getText());
 			}
-			@SuppressWarnings("unchecked")
-            List<Tree> children = (List<Tree>)selectedPropsTree.getChildren();
+			List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
 			if (children!= null && !children.isEmpty())
 			{
 				List<String> properties = new ArrayList<String>(children.size());