You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2006/07/23 23:59:24 UTC
svn commit: r424832 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui:
authoring/struts/actions/ core/ core/pings/
Author: gangolli
Date: Sun Jul 23 14:59:24 2006
New Revision: 424832
URL: http://svn.apache.org/viewvc?rev=424832&view=rev
Log:
Removed some no-longer used parameters left over from (incomplete) refactoring in some earlier revisions. Cleaned up some unused imports.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueTask.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java?rev=424832&r1=424831&r2=424832&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/authoring/struts/actions/PingSetupAction.java Sun Jul 23 14:59:24 2006
@@ -22,7 +22,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.RollerException;
import org.apache.roller.config.PingConfig;
-import org.apache.roller.config.RollerRuntimeConfig;
import org.apache.roller.model.AutoPingManager;
import org.apache.roller.model.PingTargetManager;
import org.apache.roller.model.RollerFactory;
@@ -60,10 +59,6 @@
private static final String PING_SETUP_PAGE = "pingSetup.page";
- // Changing this to take your back to the pings setup page instead of
- // ping result page, no need for extra page.
- private static final String PING_RESULT_PAGE = "pingSetup.page"; // "pingResult.page";
-
/* (non-Javadoc)
* @see org.apache.struts.actions.DispatchAction#unspecified(
* org.apache.struts.action.ActionMapping,
@@ -194,7 +189,6 @@
public ActionForward pingSelectedNow(ActionMapping mapping, ActionForm form, HttpServletRequest req, HttpServletResponse res) throws Exception {
try {
RollerRequest rreq = RollerRequest.getRollerRequest(req);
- String absoluteUrl = RollerRuntimeConfig.getAbsoluteContextURL();
PingTargetData pingTarget = select(rreq);
WebsiteData website = rreq.getWebsite();
try {
@@ -207,7 +201,7 @@
errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("ping.pingProcessingIsSuspended"));
saveErrors(req, errors);
} else {
- WeblogUpdatePinger.PingResult pingResult = WeblogUpdatePinger.sendPing(absoluteUrl, pingTarget, website);
+ WeblogUpdatePinger.PingResult pingResult = WeblogUpdatePinger.sendPing(pingTarget, website);
if (pingResult.isError()) {
if (mLogger.isDebugEnabled()) mLogger.debug("Ping Result: " + pingResult);
ActionMessages errors = new ActionMessages();
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java?rev=424832&r1=424831&r2=424832&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerContext.java Sun Jul 23 14:59:24 2006
@@ -22,8 +22,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
@@ -55,10 +53,8 @@
import org.apache.roller.model.RollerFactory;
import org.apache.roller.model.ScheduledTask;
import org.apache.roller.pojos.WeblogEntryData;
-import org.apache.roller.pojos.WebsiteData;
import org.apache.roller.ui.core.pings.PingQueueTask;
import org.apache.roller.util.cache.CacheManager;
-import org.apache.struts.util.RequestUtils;
import org.apache.velocity.runtime.RuntimeSingleton;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.ContextLoaderListener;
@@ -209,7 +205,7 @@
Properties velocityProps = new Properties();
try {
- InputStream instream = this.mContext.getResourceAsStream("/WEB-INF/velocity.properties");
+ InputStream instream = mContext.getResourceAsStream("/WEB-INF/velocity.properties");
velocityProps.load(instream);
@@ -302,7 +298,7 @@
// Set up the task
PingQueueTask pingQueueTask = new PingQueueTask();
- pingQueueTask.init(this, intervalMins);
+ pingQueueTask.init(intervalMins);
// Schedule it at the appropriate interval, delay start for one interval.
mLogger.info("Scheduling ping queue task to run at " + intervalMins + " minute intervals.");
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java?rev=424832&r1=424831&r2=424832&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueProcessor.java Sun Jul 23 14:59:24 2006
@@ -29,7 +29,6 @@
import org.apache.roller.pojos.PingQueueEntryData;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.ui.core.RollerContext;
import java.util.Iterator;
import java.util.List;
@@ -45,30 +44,27 @@
private static PingQueueProcessor theInstance;
- private RollerContext rollerContext;
private PingQueueManager pingQueueMgr;
public static PingQueueProcessor getInstance() {
return theInstance;
}
- private PingQueueProcessor(RollerContext rc) throws RollerException {
- rollerContext = rc;
+ private PingQueueProcessor() throws RollerException {
pingQueueMgr = RollerFactory.getRoller().getPingQueueManager();
}
/**
* Initialize the singleton. This is called during <code>RollerContext</code> initialization.
*
- * @param rc the Roller context
* @throws RollerException
*/
- public static synchronized void init(RollerContext rc) throws RollerException {
+ public static synchronized void init() throws RollerException {
if (theInstance != null) {
logger.warn("Ignoring duplicate initialization of PingQueueProcessor!");
return;
}
- theInstance = new PingQueueProcessor(rc);
+ theInstance = new PingQueueProcessor();
if (logger.isDebugEnabled()) logger.debug("Ping queue processor initialized.");
}
@@ -102,7 +98,7 @@
// Process each entry
for (Iterator i = entries.iterator(); i.hasNext();) {
PingQueueEntryData pingQueueEntry = (PingQueueEntryData) i.next();
- processQueueEntry(absoluteContextUrl, pingQueueEntry);
+ processQueueEntry(pingQueueEntry);
}
if (logger.isDebugEnabled()) logger.debug("Finished processing ping queue.");
} catch (Exception ex) {
@@ -113,12 +109,11 @@
/**
* Process an individual ping queue entry.
*
- * @param absoluteContextUrl absolute context URL of the Roller site
* @param pingQueueEntry the ping queue entry
* @throws RollerException only if there are problems processing the queue. Exceptions from sending pings are
* handled, not thrown.
*/
- private void processQueueEntry(String absoluteContextUrl, PingQueueEntryData pingQueueEntry) throws RollerException {
+ private void processQueueEntry(PingQueueEntryData pingQueueEntry) throws RollerException {
if (logger.isDebugEnabled()) logger.debug("Processing ping queue entry: " + pingQueueEntry);
PingTargetData pingTarget = pingQueueEntry.getPingTarget();
@@ -132,7 +127,7 @@
// Actually process the ping
try {
// Send the ping
- WeblogUpdatePinger.sendPing(absoluteContextUrl, pingTarget, website);
+ WeblogUpdatePinger.sendPing(pingTarget, website);
// Consider successful ping transmission if we didn't get an exception. We don't care here
// about the result of the ping if it was transmitted.
pingSucceeded = true;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueTask.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueTask.java?rev=424832&r1=424831&r2=424832&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueTask.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/PingQueueTask.java Sun Jul 23 14:59:24 2006
@@ -23,7 +23,6 @@
import org.apache.roller.RollerException;
import org.apache.roller.model.Roller;
import org.apache.roller.model.RollerFactory;
-import org.apache.roller.ui.core.RollerContext;
import java.util.TimerTask;
@@ -43,11 +42,10 @@
/**
* Initialize the task.
*
- * @param rc the Roller context.
* @throws RollerException
*/
- public void init(RollerContext rc, long intervalMins) throws RollerException {
- PingQueueProcessor.init(rc);
+ public void init(long intervalMins) throws RollerException {
+ PingQueueProcessor.init();
this.intervalMins = intervalMins;
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java?rev=424832&r1=424831&r2=424832&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/pings/WeblogUpdatePinger.java Sun Jul 23 14:59:24 2006
@@ -20,7 +20,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.RollerException;
import org.apache.roller.config.PingConfig;
import org.apache.roller.pojos.PingTargetData;
import org.apache.roller.pojos.WebsiteData;
@@ -87,15 +86,13 @@
/**
* Send a weblog update ping.
*
- * @param absoluteContextUrl the absolute context url of the Roller site.
* @param pingTarget the target site to ping
* @param website the website that changed (from which the ping originates)
* @return the result message string sent by the server.
* @throws IOException
* @throws XmlRpcException
- * @throws RollerException
*/
- public static PingResult sendPing(String absoluteContextUrl, PingTargetData pingTarget, WebsiteData website) throws RollerException, IOException, XmlRpcException {
+ public static PingResult sendPing(PingTargetData pingTarget, WebsiteData website) throws IOException, XmlRpcException {
String websiteUrl = website.getAbsoluteURL();
String pingTargetUrl = pingTarget.getPingUrl();
Set variantOptions = PingConfig.getVariantOptions(pingTargetUrl);