Merge of all UI clustering changes originally applied to 2.2

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/service/namespace/DynamicNamespacePrefixResolver.java

@@ -41,6 +41,8 @@ import java.util.Set;
 public class DynamicNamespacePrefixResolver implements NamespaceService
 {
 
+    private static final long serialVersionUID = -7721089444629137409L;
+
     /**
      * The delegate
      */

source/java/org/alfresco/service/namespace/NamespacePrefixResolver.java

@@ -24,6 +24,7 @@
  */
 package org.alfresco.service.namespace;
 
+import java.io.Serializable;
 import java.util.Collection;
 
 import org.alfresco.service.Auditable;
@@ -36,7 +37,7 @@ import org.alfresco.service.PublicService;
  * @author David Caruana
  */
 @PublicService
-public interface NamespacePrefixResolver
+public interface NamespacePrefixResolver extends Serializable
 {
     /**
      * Gets the namespace URI registered for the given prefix

source/java/org/alfresco/service/namespace/QNameMap.java

@@ -24,6 +24,7 @@
  */
 package org.alfresco.service.namespace;
 
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -40,8 +41,10 @@ import org.apache.commons.logging.LogFactory;
  * 
  * @author gavinc
  */
-public class QNameMap<K,V> implements Map, Cloneable
+public class QNameMap<K,V> implements Map, Cloneable, Serializable
 {
+    private static final long serialVersionUID = 2077228225832792605L;
+    
     protected static Log logger = LogFactory.getLog(QNameMap.class);
     protected Map<String, Object> contents = new HashMap<String, Object>(16, 1.0f);
     protected NamespacePrefixResolver resolver = null;
@@ -60,6 +63,19 @@ public class QNameMap<K,V> implements Map, Cloneable
         this.resolver = resolver;
     }
     
+    
+    
+    /**
+     * Constructor for Serialization mechanism
+     * 
+     */
+    protected QNameMap()
+    {
+        super();
+    }
+
+
+
     /**
      * @see java.util.Map#size()
      */