roller/src/org/roller/presentation/weblog/actions BakeWeblogAction.java,1.4,1.5 CommentFormAction.java,1.17,1.18 ReferersAction.java,1.10,1.11 ThemeEditorAction.java,1.10,1.11 ToggleLinkbackDisplayAction.java,1.5,1.6

Update of /cvsroot/roller/roller/src/org/roller/presentation/weblog/actions
In directory 
sc8-pr-cvs1:/tmp/cvs-serv19545/src/org/roller/presentation/weblog/actions

Modified Files:
        BakeWeblogAction.java CommentFormAction.java 
        ReferersAction.java ThemeEditorAction.java 
        ToggleLinkbackDisplayAction.java 
Log Message:
Move RollerConfig to org.roller.model, and remove RefererDataEx and 
WeblogEntryDataEx.

Index: BakeWeblogAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/BakeWeblogAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BakeWeblogAction.java       15 Apr 2003 02:19:24 -0000      1.4
--- BakeWeblogAction.java       24 Apr 2003 03:46:55 -0000      1.5
***************
*** 40,44 ****
  import org.roller.presentation.RollerSession;
  import org.roller.presentation.velocity.VelocityHelper;
- import org.roller.presentation.weblog.WeblogEntryDataEx;
  import org.roller.presentation.weblog.tags.WeblogEntryMacros;
  
--- 40,43 ----
***************
*** 202,209 ****
                for (int i=0; i<entries.length; i++)
                {                       
!                       // Do we need this to continue supporting Macros?
!                       WeblogEntryDataEx exEd = 
!                               new WeblogEntryDataEx(entries[i], 
rreq.getRequest());
!                       exEntries.add(exEd);
                }
                context.put( "entries", exEntries ); 
--- 201,205 ----
                for (int i=0; i<entries.length; i++)
                {                       
!                       exEntries.add(entries[i]);
                }
                context.put( "entries", exEntries ); 

Index: CommentFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/CommentFormAction.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CommentFormAction.java      18 Apr 2003 22:35:07 -0000      1.17
--- CommentFormAction.java      24 Apr 2003 03:46:55 -0000      1.18
***************
*** 23,30 ****
  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.RollerConfig;
  import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;
--- 23,30 ----
  import org.apache.struts.actions.DispatchAction;
  import org.roller.model.CommentData;
+ import org.roller.model.RollerConfig;
  import org.roller.model.UserData;
  import org.roller.model.WeblogEntryData;
  import org.roller.model.WeblogManager;
  import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;

Index: ReferersAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ReferersAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ReferersAction.java 9 Apr 2003 04:30:30 -0000       1.10
--- ReferersAction.java 24 Apr 2003 03:46:55 -0000      1.11
***************
*** 14,18 ****
  import org.apache.struts.actions.DispatchAction;
  import org.roller.model.RefererData;
- import org.roller.presentation.weblog.RefererDataEx;
  import org.roller.model.RefererManager;
  import org.roller.model.UserData;
--- 14,17 ----
***************
*** 70,80 ****
                      
                  RefererData[] refs = 
refmgr.getTodaysReferers(ud.getUserName());
!                 RefererDataEx[] refsex = new RefererDataEx[refs.length];      
                                        
!                 for (int i = 0; i < refs.length; i++)
!                 {
!                     refsex[i] = new RefererDataEx(req,refs[i]); 
!                 }
!                                                 
!                 ses.setAttribute("referers",refsex);        
              }
          }
--- 69,73 ----
                      
                  RefererData[] refs = 
refmgr.getTodaysReferers(ud.getUserName());
!                 ses.setAttribute("referers",refs);        
              }
          }

Index: ThemeEditorAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ThemeEditorAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ThemeEditorAction.java      9 Apr 2003 04:30:30 -0000       1.10
--- ThemeEditorAction.java      24 Apr 2003 03:46:55 -0000      1.11
***************
*** 24,31 ****
  import org.roller.RollerException;
  import org.roller.model.PageData;
  import org.roller.model.UserData;
  import org.roller.model.UserManager;
  import org.roller.model.WebsiteData;
- import org.roller.presentation.RollerConfig;
  import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;
--- 24,31 ----
  import org.roller.RollerException;
  import org.roller.model.PageData;
+ import org.roller.model.RollerConfig;
  import org.roller.model.UserData;
  import org.roller.model.UserManager;
  import org.roller.model.WebsiteData;
  import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;

Index: ToggleLinkbackDisplayAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ToggleLinkbackDisplayAction.java    9 Apr 2003 04:30:30 -0000       1.5
--- ToggleLinkbackDisplayAction.java    24 Apr 2003 03:46:55 -0000      1.6
***************
*** 13,19 ****
  import org.roller.model.RefererData;
  import org.roller.model.RefererManager;
  import org.roller.presentation.RollerRequest;
  import org.roller.presentation.caching.PageCache;
- import org.roller.presentation.users.WebsiteDataEx;
  
  
--- 13,19 ----
  import org.roller.model.RefererData;
  import org.roller.model.RefererManager;
+ import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;
  import org.roller.presentation.caching.PageCache;
  
  
***************
*** 64,72 ****
          
          // forward to user's website URL
!         WebsiteDataEx wd = new WebsiteDataEx(rreq.getWebsite(),req);
!         if ( wd != null )
!         {
!             res.sendRedirect(wd.getUrl());                   
!         }
          return null;
        }
--- 64,80 ----
          
          // forward to user's website URL
!               String url = null;
!               try
!               {
!                       RollerContext rctx = RollerContext.getRollerContext(
!                               rreq.getServletContext());
!                       url = rctx.getContextUrl( req, userName);
!                       res.sendRedirect(url);
!               }
!               catch (Exception e)
!               {
!                       mLogger.error("Unexpected exception",e);
!               }
! 
          return null;
        }




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf