roller/src/org/roller/presentation/users/actions UploadFileFormAction.java,1.11,1.12 UserFormAction.java,1.21,1.22 PageFormAction.java,1.12,1.13 WebsiteFormAction.java,1.19,1.20

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

Modified Files:
        UploadFileFormAction.java UserFormAction.java 
        PageFormAction.java WebsiteFormAction.java 
Log Message:
Ongoing dev - Hibernate impl

Index: UploadFileFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/users/actions/UploadFileFormAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** UploadFileFormAction.java   1 Mar 2003 23:45:21 -0000       1.11
--- UploadFileFormAction.java   24 Mar 2003 04:56:28 -0000      1.12
***************
*** 36,40 ****
   *  path    ="/uploadFiles"
   *  parameter="method"
!  *  scope   ="request"
   *  validate="false"
   */
--- 36,40 ----
   *  path    ="/uploadFiles"
   *  parameter="method"
!  *  scope   ="session"
   *  validate="false"
   */

Index: UserFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/users/actions/UserFormAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** UserFormAction.java 1 Mar 2003 23:45:21 -0000       1.21
--- UserFormAction.java 24 Mar 2003 04:56:28 -0000      1.22
***************
*** 34,38 ****
   * New user form action.
   * @struts.action name="userFormEx" path="/user"
!  *  scope="request" parameter="method"
   */
  public final class UserFormAction extends DispatchAction
--- 34,38 ----
   * New user form action.
   * @struts.action name="userFormEx" path="/user"
!  *  scope="session" parameter="method"
   */
  public final class UserFormAction extends DispatchAction
***************
*** 131,135 ****
                  request.setAttribute("user",ud);
  
!                 request.setAttribute("userFormEx",new UserFormEx(ud));
  
                  PageCache.removeFromCache( request,ud );
--- 131,136 ----
                  request.setAttribute("user",ud);
  
!                 UserForm uf = (UserForm)actionForm;
!                 uf.setData(ud);
  
                  PageCache.removeFromCache( request,ud );
***************
*** 186,189 ****
--- 187,193 ----
                  // Make sure index page displays changes
                UDBCacheFactory.getCache().removeFromCache(data);
+                   
+                 // Don't reset, user form should never be empty  
+                 //actionForm.reset(mapping,request);
              }
              else

Index: PageFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/users/actions/PageFormAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PageFormAction.java 6 Mar 2003 02:45:26 -0000       1.12
--- PageFormAction.java 24 Mar 2003 04:56:28 -0000      1.13
***************
*** 28,32 ****
   * Page form action.
   * @struts.action name="pageForm" path="/page"
!  *  scope="request" parameter="method"
   */
  public final class PageFormAction extends DispatchAction
--- 28,32 ----
   * Page form action.
   * @struts.action name="pageForm" path="/page"
!  *  scope="session" parameter="method"
   */
  public final class PageFormAction extends DispatchAction
***************
*** 48,52 ****
                  WebsiteData hd = rreq.getWebsite();
  
!                 data.setWebsiteId( hd.getId() );
                  data.setUpdateTime( new java.util.Date() );
                  data.setDescription("");
--- 48,52 ----
                  WebsiteData hd = rreq.getWebsite();
  
!                 data.setWebsite( hd );
                  data.setUpdateTime( new java.util.Date() );
                  data.setDescription("");
***************
*** 58,61 ****
--- 58,63 ----
                  UserData user = rreq.getUser();
                  PageCache.removeFromCache( request,user );
+                     
+                 actionForm.reset(mapping,request);
              }
              else
***************
*** 99,103 ****
  
                  PageData pd = rreq.getPage();
!                 request.setAttribute("pageForm",new PageForm(pd));
  
                  PageCache.removeFromCache( request,ud );
--- 101,106 ----
  
                  PageData pd = rreq.getPage();
!                 PageForm pf = (PageForm)actionForm;
!                 pf.setData(pd);
  
                  PageCache.removeFromCache( request,ud );
***************
*** 166,169 ****
--- 169,174 ----
                  UserData user = rreq.getUser();
                  PageCache.removeFromCache( request,user );
+                     
+                 actionForm.reset(mapping,request);
              }
              else
***************
*** 194,198 ****
              {
                  PageData cd = rreq.getPage();
!                 request.setAttribute("pageForm",new PageForm(cd));
  
                  UserData ud = rreq.getUser();
--- 199,204 ----
              {
                  PageData cd = rreq.getPage();
!                 PageForm pf = (PageForm)actionForm;
!                 pf.setData(cd);
  
                  UserData ud = rreq.getUser();
***************
*** 227,230 ****
--- 233,237 ----
                  PageData data = ((PageForm)actionForm).getData();
                  data.setUpdateTime( new java.util.Date() );
+                 data.setWebsite( rreq.getWebsite() );
  
                  validateLink( data );
***************
*** 247,250 ****
--- 254,260 ----
                  forward = mapping.findForward("access-denied");
              }
+               
+             // Don't reset this form. Allow user to keep on tweaking.        
+             //actionForm.reset(mapping,request);
          }
          catch (Exception e)

Index: WebsiteFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/users/actions/WebsiteFormAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** WebsiteFormAction.java      1 Mar 2003 23:45:21 -0000       1.19
--- WebsiteFormAction.java      24 Mar 2003 04:56:28 -0000      1.20
***************
*** 33,37 ****
   * New user form action.
   * @struts.action name="websiteForm" path="/website"
!  *  scope="request" parameter="method"
   */
  public final class WebsiteFormAction extends DispatchAction
--- 33,37 ----
   * New user form action.
   * @struts.action name="websiteForm" path="/website"
!  *  scope="session" parameter="method"
   */
  public final class WebsiteFormAction extends DispatchAction
***************
*** 68,72 ****
  
                  WebsiteData hd = rreq.getWebsite();
!                 request.setAttribute("websiteForm",new WebsiteForm(hd));
  
                  WeblogCategoryData[] cd = rreq.getWeblogCategories();
--- 68,73 ----
  
                  WebsiteData hd = rreq.getWebsite();
!                 WebsiteForm wf = (WebsiteForm)actionForm;
!                 wf.setData(hd);
  
                  WeblogCategoryData[] cd = rreq.getWeblogCategories();
***************
*** 135,139 ****
                  if(!form.getDefaultPageId().equals(form.getWeblogDayPageId()))
                  {
!                     mgr.storeWebsite( form.getData() );
  
                      request.getSession().setAttribute(
--- 136,144 ----
                  if(!form.getDefaultPageId().equals(form.getWeblogDayPageId()))
                  {
!                     UserData ud = rreq.getUser();
!                     
!                     WebsiteData wd = form.getData();
!                     wd.setUser(ud);
!                     mgr.storeWebsite( wd );
  
                      request.getSession().setAttribute(
***************
*** 144,148 ****
                          RollerRequest.WEBSITEID_KEY,form.getId());
  
-                     UserData ud = rreq.getUser();
                      // clear the page cache for this user
                      PageCache.removeFromCache( request,ud );
--- 149,152 ----
***************
*** 163,166 ****
--- 167,172 ----
                  forward = mapping.findForward("access-denied");
              }
+                     
+             actionForm.reset(mapping,request);            
          }
          catch (RollerException re)




-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en