Merged V3.0 to HEAD

12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

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

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

@@ -36,13 +36,9 @@ import java.util.Set;
  * required.
  * 
  * @author andyh
- * 
  */
 public class DynamicNamespacePrefixResolver implements NamespaceService
 {
-
-    private static final long serialVersionUID = -7721089444629137409L;
-
     /**
      * The delegate
      */
@@ -53,6 +49,7 @@ public class DynamicNamespacePrefixResolver implements NamespaceService
      */
     private HashMap<String, String> map = new HashMap<String, String>();
 
+    
     public DynamicNamespacePrefixResolver(NamespacePrefixResolver delegate)
     {
         super();
@@ -64,6 +61,7 @@ public class DynamicNamespacePrefixResolver implements NamespaceService
         this(null);
     }
 
+    
     /**
      * Add prefix to name space mapping override
      * 
@@ -143,5 +141,4 @@ public class DynamicNamespacePrefixResolver implements NamespaceService
        uris.addAll(map.keySet());
        return uris;
     }
-    
 }