From 37b45ae06560a52e09cd592e0d383bbd58cbef66 Mon Sep 17 00:00:00 2001
From: Erik Winlof <erik.winlof@alfresco.com>
Date: Wed, 3 Sep 2014 12:52:47 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)    78702:
 Align versions of dependencies - especially Surf ones - and declare them in
 parent pom for consistency    Upgrade a few Maven plugins as well

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82632 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                                                     | 5 +----
 .../java/org/alfresco/opencmis/CMISServletDispatcher.java   | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb4f0ee09b..6451d5cdf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -91,7 +90,7 @@
         <dependency>
             <groupId>rome</groupId>
             <artifactId>rome</artifactId>
-            <version>0.9</version>
+            <version>1.0</version>
         </dependency>
 
         <!-- This is needed at runtime by Web Client, so not really a test dependency -->
@@ -148,7 +147,6 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.14</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -159,7 +157,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>1.3.167</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/source/java/org/alfresco/opencmis/CMISServletDispatcher.java b/source/java/org/alfresco/opencmis/CMISServletDispatcher.java
index 9d12b5c66c..cc9bdb4cba 100644
--- a/source/java/org/alfresco/opencmis/CMISServletDispatcher.java
+++ b/source/java/org/alfresco/opencmis/CMISServletDispatcher.java
@@ -259,6 +259,12 @@ public abstract class CMISServletDispatcher implements CMISDispatcher
 					return null;
 				}
 
+				@Override
+				public String getContextPath()
+				{
+					return null;
+				}
+
 				@Override
 				public ServletContext getContext(String arg0)
 				{