From ab7f957eabd715762f44d00689c7eac970aa712a Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 20:03:29 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 57141: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 56924: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1) 56864: MNT-9682 : Stack Specific: L10N. Blog Posts is not published Externally - XmlRpc library changed to use defined in code encoding git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../DefaultBlogIntegrationImplementation.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/repo/blog/DefaultBlogIntegrationImplementation.java b/source/java/org/alfresco/repo/blog/DefaultBlogIntegrationImplementation.java index b441c6adac..cd51539672 100644 --- a/source/java/org/alfresco/repo/blog/DefaultBlogIntegrationImplementation.java +++ b/source/java/org/alfresco/repo/blog/DefaultBlogIntegrationImplementation.java @@ -25,11 +25,9 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; -import marquee.xmlrpc.XmlRpcClient; -import marquee.xmlrpc.XmlRpcException; -import marquee.xmlrpc.XmlRpcParser; -import marquee.xmlrpc.XmlRpcSerializer; -import marquee.xmlrpc.serializers.HashtableSerializer; +import org.apache.xmlrpc.XmlRpcException; +import org.apache.xmlrpc.client.XmlRpcClient; +import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; /** * Default blog integration implementation. Uses various standard XML PRC blogging API to satisfy the @@ -156,9 +154,11 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg XmlRpcClient client = null; try { - XmlRpcSerializer.registerCustomSerializer(new HashtableSerializer()); - XmlRpcParser.setDriver("org.apache.xerces.parsers.SAXParser"); - client = new XmlRpcClient(new URL(url)); + client = new XmlRpcClient(); + XmlRpcClientConfigImpl conf = new XmlRpcClientConfigImpl(); + conf.setServerURL(new URL(url)); + conf.setEncoding("UTF-8"); + client.setConfig(conf); } catch (MalformedURLException exception) { @@ -184,7 +184,7 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg try { XmlRpcClient client = getClient(url); - result = client.invoke(method, params); + result = client.execute(method, params); } catch (XmlRpcException exception) {