You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/04/07 20:00:59 UTC
svn commit: r526459 - in /incubator/roller/trunk: metadata/xdoclet/
src/org/apache/roller/business/pings/
src/org/apache/roller/webservices/xmlrpc/ tools/lib/ tools/xmlrpc-3.0/
tools/xmlrpc-3.0/lib/
Author: snoopdave
Date: Sat Apr 7 11:00:58 2007
New Revision: 526459
URL: http://svn.apache.org/viewvc?view=rev&rev=526459
Log:
Upgrading to XMLRPC 3.0
Added:
incubator/roller/trunk/tools/xmlrpc-3.0/
incubator/roller/trunk/tools/xmlrpc-3.0/lib/
incubator/roller/trunk/tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar (with props)
incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar (with props)
incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar (with props)
incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar (with props)
Removed:
incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/RollerXMLRPCServlet.java
incubator/roller/trunk/tools/lib/xmlrpc-1.2-b1.jar
Modified:
incubator/roller/trunk/metadata/xdoclet/servlet-mappings.xml
incubator/roller/trunk/metadata/xdoclet/servlets.xml
incubator/roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java
incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
Modified: incubator/roller/trunk/metadata/xdoclet/servlet-mappings.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/xdoclet/servlet-mappings.xml?view=diff&rev=526459&r1=526458&r2=526459
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/servlet-mappings.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/servlet-mappings.xml Sat Apr 7 11:00:58 2007
@@ -3,3 +3,8 @@
<servlet-name>action</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <url-pattern>/roller-services/xmlrpc</url-pattern>
+ </servlet-mapping>
Modified: incubator/roller/trunk/metadata/xdoclet/servlets.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/metadata/xdoclet/servlets.xml?view=diff&rev=526459&r1=526458&r2=526459
==============================================================================
--- incubator/roller/trunk/metadata/xdoclet/servlets.xml (original)
+++ incubator/roller/trunk/metadata/xdoclet/servlets.xml Sat Apr 7 11:00:58 2007
@@ -1,20 +1,27 @@
<!-- The Struts Servlet -->
<servlet>
-
<servlet-name>action</servlet-name>
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
-
<init-param>
<param-name>validate</param-name>
<param-value>true</param-value>
</init-param>
-
<load-on-startup>2</load-on-startup>
-
</servlet>
+
+<servlet>
+ <servlet-name>XmlRpcServlet</servlet-name>
+ <servlet-class>org.apache.xmlrpc.webserver.XmlRpcServlet</servlet-class>
+ <init-param>
+ <param-name>enabledForExtensions</param-name>
+ <param-value>true</param-value>
+ <description>
+ Sets, whether the servlet supports vendor extensions for XML-RPC.
+ </description>
+ </init-param>
+</servlet>
\ No newline at end of file
Modified: incubator/roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java?view=diff&rev=526459&r1=526458&r2=526459
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/pings/WeblogUpdatePinger.java Sat Apr 7 11:00:58 2007
@@ -18,18 +18,23 @@
package org.apache.roller.business.pings;
-import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.config.PingConfig;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.xmlrpc.XmlRpcClient;
import org.apache.xmlrpc.XmlRpcException;
+import org.apache.xmlrpc.client.XmlRpcClient;
+import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URL;
import java.net.UnknownHostException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Set;
+import org.apache.commons.logging.Log;
/**
* Utility for sending a weblog update ping.
@@ -98,19 +103,22 @@
Set variantOptions = PingConfig.getVariantOptions(pingTargetUrl);
// Set up the ping parameters.
- Vector params = new Vector();
+ List params = new ArrayList();
if (!variantOptions.contains("noname")) {
// ping variant for icerocket and anyone with similar bug, where we must omit the blog name.
- params.addElement(website.getName());
+ params.add(website.getName());
}
- params.addElement(websiteUrl);
+ params.add(websiteUrl);
if (logger.isDebugEnabled()) {
logger.debug("Executing ping to '" + pingTargetUrl + "' for website '" + websiteUrl + "' (" + website.getName() + ")" + (variantOptions.isEmpty() ? "" : " with variant options " + variantOptions));
}
- // Send the ping.
- XmlRpcClient client = new XmlRpcClient(pingTargetUrl);
- PingResult pingResult = parseResult(client.execute("weblogUpdates.ping", params));
+ // Send the ping.
+ XmlRpcClientConfigImpl config = new XmlRpcClientConfigImpl();
+ config.setServerURL(new URL(pingTargetUrl));
+ XmlRpcClient client = new XmlRpcClient();
+ client.setConfig(config);
+ PingResult pingResult = parseResult(client.execute("weblogUpdates.ping", params.toArray()));
if (logger.isDebugEnabled()) logger.debug("Ping result is: " + pingResult);
return pingResult;
Modified: incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java?view=diff&rev=526459&r1=526458&r2=526459
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/xmlrpc/BloggerAPIHandler.java Sat Apr 7 11:00:58 2007
@@ -88,6 +88,9 @@
WeblogManager weblogMgr = roller.getWeblogManager();
WeblogEntryData entry = weblogMgr.getWeblogEntry(postid);
+ // Return false if entry not found
+ if (entry == null) return false;
+
validate(entry.getWebsite().getHandle(), userid, password);
try {
Added: incubator/roller/trunk/tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar?view=auto&rev=526459
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/tools/xmlrpc-3.0/lib/ws-commons-util-1.0.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar?view=auto&rev=526459
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-client-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar?view=auto&rev=526459
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-common-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar?view=auto&rev=526459
==============================================================================
Binary file - no diff available.
Propchange: incubator/roller/trunk/tools/xmlrpc-3.0/lib/xmlrpc-server-3.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream