Author: gmazza
Date: Tue Sep 3 22:39:44 2013
New Revision: 1519874
URL: http://svn.apache.org/r1519874
Log:
Shutting off referrers processing by default
(referrers.processing.enabled=false), assuming most who would care would be
using Google Analytics or similar 3rd party tools instead.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/themes/ThemeMetadataParser.java
Tue Sep 3 22:39:44 2013
@@ -29,8 +29,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/User.java
Tue Sep 3 22:39:44 2013
@@ -19,7 +19,6 @@
package org.apache.roller.weblogger.pojos;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/CustomOpenIDAuthenticationProcessingFilter.java
Tue Sep 3 22:39:44 2013
@@ -33,7 +33,6 @@ import org.springframework.security.core
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.openid.OpenIDAuthenticationToken;
import org.springframework.security.openid.OpenIDAuthenticationFilter;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.openid.OpenIDConsumer;
//import org.springframework.security.userdetails.openid.OpenIDUserAttribute;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/filters/ValidateSaltFilter.java
Tue Sep 3 22:39:44 2013
@@ -31,8 +31,6 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.ui.rendering.util.cache.SaltCache;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
Tue Sep 3 22:39:44 2013
@@ -32,7 +32,6 @@ import java.util.Locale;
import java.util.ResourceBundle;
import java.util.StringTokenizer;
-import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.tagext.TagSupport;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/MainMenu.java
Tue Sep 3 22:39:44 2013
@@ -27,7 +27,6 @@ import org.apache.roller.weblogger.busin
import org.apache.roller.weblogger.business.UserManager;
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.ui.struts2.util.UIAction;
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Maintenance.java
Tue Sep 3 22:39:44 2013
@@ -32,14 +32,13 @@ import org.apache.roller.weblogger.util.
/**
- * Allows user to perform maintenence operations such as flushing
+ * Allows user to perform maintenance operations such as flushing
* the page cache or re-indexing the search index.
*/
public class Maintenance extends UIAction {
private static Log log = LogFactory.getLog(Maintenance.class);
-
-
+
public Maintenance() {
this.actionName = "maintenance";
this.desiredMenu = "editor";
@@ -105,5 +104,5 @@ public class Maintenance extends UIActio
return SUCCESS;
}
-
+
}
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
(original)
+++
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/Referrers.java
Tue Sep 3 22:39:44 2013
@@ -39,10 +39,10 @@ public class Referrers extends UIAction
// list of referrers to display
private List<WeblogReferrer> referrers = Collections.EMPTY_LIST;
-
+
// referrers hits today
private int dayHits = 0;
-
+
// ids of referrers to remove
private String[] removeIds = null;
Modified:
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
URL:
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties?rev=1519874&r1=1519873&r2=1519874&view=diff
==============================================================================
---
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
(original)
+++
roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
Tue Sep 3 22:39:44 2013
@@ -223,8 +223,13 @@ cache.dir=${user.home}/roller_data/plane
#----------------------------------
# referrer processing
-# Enable built-in referrer processing?
-referrers.processing.enabled=true
+# Built-in referrer processing disabled by default, to save memory and
processing
+# demands. Also, most bloggers interested in this information would use
detailed
+# third-party referrer reporting tools such as Google Analytics which do not
require
+# Roller to capture this data. If you enable, be sure to add
TurnoverReferersTask to
+# below tasks.enabled property to reset the referrer counts on a daily or as
+# desired basis.
+referrers.processing.enabled=false
# Change to true if you want to process referrers asynchronously.
# You can choose how many threads to use and sleep time (in seconds)
@@ -253,7 +258,7 @@ referrers.queue.sleepTime=10
# The *enabled* tasks are defined by tasks.enabled=<taskname>[,<taskname>]
# Tasks which are enabled. Only tasks listed here will be run.
-tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,TurnoverReferersTask,PingQueueTask
+tasks.enabled=ScheduledEntriesTask,ResetHitCountsTask,PingQueueTask
# client identifier. should be unique for each instance in a cluster.
tasks.clientId=defaultClientId
@@ -294,13 +299,6 @@ tasks.RefreshRollerPlanetTask.startTime=
tasks.RefreshRollerPlanetTask.interval=60
tasks.RefreshRollerPlanetTask.leaseTime=30
-# Technorati rankings for planet feeds
-tasks.TechnoratiRankingsTask.class=org.apache.roller.weblogger.planet.tasks.TechnoratiRankingsTask
-tasks.TechnoratiRankingsTask.startTime=startOfDay
-tasks.TechnoratiRankingsTask.interval=1440
-tasks.TechnoratiRankingsTask.leaseTime=30
-
-
#-----------------------------------------------------------------------------
# Cache configuratation
#-----------------------------------------------------------------------------
