logo       
Google Custom Search
    AddThis Social Bookmark Button
<prev   next>
-->

roller/src/org/roller/presentation/weblog/actions WeblogEntryFormAction.jav: msg#00050

Subject: roller/src/org/roller/presentation/weblog/actions WeblogEntryFormAction.java,1.21,1.22 CommentFormAction.java,1.6,1.7 WeblogCategoryFormAction.java,1.6,1.7 
Update of /cvsroot/roller/roller/src/org/roller/presentation/weblog/actions
In directory 
sc8-pr-cvs1:/tmp/cvs-serv1694/src/org/roller/presentation/weblog/actions

Modified Files:
        WeblogEntryFormAction.java CommentFormAction.java 
        WeblogCategoryFormAction.java 
Log Message:
merging caching fixed forward from 096 branch

Index: WeblogEntryFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** WeblogEntryFormAction.java  30 Dec 2002 00:06:05 -0000      1.21
--- WeblogEntryFormAction.java  30 Dec 2002 19:52:10 -0000      1.22
***************
*** 2,43 ****
  package org.roller.presentation.weblog.actions;
  
- import org.roller.Logger;
- import org.roller.model.Roller;
- import org.roller.model.RollerSpellCheck;
- import org.roller.model.UserData;
- import org.roller.model.WeblogEntryData;
- import org.roller.model.WeblogCategoryData;
- import org.roller.model.WebsiteData;
- import org.roller.model.UserManager;
- import org.roller.model.WeblogManager;
- import org.roller.presentation.weblog.formbeans.WeblogEntryFormEx;
- import org.roller.presentation.RollerRequest;
- import org.roller.presentation.RollerSession;
- import org.roller.presentation.caching.UDBCacheFactory;
- import org.roller.presentation.tags.calendar.CalendarModel;
- import org.roller.presentation.weblog.tags.EditWeblogCalendarModel;
- import org.roller.presentation.RollerContext;
- 
- import com.opensymphony.module.oscache.web.ServletCacheAdministrator;
- import com.swabunga.spell.event.SpellCheckEvent;
- 
  import java.io.IOException;
  import java.sql.Timestamp;
  import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.Hashtable;
- import java.util.Iterator;
  import java.util.ListIterator;
! import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
- import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpSession;
  
  import org.apache.commons.lang.StringUtils;
- import org.apache.struts.action.ActionMapping;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.actions.DispatchAction;
  
  
--- 2,37 ----
  package org.roller.presentation.weblog.actions;
  
  import java.io.IOException;
  import java.sql.Timestamp;
  import java.util.ArrayList;
  import java.util.ListIterator;
! 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpSession;
  
  import org.apache.commons.lang.StringUtils;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
+ import org.apache.struts.action.ActionMapping;
  import org.apache.struts.actions.DispatchAction;
+ import org.roller.model.RollerSpellCheck;
+ import org.roller.model.UserData;
+ import org.roller.model.UserManager;
+ import org.roller.model.WeblogCategoryData;
+ import org.roller.model.WeblogEntryData;
+ import org.roller.model.WeblogManager;
+ import org.roller.model.WebsiteData;
+ import org.roller.presentation.RollerContext;
+ import org.roller.presentation.RollerRequest;
+ import org.roller.presentation.RollerSession;
+ import org.roller.presentation.caching.PageCache;
+ import org.roller.presentation.caching.UDBCacheFactory;
+ import org.roller.presentation.tags.calendar.CalendarModel;
+ import org.roller.presentation.weblog.formbeans.WeblogEntryFormEx;
+ import org.roller.presentation.weblog.tags.EditWeblogCalendarModel;
+ 
+ import com.swabunga.spell.event.SpellCheckEvent;
  
  
***************
*** 133,137 ****
          try
          {
!             org.roller.presentation.caching.PageCache.handler.flushCache();
  
              request.getSession().setAttribute( RollerRequest.STATUS_MESSAGE,
--- 127,131 ----
          try
          {
!             PageCache.handler.flushCache(request);
  
              request.getSession().setAttribute( RollerRequest.STATUS_MESSAGE,
***************
*** 279,283 ****
                  weblogMgr.storeWeblogEntry( wd );
  
!                 
org.roller.presentation.caching.PageCache.handler.removeFromCache( user );
  
                  // Make sure index page displays changes
--- 273,277 ----
                  weblogMgr.storeWeblogEntry( wd );
  
!                 PageCache.handler.removeFromCache( request,user );
  
                  // Make sure index page displays changes

Index: CommentFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/CommentFormAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommentFormAction.java      27 Dec 2002 04:49:16 -0000      1.6
--- CommentFormAction.java      30 Dec 2002 19:52:11 -0000      1.7
***************
*** 2,31 ****
  package org.roller.presentation.weblog.actions;
  
- import org.roller.Logger;
- import org.roller.model.Roller;
- import org.roller.model.CommentData;
- import org.roller.model.UserData;
- import org.roller.model.UserManager;
- import org.roller.model.WeblogEntryData;
- import org.roller.model.WeblogManager;
- import org.roller.presentation.forms.CommentForm;
- import org.roller.presentation.RollerConfig;
- import org.roller.presentation.RollerContext;
- import org.roller.presentation.RollerRequest;
- import org.roller.presentation.weblog.formbeans.CommentFormEx;
- 
  import java.io.IOException;
! import java.util.Vector;
! import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
- import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpServletRequest;
  
- import org.apache.struts.action.ActionMapping;
- import org.apache.struts.action.ActionForm;
- import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionError;
  import org.apache.struts.action.ActionErrors;
  import org.apache.struts.actions.DispatchAction;
  
  
--- 2,24 ----
  package org.roller.presentation.weblog.actions;
  
  import java.io.IOException;
! 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
  
  import org.apache.struts.action.ActionError;
  import org.apache.struts.action.ActionErrors;
+ import org.apache.struts.action.ActionForm;
+ import org.apache.struts.action.ActionForward;
+ import org.apache.struts.action.ActionMapping;
  import org.apache.struts.actions.DispatchAction;
+ import org.roller.model.CommentData;
+ import org.roller.model.UserData;
+ import org.roller.model.WeblogEntryData;
+ import org.roller.model.WeblogManager;
+ import org.roller.presentation.RollerRequest;
+ import org.roller.presentation.caching.PageCache;
+ import org.roller.presentation.weblog.formbeans.CommentFormEx;
  
  
***************
*** 158,162 ****
  
              UserData user = rreq.getUser();
!             
org.roller.presentation.caching.PageCache.handler.removeFromCache( user );
  
              java.util.ArrayList comments = mgr.getComments( wd.getId() );
--- 151,155 ----
  
              UserData user = rreq.getUser();
!             PageCache.handler.removeFromCache( request,user );
  
              java.util.ArrayList comments = mgr.getComments( wd.getId() );

Index: WeblogCategoryFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/WeblogCategoryFormAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** WeblogCategoryFormAction.java       27 Dec 2002 04:49:16 -0000      1.6
--- WeblogCategoryFormAction.java       30 Dec 2002 19:52:11 -0000      1.7
***************
*** 2,27 ****
  package org.roller.presentation.weblog.actions;
  
- import org.roller.Logger;
- import org.roller.model.Roller;
- import org.roller.model.WebsiteData;
- import org.roller.model.UserData;
- import org.roller.model.WeblogCategoryData;
- import org.roller.model.WeblogManager;
- import org.roller.presentation.weblog.formbeans.WeblogCategoryFormEx;
- import org.roller.presentation.RollerRequest;
- 
  import java.io.IOException;
! import java.util.Vector;
! import javax.servlet.ServletContext;
  import javax.servlet.ServletException;
- import javax.servlet.http.HttpServletResponse;
  import javax.servlet.http.HttpServletRequest;
  
- import org.apache.struts.action.ActionMapping;
- import org.apache.struts.action.ActionForm;
- import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionError;
  import org.apache.struts.action.ActionErrors;
  import org.apache.struts.actions.DispatchAction;
  
  
--- 2,24 ----
  package org.roller.presentation.weblog.actions;
  
  import java.io.IOException;
! 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
  
  import org.apache.struts.action.ActionError;
  import org.apache.struts.action.ActionErrors;
+ import org.apache.struts.action.ActionForm;
+ import org.apache.struts.action.ActionForward;
+ import org.apache.struts.action.ActionMapping;
  import org.apache.struts.actions.DispatchAction;
+ import org.roller.model.UserData;
+ import org.roller.model.WeblogCategoryData;
+ import org.roller.model.WeblogManager;
+ import org.roller.model.WebsiteData;
+ import org.roller.presentation.RollerRequest;
+ import org.roller.presentation.caching.PageCache;
+ import org.roller.presentation.weblog.formbeans.WeblogCategoryFormEx;
  
  
***************
*** 58,62 ****
  
                  UserData user = rreq.getUser();
!                 
org.roller.presentation.caching.PageCache.handler.removeFromCache( user );
              }
              else
--- 55,59 ----
  
                  UserData user = rreq.getUser();
!                 PageCache.handler.removeFromCache( request,user );
              }
              else
***************
*** 112,116 ****
                      "weblogCategoryFormEx", new WeblogCategoryFormEx(cd));
  
!                 
org.roller.presentation.caching.PageCache.handler.removeFromCache( ud );
              }
              else
--- 109,113 ----
                      "weblogCategoryFormEx", new WeblogCategoryFormEx(cd));
  
!                 PageCache.handler.removeFromCache( request,ud );
              }
              else
***************
*** 279,283 ****
  
                  UserData user = rreq.getUser();
!                 
org.roller.presentation.caching.PageCache.handler.removeFromCache( user );
              }
              else
--- 276,280 ----
  
                  UserData user = rreq.getUser();
!                 PageCache.handler.removeFromCache( request,user );
              }
              else
***************
*** 321,325 ****
  
                  UserData user = rreq.getUser();
!                 
org.roller.presentation.caching.PageCache.handler.removeFromCache( user );
              }
              else
--- 318,322 ----
  
                  UserData user = rreq.getUser();
!                 PageCache.handler.removeFromCache( request,user );
              }
              else




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  roller/src/org/roller/presentation/admin/actions UserAdminAction.java,1.8,1.9, snoopdave
Next by Date:  roller/src/org/roller/presentation/bookmarks/actions FolderFormAction.java,1.14,1.15 BookmarkFormAction.java,1.8,1.9, snoopdave
Previous by Thread:  roller/src/org/roller/presentation/admin/actions UserAdminAction.java,1.8,1.9, snoopdave
Next by Thread:  roller/src/org/roller/presentation/bookmarks/actions FolderFormAction.java,1.14,1.15 BookmarkFormAction.java,1.8,1.9, snoopdave
Indexes:  [Date] [Thread] [Top] [All Lists]

    ^^^ ADDITIONAL NAVIGATION ^^^

  
Google Custom Search

Recently Viewed:
mail.spam.rbl.s...    php.seagull.gen...    culture.religio...    qnx.openqnx.dev...    gnome.love/2006...    bug-tracking.re...    user-groups.lin...    yellowdog.gener...    handhelds.ipaq....    kde.announce/20...    java.mx4j.devel...    xfree86.expert/...    recreation.cars...    text.xml.expat....    web.zope.zope3/...    version-control...    db.carob.cvs/20...    freebsd.perform...    ecos.cvs/2003-0...    linux.hotplug.d...    systemtap/2006-...    os.freebsd.secu...   
Home | blog view | USPTO Patent Archive (NEW!) | advertise | OSDir is an inevitable website. super tiny logo