You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/12 18:39:31 UTC

svn commit: r421313 - in /incubator/roller/branches/roller_3.0: metadata/xdoclet/filter-mappings.xml src/org/apache/roller/ui/core/RollerSession.java src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java web/WEB-INF/classes/roller.properties

Author: agilliland
Date: Wed Jul 12 09:39:30 2006
New Revision: 421313

URL: http://svn.apache.org/viewvc?rev=421313&view=rev
Log:
EOLing old breadcrumbs stuff.


Removed:
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/filters/BreadCrumbFilter.java
Modified:
    incubator/roller/branches/roller_3.0/metadata/xdoclet/filter-mappings.xml
    incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java
    incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties

Modified: incubator/roller/branches/roller_3.0/metadata/xdoclet/filter-mappings.xml
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/metadata/xdoclet/filter-mappings.xml?rev=421313&r1=421312&r2=421313&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/metadata/xdoclet/filter-mappings.xml (original)
+++ incubator/roller/branches/roller_3.0/metadata/xdoclet/filter-mappings.xml Wed Jul 12 09:39:30 2006
@@ -57,11 +57,6 @@
     <url-pattern>/roller-ui/rendering/page/*</url-pattern>
 </filter-mapping>
 
-<filter-mapping>
-    <filter-name>BreadCrumbFilter</filter-name>
-    <url-pattern>*.do</url-pattern>
-</filter-mapping>
-
 
 <!-- Compression Filter -->
 <filter-mapping>

Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java?rev=421313&r1=421312&r2=421313&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/core/RollerSession.java Wed Jul 12 09:39:30 2006
@@ -53,7 +53,6 @@
         LogFactory.getFactory().getInstance(RollerSession.class);
 
     public static final String ROLLER_SESSION = "org.apache.roller.rollersession";
-    public static final String BREADCRUMB = "org.apache.roller.breadcrumb";
     public static final String ERROR_MESSAGE   = "rollererror_message";
     public static final String STATUS_MESSAGE  = "rollerstatus_message";
 
@@ -130,60 +129,6 @@
        clearSession(se);
    }
 
-    //----------------------------------------------------------------- Breadcrumbs
-    
-    // TODO: eliminate breadcrumb stuff?
-    
-    /**
-     * Clear bread crumb trail.
-     * @param req the request
-     */
-    public static void clearBreadCrumbTrail( HttpServletRequest req )
-    { 
-        HttpSession ses = req.getSession(false);
-        if (ses != null && ses.getAttribute(BREADCRUMB) != null)
-        {
-            ArrayStack stack = (ArrayStack)ses.getAttribute(BREADCRUMB);
-            stack.clear();
-        }
-    }
-    
-    /**
-     * Store the url of the latest request stored in the session.
-     * @param useReferer If true try to return the "referer" header.
-     */
-    public static String getBreadCrumb( 
-        HttpServletRequest req, boolean useReferer )
-    {
-        String crumb = null;
-        
-        HttpSession ses = req.getSession(false);
-        if (ses != null && ses.getAttribute(BREADCRUMB) != null)
-        {
-            ArrayStack stack = (ArrayStack) ses.getAttribute(BREADCRUMB);
-            if (stack != null && !stack.empty())
-            {
-                crumb = (String)stack.peek();
-            }
-        }
-
-        if ( crumb == null && useReferer )
-        {
-            crumb = req.getHeader("referer");
-        }
-        
-        return crumb;
-    }
-    
-    /**
-     * Store the url of the latest request stored in the session.
-     * Else try to return the "referer" header.
-     */
-    public static String getBreadCrumb( HttpServletRequest req )
-    {
-        return getBreadCrumb(req,true);
-    }
-
     //-------------------------------------------------------- Authentication, etc.
     
     /**
@@ -266,7 +211,6 @@
         HttpSession session = se.getSession();
         try
         {
-            session.removeAttribute(BREADCRUMB);
             session.removeAttribute(ROLLER_SESSION);
         }
         catch (Throwable e)

Modified: incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties?rev=421313&r1=421312&r2=421313&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties (original)
+++ incubator/roller/branches/roller_3.0/web/WEB-INF/classes/roller.properties Wed Jul 12 09:39:30 2006
@@ -373,7 +373,6 @@
 # misc settings
 
 rememberme.enabled=true
-breadcrumbs.stacksize=3
 debug.memory.enabled=false
 compression.gzipResponse.enabled=true