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
This commit is contained in:
Alan Davis
2014-02-11 20:03:29 +00:00
parent fdfdc70246
commit ab7f957eab

View File

@@ -25,11 +25,9 @@ import java.util.Hashtable;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import marquee.xmlrpc.XmlRpcClient; import org.apache.xmlrpc.XmlRpcException;
import marquee.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClient;
import marquee.xmlrpc.XmlRpcParser; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import marquee.xmlrpc.XmlRpcSerializer;
import marquee.xmlrpc.serializers.HashtableSerializer;
/** /**
* Default blog integration implementation. Uses various standard XML PRC blogging API to satisfy the * 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; XmlRpcClient client = null;
try try
{ {
XmlRpcSerializer.registerCustomSerializer(new HashtableSerializer()); client = new XmlRpcClient();
XmlRpcParser.setDriver("org.apache.xerces.parsers.SAXParser"); XmlRpcClientConfigImpl conf = new XmlRpcClientConfigImpl();
client = new XmlRpcClient(new URL(url)); conf.setServerURL(new URL(url));
conf.setEncoding("UTF-8");
client.setConfig(conf);
} }
catch (MalformedURLException exception) catch (MalformedURLException exception)
{ {
@@ -184,7 +184,7 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg
try try
{ {
XmlRpcClient client = getClient(url); XmlRpcClient client = getClient(url);
result = client.invoke(method, params); result = client.execute(method, params);
} }
catch (XmlRpcException exception) catch (XmlRpcException exception)
{ {