Update of /cvsroot/roller/roller/src/org/roller/presentation/xmlrpc
In directory sc8-pr-cvs1:/tmp/cvs-serv31160/src/org/roller/presentation/xmlrpc
Modified Files:
MetaWeblogAPIHandler.java BloggerAPIHandler.java
BaseAPIHandler.java RollerXmlRpcClient.java
RollerXMLRPCServlet.java
Log Message:
removed silly "prep" methods
Index: MetaWeblogAPIHandler.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/xmlrpc/MetaWeblogAPIHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MetaWeblogAPIHandler.java 16 Aug 2003 00:07:45 -0000 1.11
--- MetaWeblogAPIHandler.java 18 Aug 2003 02:08:46 -0000 1.12
***************
*** 5,8 ****
--- 5,9 ----
import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcException;
+ import org.roller.model.Roller;
import org.roller.model.UserManager;
import org.roller.model.WeblogManager;
***************
*** 10,13 ****
--- 11,16 ----
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
+ import org.roller.presentation.RollerContext;
+ import org.roller.presentation.RollerRequest;
import org.roller.util.Utilities;
***************
*** 18,26 ****
import java.util.Vector;
/**
* Roller XML-RPC Handler for the MetaWeblog API.
*
! * MetaWeblog API pec can be found at http://www.xmlrpc.com/metaWeblogApi
*
* @author David M Johnson
--- 21,31 ----
import java.util.Vector;
+ import javax.servlet.http.HttpServletRequest;
+
/**
* Roller XML-RPC Handler for the MetaWeblog API.
*
! * MetaWeblog API spec can be found at http://www.xmlrpc.com/metaWeblogApi
*
* @author David M Johnson
***************
*** 59,65 ****
try
{
Vector result = new Vector();
! // UserManager userMgr = mRoller.getUserManager();
! WeblogManager weblogMgr = mRoller.getWeblogManager();
List cats = weblogMgr.getWeblogCategories(userid);
--- 64,75 ----
try
{
+ RollerRequest rreq = RollerRequest.getRollerRequest();
+ HttpServletRequest req = rreq.getRequest();
+ String contextUrl =
+
RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
+ Roller roller = rreq.getRoller();
+
Vector result = new Vector();
! WeblogManager weblogMgr = roller.getWeblogManager();
List cats = weblogMgr.getWeblogCategories(userid);
***************
*** 68,72 ****
WeblogCategoryData category =
(WeblogCategoryData) wbcItr.next();
String name = category.getName();
! String ctx = mContextUrl;
Hashtable catDetails = new Hashtable(3);
--- 78,82 ----
WeblogCategoryData category =
(WeblogCategoryData) wbcItr.next();
String name = category.getName();
! String ctx = contextUrl;
Hashtable catDetails = new Hashtable(3);
***************
*** 82,87 ****
result.add(catDetails);
! }
!
return result;
--- 92,96 ----
result.add(catDetails);
! }
return result;
***************
*** 119,122 ****
--- 128,133 ----
validate(userid,password);
+
+ Roller roller = RollerRequest.getRollerRequest().getRoller();
Hashtable postcontent = struct;
***************
*** 136,140 ****
try
{
! WeblogManager weblogMgr = mRoller.getWeblogManager();
// UserManager userMgr = mRoller.getUserManager();
--- 147,151 ----
try
{
! WeblogManager weblogMgr = roller.getWeblogManager();
// UserManager userMgr = mRoller.getUserManager();
***************
*** 211,216 ****
try
{
! WeblogManager weblogMgr = mRoller.getWeblogManager();
! UserManager userMgr = mRoller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
--- 222,228 ----
try
{
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! WeblogManager weblogMgr = roller.getWeblogManager();
! UserManager userMgr = roller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
***************
*** 241,247 ****
weblogMgr.storeWeblogEntry(entry);
flushPageCache(userid);
!
RollerXmlRpcClient.sendWeblogsPing(
! mContextUrl + entry.getPermaLink(),
entry.getWebsite().getName());
--- 253,264 ----
weblogMgr.storeWeblogEntry(entry);
flushPageCache(userid);
!
! RollerRequest rreq = RollerRequest.getRollerRequest();
! HttpServletRequest req = rreq.getRequest();
! String contextUrl =
!
RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
!
RollerXmlRpcClient.sendWeblogsPing(
! contextUrl + entry.getPermaLink(),
entry.getWebsite().getName());
***************
*** 278,282 ****
try
{
! WeblogManager weblogMgr = mRoller.getWeblogManager();
WeblogEntryData entry = weblogMgr.retrieveWeblogEntry(postid);
--- 295,300 ----
try
{
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! WeblogManager weblogMgr = roller.getWeblogManager();
WeblogEntryData entry = weblogMgr.retrieveWeblogEntry(postid);
Index: BloggerAPIHandler.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/xmlrpc/BloggerAPIHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BloggerAPIHandler.java 16 Aug 2003 00:07:45 -0000 1.11
--- BloggerAPIHandler.java 18 Aug 2003 02:08:46 -0000 1.12
***************
*** 7,17 ****
import org.apache.xmlrpc.XmlRpcException;
import org.roller.RollerException;
import org.roller.model.UserManager;
import org.roller.model.WeblogManager;
import org.roller.pojos.PageData;
import org.roller.pojos.UserData;
- import org.roller.pojos.WeblogCategoryData;
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
import java.sql.Timestamp;
--- 7,20 ----
import org.apache.xmlrpc.XmlRpcException;
import org.roller.RollerException;
+ import org.roller.model.Roller;
import org.roller.model.UserManager;
import org.roller.model.WeblogManager;
import org.roller.pojos.PageData;
import org.roller.pojos.UserData;
import org.roller.pojos.WeblogEntryData;
import org.roller.pojos.WebsiteData;
+ import org.roller.presentation.RollerContext;
+ import org.roller.presentation.RollerRequest;
+ import org.roller.util.Utilities;
import java.sql.Timestamp;
***************
*** 20,28 ****
import java.util.Hashtable;
import java.util.Iterator;
- import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
/**
--- 23,32 ----
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
+ import javax.servlet.http.HttpServletRequest;
+
/**
***************
*** 96,100 ****
validate(userid,password);
! WeblogManager weblogMgr = mRoller.getWeblogManager();
try
{
--- 100,105 ----
validate(userid,password);
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! WeblogManager weblogMgr = roller.getWeblogManager();
try
{
***************
*** 148,152 ****
try
{
! UserManager userMgr = mRoller.getUserManager();
// WebsiteData website = userMgr.getWebsite(userid);
--- 153,158 ----
try
{
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! UserManager userMgr = roller.getUserManager();
// WebsiteData website = userMgr.getWebsite(userid);
***************
*** 200,204 ****
try
{
! UserManager userMgr = mRoller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
PageData page = userMgr.retrievePage(templateType);
--- 206,211 ----
try
{
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! UserManager userMgr = roller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
PageData page = userMgr.retrievePage(templateType);
***************
*** 236,240 ****
try
{
! UserManager userMgr = mRoller.getUserManager();
UserData user = userMgr.getUser(userid);
--- 243,248 ----
try
{
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! UserManager userMgr = roller.getUserManager();
UserData user = userMgr.getUser(userid);
***************
*** 300,308 ****
try
{
! UserManager userMgr = mRoller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
Hashtable blog = new Hashtable(3);
! blog.put("url", mContextUrl+"/page/"+userid);
blog.put("blogid", userid);
blog.put("blogName", website.getName());
--- 308,323 ----
try
{
! RollerRequest rreq = RollerRequest.getRollerRequest();
! HttpServletRequest req = rreq.getRequest();
! String contextUrl =
!
RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
! Roller roller = rreq.getRoller();
!
! UserManager userMgr = roller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
+
Hashtable blog = new Hashtable(3);
! blog.put("url", contextUrl+"/page/"+userid);
blog.put("blogid", userid);
blog.put("blogName", website.getName());
***************
*** 351,356 ****
try
{
! WeblogManager weblogMgr = mRoller.getWeblogManager();
! // UserManager userMgr = mRoller.getUserManager();
Timestamp current = new Timestamp(System.currentTimeMillis());
--- 366,372 ----
try
{
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! WeblogManager weblogMgr = roller.getWeblogManager();
! // UserManager userMgr = roller.getUserManager();
Timestamp current = new Timestamp(System.currentTimeMillis());
***************
*** 414,419 ****
try
{
! WeblogManager weblogMgr = mRoller.getWeblogManager();
! UserManager userMgr = mRoller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
--- 430,441 ----
try
{
! RollerRequest rreq = RollerRequest.getRollerRequest();
! HttpServletRequest req = rreq.getRequest();
! String contextUrl =
!
RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
! Roller roller = rreq.getRoller();
!
! WeblogManager weblogMgr = roller.getWeblogManager();
! UserManager userMgr = roller.getUserManager();
WebsiteData website = userMgr.getWebsite(userid);
***************
*** 437,441 ****
RollerXmlRpcClient.sendWeblogsPing(
! mContextUrl + entry.getPermaLink(),
entry.getWebsite().getName());
--- 459,463 ----
RollerXmlRpcClient.sendWeblogsPing(
! contextUrl + entry.getPermaLink(),
entry.getWebsite().getName());
***************
*** 480,484 ****
Vector results = new Vector();
! WeblogManager weblogMgr = mRoller.getWeblogManager();
Map entries = weblogMgr.getRecentWeblogEntries(
userid,new Date(),null,numposts,false);
--- 502,507 ----
Vector results = new Vector();
! Roller roller = RollerRequest.getRollerRequest().getRoller();
! WeblogManager weblogMgr = roller.getWeblogManager();
Map entries = weblogMgr.getRecentWeblogEntries(
userid,new Date(),null,numposts,false);
***************
*** 498,507 ****
cats.addElement(entry.getCategory().getName());
- result.put("categories", cats);
- result.put("dateCreated", entry.getPubTime());
result.put("postid", entry.getId());
result.put("title", entry.getTitle());
result.put("description", entry.getText());
! result.put("userid", userid);
results.add(result);
--- 521,531 ----
cats.addElement(entry.getCategory().getName());
result.put("postid", entry.getId());
+ result.put("userid", userid);
+ result.put("url",
Utilities.escapeHTML(entry.getPermaLink()));
result.put("title", entry.getTitle());
result.put("description", entry.getText());
! result.put("categories", cats);
! result.put("dateCreated", entry.getPubTime());
results.add(result);
Index: BaseAPIHandler.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/xmlrpc/BaseAPIHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BaseAPIHandler.java 6 Jun 2003 19:29:58 -0000 1.7
--- BaseAPIHandler.java 18 Aug 2003 02:08:46 -0000 1.8
***************
*** 7,20 ****
import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcException;
- import org.roller.model.Roller;
import org.roller.model.UserManager;
import org.roller.pojos.UserData;
import org.roller.pojos.WebsiteData;
- import org.roller.presentation.RollerContext;
import org.roller.presentation.RollerRequest;
import org.roller.presentation.pagecache.PageCache;
- import javax.servlet.http.HttpServletRequest;
-
/**
* Base API handler does user validation, provides exception types, etc.
--- 7,16 ----
***************
*** 26,32 ****
LogFactory.getFactory().getInstance(BaseAPIHandler.class);
- protected Roller mRoller = null;
- protected String mContextUrl = null;
-
public static final int AUTHORIZATION_EXCEPTION = 0001;
public static final String AUTHORIZATION_EXCEPTION_MSG =
--- 22,25 ----
***************
*** 59,67 ****
//------------------------------------------------------------------------
! public void prep( HttpServletRequest req )
! {
! mRoller = RollerContext.getRoller(req);
! mContextUrl =
RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
! }
//------------------------------------------------------------------------
--- 52,60 ----
//------------------------------------------------------------------------
! //public void prep( HttpServletRequest req )
! //{
! //mRoller = RollerContext.getRoller(req);
! //mContextUrl =
RollerContext.getRollerContext(req).getAbsoluteContextUrl(req);
! //
//------------------------------------------------------------------------
***************
*** 72,76 ****
try
{
! UserManager userMgr = mRoller.getUserManager();
UserData user = userMgr.getUser(username);
WebsiteData website = userMgr.getWebsite(username);
--- 65,72 ----
try
{
! // Get Roller request object for current thread
! RollerRequest rreq = RollerRequest.getRollerRequest();
!
! UserManager userMgr = rreq.getRoller().getUserManager();
UserData user = userMgr.getUser(username);
WebsiteData website = userMgr.getWebsite(username);
***************
*** 100,105 ****
protected void flushPageCache(String user) throws Exception
{
! // There is NO WAY to get a RollerRequest inside an XML-RPC handler
! // so here we resort to the EVIL TLS method.
RollerRequest rreq = RollerRequest.getRollerRequest();
--- 96,100 ----
protected void flushPageCache(String user) throws Exception
{
! // Get Roller request object for current thread
RollerRequest rreq = RollerRequest.getRollerRequest();
***************
*** 108,111 ****
PageCache.removeFromCache( rreq.getRequest(), ud );
}
-
}
--- 103,105 ----
Index: RollerXmlRpcClient.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/xmlrpc/RollerXmlRpcClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RollerXmlRpcClient.java 10 Jun 2003 18:15:53 -0000 1.1
--- RollerXmlRpcClient.java 18 Aug 2003 02:08:46 -0000 1.2
***************
*** 4,13 ****
package org.roller.presentation.xmlrpc;
import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;
-
- import org.apache.xmlrpc.XmlRpcClient;
- import org.apache.xmlrpc.XmlRpcException;
/**
--- 4,13 ----
package org.roller.presentation.xmlrpc;
+ import org.apache.xmlrpc.XmlRpcClient;
+ import org.apache.xmlrpc.XmlRpcException;
+
import java.io.IOException;
import java.util.Hashtable;
import java.util.Vector;
/**
Index: RollerXMLRPCServlet.java
===================================================================
RCS file:
/cvsroot/roller/roller/src/org/roller/presentation/xmlrpc/RollerXMLRPCServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RollerXMLRPCServlet.java 10 Jun 2003 12:24:32 -0000 1.7
--- RollerXMLRPCServlet.java 18 Aug 2003 02:08:46 -0000 1.8
***************
*** 8,13 ****
import org.apache.commons.logging.LogFactory;
import org.apache.xmlrpc.XmlRpcServer;
- import org.roller.presentation.RollerRequest;
- import org.roller.presentation.pagecache.PageCache;
import java.io.OutputStream;
--- 8,11 ----
***************
*** 65,71 ****
throws ServletException, java.io.IOException
{
- mBloggerHandler.prep(request);
- mMetaWeblogHandler.prep(request);
-
byte[] result = mXmlRpcServer.execute(request.getInputStream());
--- 63,66 ----
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
|
