roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1598870 [1/2] - in /roller/trunk: app/src/main/java/org/apache/roller/weblogger/business/ app/src/main/java/org/apache/roller/weblogger/business/jpa/ app/src/main/java/org/apache/roller/weblogger/business/referrers/ app/src/main/java/org/a...
Date Sat, 31 May 2014 14:04:24 GMT
Author: gmazza
Date: Sat May 31 14:04:21 2014
New Revision: 1598870

URL: http://svn.apache.org/r1598870
Log:
ROL-1999 removed referrer functionality in favor of recently added web analytics configuration.

Removed:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPARefererManagerImpl.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/referrers/
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/TurnoverReferersTask.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogReferrer.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogReferrerWrapper.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/pojos/WeblogReferrer.orm.xml
    roller/trunk/app/src/main/webapp/WEB-INF/jsps/editor/Referrers.jsp
    roller/trunk/app/src/test/java/org/apache/roller/weblogger/business/RefererTest.java
Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties
    roller/trunk/app/src/main/resources/ApplicationResources_da.properties
    roller/trunk/app/src/main/resources/ApplicationResources_de.properties
    roller/trunk/app/src/main/resources/ApplicationResources_es.properties
    roller/trunk/app/src/main/resources/ApplicationResources_is.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
    roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
    roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
    roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
    roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
    roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
    roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
    roller/trunk/app/src/main/resources/META-INF/persistence.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/roller.properties
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
    roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
    roller/trunk/app/src/main/resources/sql/createdb.vm
    roller/trunk/app/src/main/resources/sql/droptables.sql
    roller/trunk/app/src/main/resources/struts.xml
    roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
    roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
    roller/trunk/app/src/main/webapp/themes/base.css
    roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css
    roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm
    roller/trunk/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css
    roller/trunk/app/src/main/webapp/themes/sotto/sotto-custom.css
    roller/trunk/app/src/test/resources/roller-custom.properties
    roller/trunk/app/src/test/resources/roller-jettyrun.properties
    roller/trunk/docs/roller-install-guide.odt
    roller/trunk/docs/roller-template-guide.odt
    roller/trunk/docs/roller-user-guide.odt

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/Weblogger.java Sat May 31 14:04:21 2014
@@ -25,8 +25,6 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.business.pings.AutoPingManager;
 import org.apache.roller.weblogger.business.pings.PingQueueManager;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
-import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
 import org.apache.roller.weblogger.business.runnable.ThreadManager;
 import org.apache.roller.weblogger.business.search.IndexManager;
 import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -73,19 +71,6 @@ public interface Weblogger {
     
     
     /**
-     * 
-     * Get RefererManager associated with this Weblogger instance.
-     */
-    RefererManager getRefererManager();
-    
-    
-    /**
-     * Get ReferrerQueueManager.
-     */
-    ReferrerQueueManager getReferrerQueueManager();
-    
-    
-    /**
      * Get the AutoPingManager associated with this Weblogger instance.
      */
     AutoPingManager getAutopingManager();

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/WebloggerImpl.java Sat May 31 14:04:21 2014
@@ -29,8 +29,6 @@ import org.apache.roller.weblogger.Weblo
 import org.apache.roller.weblogger.business.pings.AutoPingManager;
 import org.apache.roller.weblogger.business.pings.PingQueueManager;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
-import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
 import org.apache.roller.weblogger.business.search.IndexManager;
 import org.apache.roller.weblogger.business.runnable.ThreadManager;
 import org.apache.roller.weblogger.business.themes.ThemeManager;
@@ -58,8 +56,6 @@ public abstract class WebloggerImpl impl
     private final PingTargetManager    pingTargetManager;
     private final PluginManager        pluginManager;
     private final PropertiesManager    propertiesManager;
-    private final RefererManager       refererManager;
-    private final ReferrerQueueManager refererQueueManager;
     private final ThemeManager         themeManager;
     private final ThreadManager        threadManager;
     private final UserManager          userManager;
@@ -90,8 +86,6 @@ public abstract class WebloggerImpl impl
         PingTargetManager    pingTargetManager,
         PluginManager        pluginManager,
         PropertiesManager    propertiesManager,
-        RefererManager       refererManager,
-        ReferrerQueueManager refererQueueManager, 
         ThemeManager         themeManager,
         ThreadManager        threadManager,
         UserManager          userManager,
@@ -112,8 +106,6 @@ public abstract class WebloggerImpl impl
         this.pingTargetManager   = pingTargetManager;
         this.pluginManager       = pluginManager;
         this.propertiesManager   = propertiesManager;
-        this.refererManager      = refererManager;
-        this.refererQueueManager = refererQueueManager;
         this.themeManager        = themeManager;
         this.threadManager       = threadManager;
         this.userManager         = userManager;
@@ -152,7 +144,7 @@ public abstract class WebloggerImpl impl
     /**
      * 
      * 
-     * @see org.apache.roller.weblogger.modelWebloggerr#getIndexManager()
+     * @see org.apache.roller.weblogger.model.Weblogger#getIndexManager()
      */
     public IndexManager getIndexManager() {
         return indexManager;
@@ -170,15 +162,6 @@ public abstract class WebloggerImpl impl
     
     
     /**
-     * @see org.apache.roller.weblogger.business.referrers.ReferrerQueueManager
-     */
-    public ReferrerQueueManager getReferrerQueueManager() {
-        return refererQueueManager;
-    }
-    
-    
-    
-    /**
      * 
      * 
      * @see org.apache.roller.weblogger.modelWebloggerr#getUserManager()
@@ -236,17 +219,7 @@ public abstract class WebloggerImpl impl
         return weblogManager;
     }
     
-    
-    /**
-     * 
-     * 
-     * @see org.apache.roller.weblogger.modelWebloggerr#getRefererManager()
-     */
-    public RefererManager getRefererManager() {
-        return refererManager;
-    }
-    
-    
+
     /**
      * 
      * 
@@ -338,7 +311,6 @@ public abstract class WebloggerImpl impl
             pingTargetManager.release();
             pingQueueManager.release();
             pluginManager.release();
-            refererManager.release();
             threadManager.release();
             userManager.release();
             weblogManager.release();
@@ -400,9 +372,6 @@ public abstract class WebloggerImpl impl
     public void shutdown() {
         try {
             HitCountQueue.getInstance().shutdown();
-            if (getReferrerQueueManager() != null) {
-                getReferrerQueueManager().shutdown();
-            }
             if (indexManager != null) {
                 indexManager.shutdown();
             }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogEntryManagerImpl.java Sat May 31 14:04:21 2014
@@ -233,13 +233,6 @@ public class JPAWeblogEntryManagerImpl i
     public void removeWeblogEntry(WeblogEntry entry) throws WebloggerException {
         Weblog weblog = entry.getWebsite();
         
-        Query q = strategy.getNamedQuery("WeblogReferrer.getByWeblogEntry");
-        q.setParameter(1, entry);
-        List referers = q.getResultList();
-        for (Object obj : referers) {
-            this.strategy.remove(obj);
-        }
-
         CommentSearchCriteria csc = new CommentSearchCriteria();
         csc.setEntry(entry);
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java Sat May 31 14:04:21 2014
@@ -50,7 +50,6 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.pojos.WeblogEntryTag;
 import org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate;
 import org.apache.roller.weblogger.pojos.WeblogPermission;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
 import org.apache.roller.weblogger.pojos.WeblogTemplate;
 import org.apache.roller.weblogger.pojos.WeblogThemeAssoc;
 import org.apache.roller.weblogger.pojos.WeblogThemeTemplateCode;
@@ -167,14 +166,6 @@ public class JPAWeblogManagerImpl implem
             this.strategy.remove(autoPing);
         }
         
-        // remove associated referers
-        Query refQuery2 = strategy.getNamedQuery("WeblogReferrer.getByWebsite");
-        refQuery2.setParameter(1, website);
-        List referers = refQuery2.getResultList();
-        for (Object obj : referers) {
-            WeblogReferrer referer = (WeblogReferrer) obj;
-            this.strategy.remove(referer.getClass(), referer.getId());
-        }
         // TODO: can we eliminate this unnecessary flush with OpenJPA 1.0
         this.strategy.flush(); 
        

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerImpl.java Sat May 31 14:04:21 2014
@@ -36,8 +36,6 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.business.pings.PingQueueManager;
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
 import org.apache.roller.weblogger.business.plugins.PluginManager;
-import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
 import org.apache.roller.weblogger.business.search.IndexManager;
 import org.apache.roller.weblogger.business.themes.ThemeManager;
 
@@ -69,8 +67,6 @@ public class JPAWebloggerImpl extends We
         PingTargetManager    pingTargetManager,
         PluginManager        pluginManager,
         PropertiesManager    propertiesManager,
-        RefererManager       refererManager,
-        ReferrerQueueManager refererQueueManager,
         ThemeManager         themeManager,
         ThreadManager        threadManager,
         UserManager          userManager,
@@ -92,8 +88,6 @@ public class JPAWebloggerImpl extends We
             pingTargetManager,
             pluginManager,
             propertiesManager,
-            refererManager,
-            refererQueueManager,
             themeManager,
             threadManager,
             userManager,

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAWebloggerModule.java Sat May 31 14:04:21 2014
@@ -46,9 +46,6 @@ import org.apache.roller.weblogger.busin
 import org.apache.roller.weblogger.business.pings.PingTargetManager;
 import org.apache.roller.weblogger.business.plugins.PluginManager;
 import org.apache.roller.weblogger.business.plugins.PluginManagerImpl;
-import org.apache.roller.weblogger.business.referrers.RefererManager;
-import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
-import org.apache.roller.weblogger.business.referrers.ReferrerQueueManagerImpl;
 import org.apache.roller.weblogger.business.runnable.ThreadManager;
 import org.apache.roller.weblogger.business.search.IndexManager;
 import org.apache.roller.weblogger.business.search.IndexManagerImpl;
@@ -73,8 +70,7 @@ public class JPAWebloggerModule implemen
         binder.bind(PingQueueManager.class).to(    JPAPingQueueManagerImpl.class);   
         binder.bind(PingTargetManager.class).to(   JPAPingTargetManagerImpl.class); 
         binder.bind(PropertiesManager.class).to(   JPAPropertiesManagerImpl.class);   
-        binder.bind(RefererManager.class).to(      JPARefererManagerImpl.class);
-        binder.bind(ThreadManager.class).to(       JPAThreadManagerImpl.class);  
+        binder.bind(ThreadManager.class).to(       JPAThreadManagerImpl.class);
         binder.bind(UserManager.class).to(         JPAUserManagerImpl.class);   
         binder.bind(WeblogManager.class).to(       JPAWeblogManagerImpl.class);   
         binder.bind(WeblogEntryManager.class).to(  JPAWeblogEntryManagerImpl.class);   
@@ -82,7 +78,6 @@ public class JPAWebloggerModule implemen
 
         binder.bind(OAuthValidator.class).to(      SimpleOAuthValidator.class);
                 
-        binder.bind(ReferrerQueueManager.class).to(ReferrerQueueManagerImpl.class);  
         binder.bind(MediaFileManager.class).to(    JPAMediaFileManagerImpl.class);
         binder.bind(FileContentManager.class).to(  FileContentManagerImpl.class);
         binder.bind(IndexManager.class).to(        IndexManagerImpl.class);

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/runnable/ResetHitCountsTask.java Sat May 31 14:04:21 2014
@@ -130,7 +130,7 @@ public class ResetHitCountsTask extends 
             log.info("task completed");
             
         } catch (WebloggerException e) {
-            log.error("Error while checking for referer turnover", e);
+            log.error("Error while resetting hit counts", e);
         } catch (Exception ee) {
             log.error("unexpected exception", ee);
         } finally {

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/Weblog.java Sat May 31 14:04:21 2014
@@ -25,7 +25,6 @@ import org.apache.commons.lang3.builder.
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.roller.weblogger.WebloggerException;
 import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
-import org.apache.roller.weblogger.business.referrers.RefererManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -602,9 +601,8 @@ public class Weblog implements Serializa
      * This includes a change to weblog settings, entries, themes, templates, 
      * comments, categories, bookmarks, folders, etc.
      *
-     * Pings and Referrers are explicitly not included because pings do not
-     * affect visible changes to a weblog, and referrers change so often that
-     * it would diminish the usefulness of the attribute.
+     * Pings are explicitly not included because pings do not
+     * affect visible changes to a weblog.
      *
      */
     public Date getLastModified() {
@@ -877,21 +875,7 @@ public class Weblog implements Serializa
         return ret;
     }
 
-    
-    /** 
-     * Return collection of referrers for current day.
-     */
-    public List<WeblogReferrer> getTodaysReferrers() {
-        try {
-            Weblogger roller = WebloggerFactory.getWeblogger();
-            RefererManager rmgr = roller.getRefererManager();
-            return rmgr.getTodaysReferers(this);
-        } catch (WebloggerException e) {
-            log.error("PageModel getTodaysReferers()", e);
-        }
-        return Collections.emptyList();
-    }
-    
+
     /**
      * Get number of hits counted today.
      */

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/WeblogEntry.java Sat May 31 14:04:21 2014
@@ -752,16 +752,6 @@ public class WeblogEntry implements Seri
         return comments.size();
     }
     
-    public List getReferers() {
-        List referers = null;
-        try {
-            referers = WebloggerFactory.getWeblogger().getRefererManager().getReferersToEntry(getId());
-        } catch (WebloggerException e) {
-            mLogger.error("Unexpected exception", e);
-        }
-        return referers;
-    }
-    
     //------------------------------------------------------------------------
         
     /**

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogEntryWrapper.java Sat May 31 14:04:21 2014
@@ -32,7 +32,6 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.pojos.WeblogEntryTag;
 import org.apache.roller.weblogger.pojos.WeblogEntryTagComparator;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
 import org.apache.roller.weblogger.util.HTMLSanitizer;
 
 
@@ -288,24 +287,6 @@ public final class WeblogEntryWrapper {
     }
     
     
-    public List getReferers() {
-        List initialCollection = this.pojo.getReferers();
-        
-        // iterate through and wrap
-        // we force the use of an ArrayList because it should be good enough to cover
-        // for any Collection type we encounter.
-        ArrayList wrappedCollection = new ArrayList(initialCollection.size());
-        Iterator it = initialCollection.iterator();
-        int i = 0;
-        while(it.hasNext()) {
-            wrappedCollection.add(i,WeblogReferrerWrapper.wrap((WeblogReferrer) it.next(), urlStrategy));
-            i++;
-        }
-        
-        return wrappedCollection;
-    }
-    
-    
     public String getPermalink() {
         return this.pojo.getPermalink();
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/pojos/wrapper/WeblogWrapper.java Sat May 31 14:04:21 2014
@@ -29,7 +29,6 @@ import org.apache.roller.weblogger.pojos
 import org.apache.roller.weblogger.pojos.WeblogCategory;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
 
 
 /**
@@ -372,20 +371,7 @@ public final class WeblogWrapper {
     public WeblogBookmarkFolderWrapper getBookmarkFolder(String folderName) {
         return WeblogBookmarkFolderWrapper.wrap(this.pojo.getBookmarkFolder(folderName));
     }
-    
-    
-    public List<WeblogReferrerWrapper> getTodaysReferrers() {
-        List<WeblogReferrer> unwrapped = this.pojo.getTodaysReferrers();
-        List<WeblogReferrerWrapper> wrapped = new ArrayList<WeblogReferrerWrapper>(unwrapped.size());
-        int i = 0;
-        for (WeblogReferrer referrer : unwrapped) {
-            wrapped.add(i,WeblogReferrerWrapper.wrap(referrer, urlStrategy));
-            i++;
-        }
-        return wrapped;
-    }
-    
-    
+
     public int getTodaysHits() {
         return this.pojo.getTodaysHits();
     }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Sat May 31 14:04:21 2014
@@ -26,8 +26,6 @@ import org.apache.roller.weblogger.Weblo
 import org.apache.roller.weblogger.business.HitCountQueue;
 import org.apache.roller.weblogger.business.WeblogEntryManager;
 import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.referrers.IncomingReferrer;
-import org.apache.roller.weblogger.business.referrers.ReferrerQueueManager;
 import org.apache.roller.weblogger.business.themes.ThemeManager;
 import org.apache.roller.weblogger.config.WebloggerConfig;
 import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
@@ -98,11 +96,11 @@ public class PageServlet extends HttpSer
         // get a reference to the site wide cache
         this.siteWideCache = SiteWideCache.getInstance();
 
-        // see if built-in referrer processing is enabled
+        // see if built-in referrer spam check is enabled
         this.processReferrers = WebloggerConfig
-                .getBooleanProperty("referrers.processing.enabled");
+                .getBooleanProperty("site.blacklist.enable.referrers");
 
-        log.info("Referrer processing enabled = " + this.processReferrers);
+        log.info("Referrer spam check enabled = " + this.processReferrers);
 
         // check for possible robot pattern
         String robotPatternStr = WebloggerConfig
@@ -659,22 +657,6 @@ public class PageServlet extends HttpSer
             }
         }
 
-        // referrer is valid, lets record it
-        try {
-            IncomingReferrer referrer = new IncomingReferrer();
-            referrer.setReferrerUrl(referrerUrl);
-            referrer.setRequestUrl(requestUrl);
-            referrer.setWeblogHandle(pageRequest.getWeblogHandle());
-            referrer.setWeblogAnchor(pageRequest.getWeblogAnchor());
-            referrer.setWeblogDateString(pageRequest.getWeblogDate());
-
-            ReferrerQueueManager refQueue = WebloggerFactory.getWeblogger()
-                    .getReferrerQueueManager();
-            refQueue.processReferrer(referrer);
-        } catch (Exception e) {
-            log.error("Error processing referrer", e);
-        }
-
         return false;
     }
 }

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/util/cache/SiteWideCache.java Sat May 31 14:04:21 2014
@@ -34,7 +34,6 @@ import org.apache.roller.weblogger.confi
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.WeblogCategory;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -385,14 +384,6 @@ public final class SiteWideCache impleme
     
     
     /**
-     * A referer has changed.
-     */
-    public void invalidate(WeblogReferrer referer) {
-        // ignored
-    }
-    
-    
-    /**
      * A user profile has changed.
      */
     public void invalidate(User user) {

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfig.java Sat May 31 14:04:21 2014
@@ -162,9 +162,6 @@ public class WeblogConfig extends UIActi
                     wmgr.applyCommentDefaultsToEntries(weblog);
                 }
 
-                // apply referer filters
-                WebloggerFactory.getWeblogger().getRefererManager().applyRefererFilters(weblog);
-
                 // flush
                 WebloggerFactory.getWeblogger().flush();
 

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheHandler.java Sat May 31 14:04:21 2014
@@ -21,7 +21,6 @@ package org.apache.roller.weblogger.util
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.WeblogCategory;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -50,8 +49,6 @@ public interface CacheHandler {
 
     void invalidate(WeblogEntryComment comment);
 
-    void invalidate(WeblogReferrer referer);
-
     void invalidate(User user);
 
     void invalidate(WeblogCategory category);

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/util/cache/CacheManager.java Sat May 31 14:04:21 2014
@@ -28,7 +28,6 @@ import org.apache.roller.weblogger.confi
 import org.apache.roller.weblogger.pojos.WeblogBookmark;
 import org.apache.roller.weblogger.pojos.WeblogEntryComment;
 import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder;
-import org.apache.roller.weblogger.pojos.WeblogReferrer;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.WeblogCategory;
 import org.apache.roller.weblogger.pojos.WeblogEntry;
@@ -254,19 +253,6 @@ public final class CacheManager {
     }
     
     
-    public static void invalidate(WeblogReferrer referer) {
-        
-        log.debug("invalidating referer = "+referer.getId());
-        
-        // NOTE: Invalidating an entire website for each referer is not
-        //       good for our caching.  This may need reevaluation later.
-        //lastExpiredCache.put(referer.getWebsite().getHandle(), new Date());
-        for (CacheHandler handler : cacheHandlers) {
-            handler.invalidate(referer);
-        }
-    }
-    
-    
     public static void invalidate(User user) {
         
         log.debug("invalidating user = "+user.getUserName());

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat May 31 14:04:21 2014
@@ -1594,27 +1594,6 @@ planetGroups.error.duringSave=Duplicate 
 planetGroups.error.nameReserved=Can''t use handle ''all''
 planetGroups.error.deleting=Error deleting object
 
-# ----------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=Referrers
-referers.subtitle=Referrer rankings for weblog <span>{0}</span>
-referers.tip=This page tells you where your weblog''s hits are coming from \
-today. Hits with indeterminate referrers, such as those from newsfeed readers \
-and bookmarks are counted as ''direct'' hits. If you are getting referrer spam, \
-use the Preferences:Settings Spam Prevention feature to set ignore words \
-(referrers that contain ignore words will be rejected).
-
-referers.url=Referring URL
-referers.hits=Day Hits
-referers.deleteSelected=Delete Selected
-
-referers.hitCounters=Hits Counted Today
-referers.reset=Reset Hit Count
-
-referers.deletedReferers=Deleted specified referrers
-referers.noReferersSpecified=You did not specify any referrers to delete
-
-
 # ------------------------------------------------------------------ Statistics
 
 statCount.weblogCommentCountType=Weblog comment count
@@ -1666,7 +1645,6 @@ tabbedmenu.weblog.categories=Categories
 tabbedmenu.weblog.commentManagement=Comments
 tabbedmenu.bookmarks.allFolders=Blogroll
 tabbedmenu.bookmarks.import=Import
-tabbedmenu.weblog.referers=Referrers
 tabbedmenu.website.files=File Uploads
 
 tabbedmenu.design=Design
@@ -2264,7 +2242,6 @@ weblogMain.search=Search
 weblogMain.navigation=Navigation
 weblogMain.links=Links
 weblogMain.language=Language
-weblogMain.referers=Referrers
 weblogMain.archives=Archives
 weblogMain.poweredBy=Powered By
 
@@ -2272,8 +2249,8 @@ weblogMain.poweredBy=Powered By
 
 websiteSettings.title=Weblog Settings
 websiteSettings.subtitle=Manage settings for weblog <span>{0}</span>
-websiteSettings.tip=Change weblog title, description, comment and referrer \
-spam prevention settings.
+websiteSettings.tip=Change weblog title, description, comment and spam prevention settings.
+
 
 # --- General settings
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_da.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_da.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_da.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_da.properties Sat May 31 14:04:21 2014
@@ -1272,27 +1272,6 @@ planetGroups.error.duringSave=Gruppen er
 planetGroups.error.nameReserved=Kan ikke bruge den entydige identifikation ''all'' eller ''external''
 planetGroups.error.deleting=Fejl i forbindelse med sletning
 
-# ----------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=Dem der henviser til mig
-referers.subtitle=Dem der henviser til mig har givet weblog <span>{0}</span> placeringen
-referers.tip=Denne side viser hvor dine weblog's hits kommer fra i dag. \
-Hits med midlertidige henvisninger til mig, eksempelvis fra nyhedsfeed l�sere \
-og bogm�rker t�ller som ''direkte'' hits. Hvis du f�r spam fra dem der henviser til mig, \
-s� kan man i ops�tningen: Spam Forebyggelse definere en ordliste \
-(Dem der henviser til mig som indeholder ordene vil blive ignoreret).
-
-referers.url=Henvisning URL
-referers.hits=Dagens Hits
-referers.deleteSelected=Fjern valgte
-
-referers.hitCounters=Hits i dag
-referers.reset=Nulstil hit
-
-referers.deletedReferers=Fjern den angivne, der henviser til mig
-referers.noReferersSpecified=Du angav ikke en der henviser til mig, som skal fjernes 
-
-
 # ------------------------------------------------------------------ Statistics
 
 statCount.weblogCommentCountType=Opt�lling af weblog kommentarer
@@ -1335,7 +1314,6 @@ tabbedmenu.weblog.categories=Kategorier
 tabbedmenu.weblog.commentManagement=Kommentarer
 tabbedmenu.bookmarks.allFolders=Blogroll
 tabbedmenu.bookmarks.import=Importer
-tabbedmenu.weblog.referers=Dem der henviser til mig
 tabbedmenu.website.files=Fil upload
 
 tabbedmenu.design=Design
@@ -1857,7 +1835,6 @@ weblogMain.search=S�g
 weblogMain.navigation=Navigation
 weblogMain.links=Links
 weblogMain.language=Sprog
-weblogMain.referers=Dem der henviser til mig
 weblogMain.archives=Arkiv
 weblogMain.poweredBy=Lavet med
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_de.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_de.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_de.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_de.properties Sat May 31 14:04:21 2014
@@ -915,16 +915,6 @@ planetSubscriptions.subtitle.edit=Bearbe
 planetSubscriptions.title=Abonnements
 planetSubscriptions.titleGroup=Abonnements [{0}]
 planetSubscriptions.unconfigured=Planet Roller wurde noch nicht konfiguriert
-referers.deleteSelected=Gew\u00E4hlte Eintr\u00E4ge l\u00F6schen
-referers.deletedReferers=Referenzierte URLs wurden gel\u00F6scht
-referers.hitCounters=Hit Z\u00E4hler
-referers.hits=Tages Hits
-referers.noReferersSpecified=Sie haben keine referenzierenden URLs zum L\u00F6schen angegeben
-referers.reset=Hit Z\u00E4hler zur\u00FCcksetzen
-referers.subtitle=Referrer Rangliste des Weblogs <span>{0}</span>
-referers.tip=Diese Seite verr\u00E4t Ihnen, woher die heutigen Weblog-Aufrufe kommen. Aufrufe von unbestimmten Referrern, wie Newsreadern und Lesezeichen, werden als direkte Hits gez\u00E4hlt. Falls Sie Referrer Spam erhalten, nutzen Sie bitte in den Einstellungen die Liste der zu ignorierenden URLs.
-referers.todaysReferers=Heutige Referrer Rangliste
-referers.url=Referenz URL
 search.title=Suchergebnisse
 searchForm.alert=Bitte tragen sie einen Suchbegriff ein um fortzufahren.
 searchForm.button=Suche
@@ -974,7 +964,6 @@ tabbedmenu.weblog.flushCache=Cache erneu
 tabbedmenu.weblog.import=Import
 tabbedmenu.weblog.newEntry=Neuer Eintrag
 tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.referers=Referenz URLs
 tabbedmenu.website=Webseite
 tabbedmenu.website.files=Dateien
 tabbedmenu.website.inviteMember=Mitglied einladen
@@ -1325,7 +1314,6 @@ weblogMain.language=Sprache
 weblogMain.links=Links
 weblogMain.navigation=Navigation
 weblogMain.poweredBy=Powered by
-weblogMain.referers=Referenzierte URLs
 weblogMain.search=Suche
 websiteRemove.subtitle=Weblogl\u00F6schung ist <b>NICHT UMKEHRBAR</b>
 websiteRemove.title=Weblogl\u00F6schung best\u00E4tigen

Modified: roller/trunk/app/src/main/resources/ApplicationResources_es.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_es.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_es.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_es.properties Sat May 31 14:04:21 2014
@@ -638,16 +638,6 @@ planetGroups.error.handle = El nombre es
 planetGroups.error.duringSave = \u00BFGrupo duplicado? - {0}
 planetGroups.error.nameReserved = No se puede utilizar el nombre 'all' o 'external'
 planetGroups.error.deleting = Error borrando objeto
-referers.todaysReferers = Remitentes
-referers.subtitle = Rankings de remitentes para el weblog <span>{0}</span>
-referers.tip = Esta p\u00E1gina le dice de d\u00F3nde vienen las visitas de hoy a su weblog. Las visitas con remitentes indeterminados, como las de los lectores de noticias y marcadores son computadas como visitas "directas". Si est\u00E1 teniendo spam, use la Configuraci\u00F3n de la prevenci\u00F3n de spam para ignorar palabras (los remitentes que contengan esas palabras ser\u00E1n rechazados).
-referers.url = URL del remitente
-referers.hits = Visitas al d\u00EDa
-referers.deleteSelected = Eliminar seleccionados
-referers.hitCounters = Visitas contadas hoy
-referers.reset = Poner a cero el contador de visitas
-referers.deletedReferers = Eliminar remitentes especificados
-referers.noReferersSpecified = No especific\u00F3 ning\u00FAn remitente para eliminar
 cacheInfo.title = Informaci\u00F3n de cach\u00E9
 cacheInfo.subtitle = Monitorizar estad\u00EDsticas de cach\u00E9
 cacheInfo.prompt = Esta p\u00E1gina ofrece herramientas de datos sobre lo que est\u00E1 ocurriendo en el sistema de cach\u00E9s.
@@ -662,7 +652,6 @@ tabbedmenu.weblog.categories = Categor\u
 tabbedmenu.weblog.commentManagement = Comentarios
 tabbedmenu.bookmarks.allFolders = Blogroll
 tabbedmenu.bookmarks.import = Importar
-tabbedmenu.weblog.referers = Remitentes
 tabbedmenu.website.files = Carga de ficheros
 tabbedmenu.website = Preferencias
 tabbedmenu.website.settings = Configuraci\u00F3n
@@ -933,7 +922,6 @@ weblogMain.search = Buscar
 weblogMain.navigation = Navegaci\u00F3n
 weblogMain.links = Enlaces
 weblogMain.language = Idioma
-weblogMain.referers = Remitentes
 weblogMain.archives = Archivos
 weblogMain.poweredBy = Hecho con
 websiteSettings.title = Configuraci\u00F3n del Weblog

Modified: roller/trunk/app/src/main/resources/ApplicationResources_is.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_is.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_is.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_is.properties Sat May 31 14:04:21 2014
@@ -373,19 +373,6 @@ folderForm.correctFolder=Lei�r�
 
 folderForm.save.exception=VILLA vi� a� vista skr�arsafn, ef til vill er nafni� ekki einkv�mt? Villuskilabo�in eru: {0}
 
-# ------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=Heims�knir � dag
-referers.url=Hva�an?
-referers.hits=Fj�ldi heims�kna
-referers.deleteSelected=Ey�a v�ldum
-
-referers.hitCounters=Teljarar
-referers.reset=Endurstilla teljara
-
-referers.deletedReferers=Eyddi uppl�singum
-referers.noReferersSpecified=�� tilt�kst ekkert til a� ey�a
-
 # ------------------------------------------------------------- Search Form
 
 searchForm.button=Leita
@@ -398,7 +385,6 @@ tabbedmenu.weblog=Blogg
 tabbedmenu.weblog.newEntry=N� f�rsla
 tabbedmenu.weblog.archives=Gamlar f�rslur
 tabbedmenu.weblog.categories=Flokkar
-tabbedmenu.weblog.referers=Heims�knir
 tabbedmenu.weblog.export=Flytja �t
 tabbedmenu.weblog.import=Flytja inn
 tabbedmenu.weblog.flushCache=Hreinsa fl�timinni
@@ -630,7 +616,6 @@ weblogMain.search=Leit
 weblogMain.navigation=Valmynd
 weblogMain.links=Tenglar
 weblogMain.language=Tungum�l
-weblogMain.referers=Heims�knir
 weblogMain.archives=Gamlar f�rslur
 weblogMain.poweredBy=Kn�i� af
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ja_JP.properties Sat May 31 14:04:21 2014
@@ -1043,28 +1043,6 @@ planetGroups.error.duringSave=Duplicate 
 planetGroups.error.nameReserved=\u300Call\u300D\u306A\u3044\u3057\u300Cexternal\u300D\u306F\u30B7\u30B9\u30C6\u30E0\u304C\u4E88\u7D04\u3057\u3066\u3044\u308B\u305F\u3081\u9078\u629E\u3067\u304D\u307E\u305B\u3093\u3002
 planetGroups.error.deleting=Error deleting object
 
-# ----------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=\u672C\u65E5\u306E\u30EA\u30D5\u30A1\u30E9
-referers.subtitle=<span>{0}</span>\u306E\u672C\u65E5\u306E\u30EA\u30D5\u30A1\u30E9\u30E9\u30F3\u30AD\u30F3\u30B0\u3067\u3059
-referers.tip=\u3053\u306E\u30DA\u30FC\u30B8\u3067\u306F\u4ECA\u65E5\u306E\u30D2\u30C3\u30C8\u6570\u3092\u30EA\u30D5\u30A1\u30E9(\u53C2\u7167\u5143\u30DA\u30FC\u30B8)\u5225\u306B\
-\u5217\u6319\u3057\u3066\u3044\u307E\u3059\u3002direct\u3068\u3042\u308B\u306E\u306F\u30D5\u30A3\u30FC\u30C9\u3084\u30D6\u30C3\u30AF\u30DE\u30FC\u30AF\u304B\u3089\u98DB\u3093\u3067\u304D\u305F\u3082\u306E\u3067\u3059\u3002\
-\u7279\u5B9A\u306E\u30EA\u30D5\u30A1\u30E9\u3092\u524A\u9664\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002<br />\
-\u305F\u3060\u3001\u30EA\u30D5\u30A1\u30E9\u306B\u306F\u30B9\u30D1\u30E0\u3068\u306A\u308B\u3082\u306E\u3082\u3042\u308A\u307E\u3059\u3002Roller\u306B\u306F\u7279\u5B9A\u306E\u6587\u5B57\u5217\u3092\
-\u542B\u3093\u3060\u30EA\u30D5\u30A1\u30E9\u3092\u5F3E\u304F\u6A5F\u80FD\u3082\u3042\u308A\u307E\u3059\u3002\
-\u3053\u308C\u306F\u300C\u30D6\u30ED\u30B0\u8A2D\u5B9A\uFF1E\u4E00\u822C\u300D\u306E\u30B9\u30D1\u30E0\u9805\u76EE\u3067\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002
-
-referers.url=\u30EA\u30D5\u30A1\u30E9URL
-referers.hits=\u672C\u65E5\u306E\u30D2\u30C3\u30C8\u6570
-referers.deleteSelected=\u9078\u629E\u3057\u305F\u30EA\u30D5\u30A1\u30E9\u3092\u3092\u524A\u9664
-
-referers.hitCounters=\u672C\u65E5\u306E\u7DCF\u30D2\u30C3\u30C8\u6570
-referers.reset=\u30D2\u30C3\u30C8\u6570\u306E\u30EA\u30BB\u30C3\u30C8
-
-referers.deletedReferers=\u6307\u5B9A\u3057\u305F\u30EA\u30D5\u30A1\u30E9\u3092\u524A\u9664
-referers.noReferersSpecified=\u6307\u5B9A\u3057\u305F\u30EA\u30D5\u30A1\u30E9\u3092\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-
-
 # ------------------------------------------------------------------ Statistics
 
 statCount.weblogCommentCountType=Weblog comment count
@@ -1085,7 +1063,6 @@ tabbedmenu.weblog.categories=\u30AB\u30C
 tabbedmenu.weblog.commentManagement=\u30B3\u30E1\u30F3\u30C8
 tabbedmenu.bookmarks.allFolders=Blogroll
 tabbedmenu.bookmarks.import=\u30A4\u30F3\u30DD\u30FC\u30C8
-tabbedmenu.weblog.referers=\u30EA\u30D5\u30A1\u30E9
 tabbedmenu.website.files=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9
 
 tabbedmenu.website=\u30D6\u30ED\u30B0\u8A2D\u5B9A
@@ -1517,7 +1494,6 @@ weblogMain.search=\u691C\u7D22
 weblogMain.navigation=\u30D6\u30ED\u30B0\u30CA\u30D3
 weblogMain.links=\u30EA\u30F3\u30AF
 weblogMain.language=\u8A00\u8A9E
-weblogMain.referers=\u30EA\u30D5\u30A1\u30E9
 weblogMain.archives=\u30A2\u30FC\u30AB\u30A4\u30D6
 weblogMain.poweredBy=Powered By
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_nl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_nl.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_nl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_nl.properties Sat May 31 14:04:21 2014
@@ -347,16 +347,6 @@ folderForm.correctFolder=Corrigeer Favor
 
 folderForm.save.exception=FOUT bij bewaren folder, misschien is de naam niet unique? De foutmelding is : {0}
 
-# ------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=Referentie Ranglijst van vandaag
-referers.url=Refererende URL
-referers.hits=Dag Hits
-referers.deleteSelected=Verwijder selectie
-
-referers.hitCounters=Hit tellers
-referers.reset=Reset Hit telling
-
 # ------------------------------------------------------------- Search Form
 
 searchForm.button=Zoek
@@ -369,7 +359,6 @@ tabbedmenu.weblog=Weblog
 tabbedmenu.weblog.newEntry=Nieuw bericht
 tabbedmenu.weblog.archives=Archief
 tabbedmenu.weblog.categories=Categori&#235;en
-tabbedmenu.weblog.referers=Referenties
 tabbedmenu.weblog.export=Exporteren
 tabbedmenu.weblog.import=Importeren
 tabbedmenu.weblog.flushCache=Cache legen
@@ -564,7 +553,6 @@ weblogMain.search=Zoeken
 weblogMain.navigation=Navigatie
 weblogMain.links=Links
 weblogMain.language=Taalkeuze
-weblogMain.referers=Referenties
 weblogMain.archives=Archief
 weblogMain.poweredBy=Ondersteund door
 
@@ -706,10 +694,6 @@ weblogEdit.trackbackResults = <b>Trackba
 weblogEdit.sendTrackback = Verstuur Trackback
 weblogEdit.pinnedToMain = Vast geprikt op start pagina.
 
-#JJM: added 13 June 2004
-referers.noReferersSpecified = Je hebt geen Referenties geselecteerd om te verwijderen
-referers.deletedReferers = Verwijder geselecteerde Referenties
-
 #JJM: added 23 September 2004
 weblogEntryQuery.filterByStatus = Filter op status
 weblogEntryQuery.filterByCategory = Filter op categorie

Modified: roller/trunk/app/src/main/resources/ApplicationResources_ru.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_ru.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_ru.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_ru.properties Sat May 31 14:04:21 2014
@@ -845,26 +845,6 @@ planetGroups.error.duringSave=\u0413\u04
 planetGroups.error.nameReserved=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0434\u0435\u0441\u043a\u0440\u0438\u043f\u0442\u043e\u0440\u043e\u0432 'all' \u0438\u043b\u0438 'external'
 planetGroups.error.deleting=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0438 \u043e\u0431\u044a\u0435\u043a\u0442\u0430
 
-# ----------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=Referrers
-referers.subtitle=\u0420\u0430\u043d\u0436\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 Referrer \u0434\u043b\u044f \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u043e\u0432 <span>{0}</span>
-referers.tip=\u0414\u0430\u043d\u043d\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u043f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u044f \u043f\u043e \u0432\u0430\u0448\u0435\u043c\u0443 \u0434\u043d\u0435\u0432\u043d\u0438\u043a\u0443 \u0437\u0430 \u0441\u0435\u0433\u043e\u0434\u043d\u044f\u0448\u043d\u0438\u0439 \u0434\u0435\u043d\u044c. \
-\u041f\u043e\u0441\u0435\u0449\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0441 \u043d\u0435\u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u043c referrer, \u0442\u0430\u043a\u0438\u0435 \u043a\u0430\u043a, \u0447\u0438\u0442\u0430\u0442\u0435\u043b\u0438 \u0441\u043b\u0443\u0436\u0431\u044b \u0440\u0430\u0441\u0441\u044b\u043b\u043a\u0438 \u043d\u043e\u0432\u043e\u0441\u0442\u0435\u0439, \
-\u0438\u043b\u0438 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0432\u0448\u0438\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 \u043f\u043e \u0437\u0430\u043a\u043b\u0430\u0434\u043a\u0435, \u043f\u043e\u0434\u0441\u0447\u0438\u0442\u0430\u043d\u044b \u043a\u0430\u043a '\u043f\u0440\u044f\u043c\u044b\u0435' \u0445\u0438\u0442\u044b. \
-\u0415\u0441\u043b\u0438 \u0412\u044b \u043f\u043e\u043b\u0443\u0447\u0430\u0435\u0442\u0435 referrer \u0441\u043f\u0430\u043c, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u043e\u043f\u0446\u0438\u044e \u041f\u0440\u0435\u0434\u043e\u0442\u0432\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0421\u043f\u0430\u043c\u0430 (\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0435\u043d\u0438\u044f:\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438), \
-\u0447\u0442\u043e\u0431\u044b \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0443\u0435\u043c\u044b\u0435 \u0441\u043b\u043e\u0432\u0430 (referrers, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442 \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u0443\u0435\u043c\u044b\u0435 \u0441\u043b\u043e\u0432\u0430, \u0431\u0443\u0434\u0443\u0442 \u043e\u0442\u043a\u043b\u043e\u043d\u0435\u043d\u044b).
-
-referers.url=Referring URL
-referers.hits=\u0425\u0438\u0442\u044b \u0437\u0430 \u0434\u0435\u043d\u044c
-referers.deleteSelected=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0435
-
-referers.hitCounters=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0445\u0438\u0442\u043e\u0432 \u0437\u0430 \u0441\u0435\u0433\u043e\u0434\u043d\u044f
-referers.reset=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0441\u0447\u0435\u0442\u0447\u0438\u043a \u0445\u0438\u0442\u043e\u0432
-
-referers.deletedReferers=\u0423\u0434\u0430\u043b\u0435\u043d\u044b \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0435 referrers
-referers.noReferersSpecified=\u041d\u0438 \u043e\u0434\u0438\u043d referrers \u0434\u043b\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f \u043d\u0435 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d
-
 # ------------------------------------------------------------------ Tabbed Menu
 
 tabbedmenu.main=\u0413\u043b\u0430\u0432\u043d\u0430\u044f
@@ -878,7 +858,6 @@ tabbedmenu.weblog.archives=\u0420\u0435\
 tabbedmenu.weblog.categories=\u041a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438
 tabbedmenu.bookmarks.allFolders=\u0417\u0430\u043a\u043b\u0430\u0434\u043a\u0438
 tabbedmenu.bookmarks.import=\u0418\u043c\u043f\u043e\u0440\u0442
-tabbedmenu.weblog.referers=Referrers
 tabbedmenu.website.files=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0444\u0430\u0439\u043b\u043e\u0432
 
 tabbedmenu.website=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
@@ -1260,7 +1239,6 @@ weblogMain.search = \u041f\u043e\u0438\u
 weblogMain.navigation = \u041d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044f
 weblogMain.links = \u0421\u0432\u044f\u0437\u0438
 weblogMain.language = \u042f\u0437\u044b\u043a
-weblogMain.referers = Referrers
 weblogMain.archives = \u0410\u0440\u0445\u0438\u0432
 # ---------------------------------------------------------------------- Website 
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_sl.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_sl.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_sl.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_sl.properties Sat May 31 14:04:21 2014
@@ -1283,27 +1283,6 @@ planetGroups.error.duringSave=Podvojena 
 planetGroups.error.nameReserved=Ni mogo\u010De uporabiti rokovanja 'all' or 'external'
 planetGroups.error.deleting=Napaka pri brisanju objekta
 
-# ----------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=Pripisovalci (Referrers)
-referers.subtitle=Rangiranje pripisovalca (Referrer) za weblog <span>{0}</span>
-referers.tip=Ta stran prikazuje od kje prihajajo dana\u0161nji zadetki va\u0161ega weblog-a. \
-Zadetki o nedolo\u010Denih pripisovalcev (referrers), kot na primer od \u010Ditalcev kanala novic  \
-in zaznamkov se ra\u010Dunajo kot 'direktni' zadetki. \u010Ce dobivate spam od pripisovalcev, \
-uporabite nastavitve za: Nastavitev Spam Preventivne lastnosti za nastavitev ignoriranih besed \
-(pripisovalci, ki vsebujejo ignorirane besede bodo zavrnjeni).
-
-referers.url=URL pripisovalcev (Referring URL)
-referers.hits=Dnevni Zadetki
-referers.deleteSelected=Izbri\u0161i Izbrano
-
-referers.hitCounters=\u0160tevilo Zadetkov Danes
-referers.reset=Resetiraj \u0160tevilo Zadetkov
-
-referers.deletedReferers=Izbri\u0161i ozna\u010Dene Pripisovalce (referrers)
-referers.noReferersSpecified=Niste ozna\u010Dili nobenega Pripisovalca (referrers) za brisanje
-
-
 # ------------------------------------------------------------------ Statistics
 
 statCount.weblogCommentCountType=\u0160tevilo komentarjev za Weblog
@@ -1346,7 +1325,6 @@ tabbedmenu.weblog.categories=Kategorije
 tabbedmenu.weblog.commentManagement=Komentarji
 tabbedmenu.bookmarks.allFolders=Zaznamki
 tabbedmenu.bookmarks.import=Uvoz
-tabbedmenu.weblog.referers=Pripisovalci
 tabbedmenu.website.files=Nalaganje Datotek
 
 tabbedmenu.design=Design
@@ -1874,7 +1852,6 @@ weblogMain.search=Iskanje
 weblogMain.navigation=Navigacija
 weblogMain.links=Povezave
 weblogMain.language=Jezik
-weblogMain.referers=Pripisovalci
 weblogMain.archives=Arhivi
 weblogMain.poweredBy=Powered By
 

Modified: roller/trunk/app/src/main/resources/ApplicationResources_vi.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_vi.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_vi.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_vi.properties Sat May 31 14:04:21 2014
@@ -342,16 +342,6 @@ folderForm.correctFolder=S\u1eeda th\u01
 
 folderForm.save.exception=L\u1ed7i l\u01b0u th\u01b0 m\u1ee5c, c\u00f3 th\u1ec3 do t\u00ean kh\u00f4ng ph\u1ea3i l\u00e0 duy nh\u1ea5t? Th\u00f4ng \u0111i\u1ec7p l\u1ed7i l\u00e0: {0}
 
-# ------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=B\u1ea3ng s\u1eafp h\u1ea1ng nh\u1eefng ng\u01b0\u1eddi truy c\u1eadp h\u00f4m nay
-referers.url=\u0110\u1ecba ch\u1ec9 URL tham chi\u1ebfu
-referers.hits=S\u1ed1 l\u1ea7n v\u00e0o trong ng\u00e0y
-referers.deleteSelected=X\u00f3a nh\u1eefng th\u1ee9 \u0111\u00e3 l\u1ef1a ch\u1ecdn
-
-referers.hitCounters=B\u1ed9 \u0111\u1ebfm s\u1ed1 l\u1ea7n truy c\u1eadp
-referers.reset=X\u00e1c l\u1eadp l\u1ea1i b\u1ed9 \u0111\u1ebfm
-
 # ------------------------------------------------------------- Search Form
 
 searchForm.button=T\u00ecm ki\u1ebfm
@@ -364,7 +354,6 @@ tabbedmenu.weblog=Weblog
 tabbedmenu.weblog.newEntry=Th\u00eam \u0111\u1ea7u m\u1ee5c
 tabbedmenu.weblog.archives=L\u01b0u tr\u1eef
 tabbedmenu.weblog.categories=H\u1ea1ng m\u1ee5c
-tabbedmenu.weblog.referers=Tham chi\u1ebfu
 tabbedmenu.weblog.export=Xu\u1ea5t kh\u1ea9u
 tabbedmenu.weblog.import=Nh\u1eadp kh\u1ea9u
 tabbedmenu.weblog.flushCache=X\u00f3a s\u1ea1ch cache
@@ -539,7 +528,6 @@ weblogMain.search=T\u00ecm ki\u1ebfm
 weblogMain.navigation=Duy\u1ec7t
 weblogMain.links=Li\u00ean k\u1ebft
 weblogMain.language=Ng\u00f4n ng\u1eef
-weblogMain.referers=Tham chi\u1ebfu
 weblogMain.archives=L\u01b0u tr\u1eef
 weblogMain.poweredBy=\u0110\u01b0\u1ee3c v\u1eadn h\u00e0nh b\u1edfi
 
@@ -697,10 +685,6 @@ newuser.locale=B\u1ea3n \u0111\u1ecba
 weblogEdit.unlimitedCommentDays=kh\u00f4ng h\u1ea1n ch\u1ebf ng\u00e0y
 email.comment.anonymous=M\u1ed9t ng\u01b0\u1eddi d\u00f9ng n\u1eb7c danh vi\u1ebft
 
-referers.noReferersSpecified=B\u1ea1n kh\u00f4ng ch\u1ecdn m\u1ed9t tham chi\u1ebfu n\u00e0o \u0111\u1ec3 x\u00f3a c\u1ea3
-weblogEdit.days7=7 ng\u00e0y
-referers.deletedReferers=\u0110\u00e3 x\u00f3a c\u00e1c tham chi\u1ebfu \u0111\u01b0\u1ee3c ch\u1ecdn
-
 #-----------------------------------------------new key
 
 weblogEntryQuery.filterByStatus=L\u1ecdc theo tr\u1ea1ng th\u00e1i

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_CN.properties Sat May 31 14:04:21 2014
@@ -677,18 +677,6 @@ planetSubscriptions.subtitle.edit=\u7f16
 planetSubscriptions.title=\u8ba2\u9605
 planetSubscriptions.titleGroup=\u8ba2\u9605 [{0}]
 planetSubscriptions.unconfigured=Roller\u884c\u661f\u672a\u914d\u7f6e
-referers.deleteSelected=\u5220\u9664\u6240\u9009\u9879
-referers.deletedReferers=\u6307\u5b9a\u7684\u5f15\u7528\u5df2\u7ecf\u5220\u9664
-referers.hitCounters=\u70b9\u51fb\u8ba1\u6570\u5668
-referers.hits=\u65e5\u70b9\u51fb
-# additions 20040615
-referers.noReferersSpecified=\u60a8\u6ca1\u6709\u6307\u5b9a\u8981\u5220\u9664\u7684\u5f15\u7528
-referers.reset=\u70b9\u51fb\u8ba1\u6570\u5f52\u96f6
-referers.subtitle=\u7f51\u5fd7 <span>{0}</span> \u7684\u53c2\u8003\u7b49\u7ea7
-referers.tip=\u672c\u9875\u544a\u8bc9\u60a8\u4eca\u5929\u60a8\u7684\u7f51\u5fd7\u7684\u70b9\u51fb\u6765\u81ea\u4f55\u65b9\u3002\u70b9\u51fb\u6570\u542b\u6709\u4e0d\u786e\u5b9a\u56e0\u7d20\uff0c\u4f8b\u5982\u6709\u4e9b\u6765\u81ea\u65b0\u95fb\u8ba2\u9605\u548c\u4e66\u7b7e\u7684\u70b9\u51fb\u88ab\u770b\u4f5c\u662f'direct'\u70b9\u51fb\u3002\u5982\u679c\u60a8\u83b7\u5f97\u4e86\u4e00\u4e9b\u5783\u573e\u4fe1\u606f\uff0c\u60a8\u53ef\u4ee5\u4f7f\u7528\u4e2a\u6027\u5b9a\u5236\uff1a\u8bbe\u7f6e\u9632\u6b62\u5783\u573e\u8bc4\u8bba\u6765\u5ffd\u7565\u67d0\u4e9b\u8bcd\uff08\u542b\u6709\u5783\u573e\u8bcd\u6c47\u7684\u8bc4\u8bba\u5c06\u88ab\u62d2\u7edd\uff09\u3002
-referers.todaysReferers=\u4eca\u5929\u7684\u5f15\u7528\u6392\u540d
-referers.url=\u5f15\u7528\u7684URL
-rror.add.user.missingUserName=\u8bf7\u8f93\u5165\u7528\u6237\u540d.
 search.title=\u641c\u7d22\u7ed3\u679c
 searchForm.alert=\u8bf7\u8f93\u5165\u5173\u952e\u8bcd\u5e76\u641c\u7d22\u3002
 searchForm.button=\u641c\u7d22
@@ -720,7 +708,6 @@ tabbedmenu.weblog.flushCache=\u540c\u6b6
 tabbedmenu.weblog.import=\u5bfc\u5165
 tabbedmenu.weblog.newEntry=\u64b0\u5199\u65b0\u65e5\u5fd7
 tabbedmenu.weblog.pingSetup=Pings
-tabbedmenu.weblog.referers=\u5f15\u7528
 tabbedmenu.website=\u4e2a\u6027\u5b9a\u5236
 tabbedmenu.website.files=\u6587\u4ef6\u4e0a\u4f20
 tabbedmenu.website.inviteMember=\u9080\u8bf7\u6210\u5458
@@ -1007,7 +994,6 @@ weblogMain.language=\u8bed\u8a00
 weblogMain.links=\u94fe\u63a5
 weblogMain.navigation=\u5bfc\u822a
 weblogMain.poweredBy=\u7a0b\u5e8f\u652f\u6301
-weblogMain.referers=\u5f15\u7528
 weblogMain.search=\u641c\u7d22
 websiteRemove.subtitle=\u7f51\u5fd7\u4e00\u65e6\u5220\u9664\u662f<b>\u4e0d\u53ef\u6062\u590d\u7684</b>
 websiteRemove.title=\u786e\u8ba4\u7f51\u5fd7\u5220\u9664

Modified: roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties (original)
+++ roller/trunk/app/src/main/resources/ApplicationResources_zh_TW.properties Sat May 31 14:04:21 2014
@@ -366,19 +366,6 @@ folderForm.correctFolder=\u66f4\u6b63\u7
 
 folderForm.save.exception=\u5132\u5b58\u8cc7\u6599\u593e\u932f\u8aa4\uff0c\u4e5f\u8a31\u540d\u7a31\u4e26\u975e\u552f\u4e00? \u932f\u8aa4\u8a0a\u606f\u70ba: {0}
 
-# ------------------------------------------------------------- referers.jsp
-
-referers.todaysReferers=\u4eca\u65e5\u8a2a\u5ba2\u6392\u540d
-referers.url=\u4eba\u5f9e\u54ea\u5152\u4f86URL
-referers.hits=\u65e5\u9ede\u64ca\u6578
-referers.deleteSelected=\u522a\u9664\u5df2\u9078\u53d6
-
-referers.hitCounters=\u9ede\u64ca\u7d00\u9304\u5668
-referers.reset=\u91cd\u7f6e\u9ede\u64ca\u8a08\u6578
-
-referers.deletedReferers=\u522a\u9664\u6307\u5b9a\u8a2a\u5ba2
-referers.noReferersSpecified=\u60a8\u5c1a\u672a\u6307\u5b9a\u8981\u522a\u9664\u7684\u8a2a\u5ba2
-
 # ------------------------------------------------------------- Search Form
 
 searchForm.button=\u641c\u5c0b
@@ -391,7 +378,6 @@ tabbedmenu.weblog=\u7db2\u8a8c
 tabbedmenu.weblog.newEntry=\u65b0\u6587\u7ae0
 tabbedmenu.weblog.archives=\u5f59\u6574
 tabbedmenu.weblog.categories=\u985e\u5225
-tabbedmenu.weblog.referers=\u4eba\u5f9e\u54ea\u5152\u4f86
 tabbedmenu.weblog.export=\u532f\u51fa
 tabbedmenu.weblog.import=\u532f\u5165
 tabbedmenu.weblog.flushCache=\u5237\u65b0\u5feb\u53d6
@@ -608,7 +594,6 @@ weblogMain.search=\u641c\u5c0b
 weblogMain.navigation=\u5c0e\u89bd
 weblogMain.links=\u9023\u7d50
 weblogMain.language=\u8a9e\u8a00
-weblogMain.referers=\u4eba\u5f9e\u54ea\u5152\u4f86
 weblogMain.archives=\u5f59\u7e3d
 weblogMain.poweredBy=Powered By
 

Modified: roller/trunk/app/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/META-INF/persistence.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/META-INF/persistence.xml (original)
+++ roller/trunk/app/src/main/resources/META-INF/persistence.xml Sat May 31 14:04:21 2014
@@ -15,7 +15,6 @@
     <mapping-file>org/apache/roller/weblogger/pojos/WeblogHitCount.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/weblogger/pojos/PingQueueEntry.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/weblogger/pojos/PingTarget.orm.xml</mapping-file>
-    <mapping-file>org/apache/roller/weblogger/pojos/WeblogReferrer.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/weblogger/pojos/UserRole.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/weblogger/pojos/RuntimeConfigProperty.orm.xml</mapping-file>
     <mapping-file>org/apache/roller/weblogger/pojos/TaskLock.orm.xml</mapping-file>

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=1598870&r1=1598869&r2=1598870&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 Sat May 31 14:04:21 2014
@@ -201,7 +201,7 @@ site.blacklist.enable.comments=true
 site.blacklist.enable.trackbacks=true
 
 # enables partial blacklist check (not including blacklist.txt) for each incoming referrer
-site.blacklist.enable.referrers=true
+site.blacklist.enable.referrers=false
 
 # Trackback protection. Set this only if you need to limit the URLs to
 # which users may send trackbacks. Regex expressions are allowed, for example:
@@ -223,32 +223,6 @@ org.apache.roller.weblogger.planet.busin
 # Planet Cache directory - See DiskFeedInfoCache
 cache.dir=${user.home}/roller_data/planet-cache
 
-#----------------------------------
-# referrer processing
-
-# 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) 
-referrers.asyncProcessing.enabled=false
-referrers.queue.numWorkers=3
-referrers.queue.sleepTime=10
-
-# Robot check in referral processing.  If this pattern is set and the User-Agent 
-# in the request matches this pattern, all referral processing is skipped; this
-# means that the referral spam check is skipped, the request is allowed to 
-# proceed, but the referrer is not recorded and hit count is not incremented.  
-# Recommended for large sites that get a lot of legitimate crawler bot traffic.
-# The pattern here is a suggestion that has been reported to work well.
-#referrer.robotCheck.userAgentPattern=.*(slurp|bot|java).*
-
-
 #-----------------------------------------------------------------------------
 # Scheduled tasks configuration
 #-----------------------------------------------------------------------------
@@ -278,12 +252,6 @@ tasks.ResetHitCountsTask.startTime=start
 tasks.ResetHitCountsTask.interval=1440
 tasks.ResetHitCountsTask.leaseTime=30
 
-# Reset referer counts
-tasks.TurnoverReferersTask.class=org.apache.roller.weblogger.business.runnable.TurnoverReferersTask
-tasks.TurnoverReferersTask.startTime=startOfDay
-tasks.TurnoverReferersTask.interval=1440
-tasks.TurnoverReferersTask.leaseTime=30
-
 # Ping processor, does sending of pings
 tasks.PingQueueTask.class=org.apache.roller.weblogger.business.pings.PingQueueTask
 tasks.PingQueueTask.startTime=immediate

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/config/runtimeConfigDefs.xml Sat May 31 14:04:21 2014
@@ -194,10 +194,6 @@
          <type>boolean</type>
          <default-value>false</default-value>
       </property-def>
-      <property-def name="site.linkbacks.enabled" key="configForm.enableLinkback">
-         <type>boolean</type>
-         <default-value>false</default-value>
-      </property-def>
 
    </display-group >
    

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/Weblog.orm.xml Sat May 31 14:04:21 2014
@@ -192,7 +192,6 @@
 			<transient name="commentCount"/>
 			<transient name="commentModerationRequired"/>
 			<transient name="todaysHits"/>
-			<transient name="todaysReferrers"/>
 			<transient name="URL"/>
 			<transient name="userCount"/>
 			<transient name="entryCount"/>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/pojos/WeblogEntry.orm.xml Sat May 31 14:04:21 2014
@@ -166,7 +166,6 @@
             <transient name="transformedSummary"/>         
             <transient name="comments"/>
             <transient name="pluginsList"/>
-            <transient name="referers"/>
             <transient name="addedTags"/>
             <transient name="removedTags"/>
         </attributes>

Modified: roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml (original)
+++ roller/trunk/app/src/main/resources/org/apache/roller/weblogger/ui/struts2/editor/editor-menu.xml Sat May 31 14:04:21 2014
@@ -70,11 +70,6 @@ Each menu or menu item is governed by fo
                    weblogPerms="admin"
                    subactions="exportEntries,exportResources"/>
 
-        <!-- globalPerms="login" -->
-         <menu-item action="referrers"
-                   name="tabbedmenu.weblog.referers"
-                   weblogPerms="admin"
-                   enabledProperty="referrers.processing.enabled" />
     </menu>
     
     <!--  if we already have checked weblogPerms="admin" globalPerms="login" we should -->

Modified: roller/trunk/app/src/main/resources/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/createdb.vm?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/createdb.vm (original)
+++ roller/trunk/app/src/main/resources/sql/createdb.vm Sat May 31 14:04:21 2014
@@ -317,32 +317,6 @@ create index pqe_entrytime_idx on pingqu
 create index pqe_pingtid_idx on pingqueueentry( pingtargetid );
 create index pqe_websiteid_idx on pingqueueentry( websiteid );
 
-
--- Referer tracks URLs that refer to websites and entries
-create table referer (
-    id        varchar(48) not null primary key,
-    websiteid varchar(48) not null,
-    entryid   varchar(48),
-    datestr   varchar(10),
-    refurl    varchar(255) not null,
-    refpermalink varchar(255),
-    reftime   $db.TIMESTAMP_SQL_TYPE,
-    requrl    varchar(255),
-    title     varchar(255),
-    excerpt   $db.TEXT_SQL_TYPE,
-    dayhits   integer default 0 not null,
-    totalhits integer default 0 not null,
-    visible   $db.BOOLEAN_SQL_TYPE_FALSE not null,
-    duplicate $db.BOOLEAN_SQL_TYPE_FALSE not null
-);
-create index ref_websiteid_idx on referer( websiteid );
-create index ref_entryid_idx on referer( entryid );
-create index ref_refurl_idx on referer( refurl$!db.INDEXSIZE );
-create index ref_requrl_idx on referer( requrl$!db.INDEXSIZE );
-create index ref_datestr_idx on referer( datestr );
-create index ref_refpermlnk_idx on referer( refpermalink$!db.INDEXSIZE );
-create index ref_duplicate_idx on referer( duplicate );
-
 create table roller_properties (
     name     varchar(255) not null primary key,
     value    $db.TEXT_SQL_TYPE
@@ -534,14 +508,6 @@ alter table roller_comment add constrain
 alter table entryattribute add constraint att_entryid_fk
     foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
 
--- referer
-
-alter table referer add constraint ref_entryid_fk
-    foreign key ( entryid ) references weblogentry( id ) $!db.ADDL_FK_PARAMS ;
-
-alter table referer add constraint ref_websiteid_fk
-    foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
-
 -- folder and bookmark
 
 alter table folder add constraint fo_websiteid_fk

Modified: roller/trunk/app/src/main/resources/sql/droptables.sql
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/sql/droptables.sql?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/sql/droptables.sql (original)
+++ roller/trunk/app/src/main/resources/sql/droptables.sql Sat May 31 14:04:21 2014
@@ -33,7 +33,6 @@ drop table roller_tasklock;
 drop table pingqueueentry;
 drop table autoping;
 drop table pingtarget;
-drop table referer;
 drop table bookmark;
 drop table folder;
 drop table roller_userattribute;

Modified: roller/trunk/app/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/struts.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/struts.xml (original)
+++ roller/trunk/app/src/main/resources/struts.xml Sat May 31 14:04:21 2014
@@ -441,13 +441,7 @@
             <result name="input" type="tiles">.WeblogExport</result>
             <!--<result name="success" type="chain">weblogExport</result>-->
         </action>
-        
-        <action name="referrers!*" method="{1}"
-                class="org.apache.roller.weblogger.ui.struts2.editor.Referrers">
-            <result name="list" type="tiles">.Referrers</result>
-        </action>
-        
-        
+
         <action name="weblogConfig!*" method="{1}"
                 class="org.apache.roller.weblogger.ui.struts2.editor.WeblogConfig">
             <result name="input" type="tiles">.WeblogConfig</result>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/tiles.xml Sat May 31 14:04:21 2014
@@ -386,10 +386,6 @@
         <put-attribute name="content" value="/WEB-INF/jsps/editor/Resources.jsp" />
     </definition>
     
-    <definition name=".Referrers" extends=".tiles-tabbedpage" >
-        <put-attribute name="content" value="/WEB-INF/jsps/editor/Referrers.jsp" />
-    </definition>
-
     <definition name=".WeblogExport" extends=".tiles-tabbedpage" >
         <put-attribute name="content" value="/WEB-INF/jsps/editor/WeblogExport.jsp" />
     </definition>

Modified: roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/app/src/main/webapp/WEB-INF/velocity/weblog.vm Sat May 31 14:04:21 2014
@@ -38,7 +38,6 @@ These are the documented macros in order
     #showBookmarkLinksList($folderObj)
     #showWeblogCategoryLinksList()
     #showMobileCategoryLinksList()
-    #showReferrersList($weblog)
     #showAtomFeedsList($weblog)
     #showRSSFeedsList($weblog)
 
@@ -164,7 +163,7 @@ code if defined will be used.
 #macro(showAnalyticsTrackingCode $weblog)
     #if ($config.analyticsOverrideAllowed && $utils.isNotEmpty($weblog.analyticsCode))
         $weblog.analyticsCode
-    #elseif ($utils.isNotEmpty($config.defaultAnalyticsTrackingCode)
+    #elseif ($utils.isNotEmpty($config.defaultAnalyticsTrackingCode))
         $config.defaultAnalyticsTrackingCode
     #end
 #end
@@ -580,49 +579,6 @@ Show weblog's categories in specified pa
     <a href="#categories" data-rel="popup" data-role="button">Categories - $active</a>
 #end
 
-#**
- * Display list of referrers.
- *#
-#macro(showReferrersList $refs $max $maxWidth $includeHits)
-    <ul class="rReferersList">
-    #foreach( $ref in $refs )
-        #if ($velocityCount <= $max)
-        <li class="rReferersListItem">
-
-            #set( $qq = '"' )
-            #set( $myUrl = $utils.escapeHTML( $ref.RefererUrl ) )
-            #set( $displayUrl = $myUrl )
-            #set( $restOfUrl = "" )
-            #set( $displayLink = "" )
-            #if ( $displayUrl.startsWith("http://") )
-                #set( $displayUrl = $displayUrl.substring( 7 ) )
-            #end
-            #if ( $displayUrl.length() > $maxWidth )
-                #set( $restOfUrl = "...$displayUrl.substring($maxWidth, $displayUrl.length())" )
-                #set( $displayUrl = $displayUrl.substring(0, $maxWidth) )
-            #end
-            #if ( $myUrl.startsWith("http://") )
-                #set( $displayLink = "<a rel=${qq}nofollow${qq} href=${qq}$myUrl${qq}" )
-                #if ( $restOfUrl )
-                    #set( $displayLink = "$displayLink title=${qq}$restOfUrl${qq}" )
-                #end
-                #set( $displayLink = "$displayLink >" )
-            #end
-            #set( $displayLink = "$displayLink$displayUrl" )
-            #if ( $includeHits )
-                #set( $displayLink = "$displayLink ($ref.DayHits)" )
-            #end
-            #if ( $myUrl.startsWith("http://") )
-                #set( $displayLink = "$displayLink</a>" )
-            #end
-            $displayLink
-
-        </li>
-        #end
-    #end
-    </ul>
-#end
-
 
 #**
  * Show list of all RSS feeds available for weblog.

Modified: roller/trunk/app/src/main/webapp/themes/base.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/base.css?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/base.css (original)
+++ roller/trunk/app/src/main/webapp/themes/base.css Sat May 31 14:04:21 2014
@@ -1,20 +1,20 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-*  contributor license agreements.  The ASF licenses this file to You
-* under the Apache License, Version 2.0 (the "License"); you may not
-* use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.  For additional information regarding
-* copyright in this work, please see the NOTICE file in the top level
-* directory of this distribution.
-*/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+*  contributor license agreements.  The ASF licenses this file to You
+* under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.  For additional information regarding
+* copyright in this work, please see the NOTICE file in the top level
+* directory of this distribution.
+*/
 
 /* Common CSS */
 
@@ -119,21 +119,6 @@ span.rNewsfeedDesc {
     font-weight: normal;
 }
 
-/* referer.vm */
-
-ul.rReferersList {
-    list-style: none;
-    margin-left: 0;
-    padding-left: 0;
-}
-li.rReferersListItem {
-    font-size : small;
-    font-weight: normal;
-}
-a.linkback {
-    border-style: double;
-}
-
 /* comments.vm */
 
 a.entrycommentslink {

Modified: roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/basic-custom.css Sat May 31 14:04:21 2014
@@ -63,7 +63,7 @@ li.selected {
 
 /* other lists ----------------------------------------------- */
 
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
     list-style-type: none;
     padding: 0;
     margin: 0;

Modified: roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm (original)
+++ roller/trunk/app/src/main/webapp/themes/basic/sidebar.vm Sat May 31 14:04:21 2014
@@ -30,9 +30,3 @@
     #showPageMenu($model.weblog)
     #showAuthorMenu(true)
     </div>
-
-    <h2>Referrers</h2>
-    <div class="sidebar">
-    #set($refs = $model.weblog.getTodaysReferrers())
-    #showReferrersList($refs 30 20 true)
-    </div>

Modified: roller/trunk/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css (original)
+++ roller/trunk/app/src/main/webapp/themes/brushedmetal/brushedmetal-custom.css Sat May 31 14:04:21 2014
@@ -61,7 +61,7 @@ li.selected {
 
 /* other lists ----------------------------------------------- */
 
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
     list-style-type: none;
     padding: 0;
     margin: 0;

Modified: roller/trunk/app/src/main/webapp/themes/sotto/sotto-custom.css
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/webapp/themes/sotto/sotto-custom.css?rev=1598870&r1=1598869&r2=1598870&view=diff
==============================================================================
--- roller/trunk/app/src/main/webapp/themes/sotto/sotto-custom.css (original)
+++ roller/trunk/app/src/main/webapp/themes/sotto/sotto-custom.css Sat May 31 14:04:21 2014
@@ -71,7 +71,7 @@ li.selected {
 
 /* other lists ----------------------------------------------- */
 
-ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rReferersList, ul.rEntriesList {
+ul.rNavigationBar, ul.rMenu, ul.rFolder, ul.rFeeds, ul.rEntriesList {
     list-style-type: none;
     padding: 0;
     margin: 0;



Mime
View raw message