roller/src/org/roller/presentation/atom RollerAtomServlet.java,1.1,1.2

Update of /cvsroot/roller/roller/src/org/roller/presentation/atom
In directory sc8-pr-cvs1:/tmp/cvs-serv14716/src/org/roller/presentation/atom

Modified Files:
        RollerAtomServlet.java 
Log Message:
Some changes for AtomServlet - not working yet.

Index: RollerAtomServlet.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/atom/RollerAtomServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RollerAtomServlet.java      3 Sep 2003 21:26:58 -0000       1.1
--- RollerAtomServlet.java      3 Sep 2003 22:03:56 -0000       1.2
***************
*** 29,32 ****
--- 29,33 ----
  import org.roller.presentation.xmlrpc.RollerXmlRpcClient;
  
+ import java.io.IOException;
  import java.net.URLDecoder;
  import java.sql.Timestamp;
***************
*** 38,41 ****
--- 39,43 ----
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
  
  /** 
***************
*** 64,68 ****
          if (rContext == null) return;
          mBaseUrl = rContext.getRollerConfig().getAbsoluteURL();
!     }  
  
      //------------------------------------------------------------------------
--- 66,94 ----
          if (rContext == null) return;
          mBaseUrl = rContext.getRollerConfig().getAbsoluteURL();
!         super.baseURL = mBaseUrl;
!     }
!     
!     protected void service(HttpServletRequest req, HttpServletResponse resp) 
throws ServletException, IOException
!     {
!         try
!         {
!             RollerRequest rreq = RollerRequest.getRollerRequest(
!                 req, getServletContext());                
!         }
!         catch (RollerException e)
!         {
!             // do nothing about it just yet, seeing as how it
!             // could just be a 404.
!         }
!         super.service(req, resp);
!     }
!     private void releaseRoller()
!     {
!         RollerRequest rreq = RollerRequest.getRollerRequest();
!         if (rreq != null)
!         {
!             rreq.releaseRoller();
!         }
!     }
  
      //------------------------------------------------------------------------
***************
*** 138,142 ****
          WeblogEntryData entry = 
              getWeblogManager().getWeblogEntryByAnchor(pathInfo[0], 
pathInfo[2]);
!             
          return convertToAtomEntry(entry);
      }
--- 164,169 ----
          WeblogEntryData entry = 
              getWeblogManager().getWeblogEntryByAnchor(pathInfo[0], 
pathInfo[2]);
!         
!         releaseRoller();
          return convertToAtomEntry(entry);
      }
***************
*** 157,161 ****
              weblogMgr.removeWeblogEntry( entry.getId() );
              flushPageCache( RollerRequest.getRollerRequest() );            
!         }
      }
  
--- 184,189 ----
              weblogMgr.removeWeblogEntry( entry.getId() );
              flushPageCache( RollerRequest.getRollerRequest() );            
!         }        
!         releaseRoller();
      }
  
***************
*** 206,210 ****
          RollerXmlRpcClient.sendWeblogsPing(
              contextUrl + entry.getPermaLink(), 
!             entry.getWebsite().getName());  
      }
  
--- 234,239 ----
          RollerXmlRpcClient.sendWeblogsPing(
              contextUrl + entry.getPermaLink(), 
!             entry.getWebsite().getName());          
!         releaseRoller();
      }
  
***************
*** 246,250 ****
                  flushPageCache(rreq);
              }
!         }
      }
  
--- 275,280 ----
                  flushPageCache(rreq);
              }
!         }        
!         releaseRoller();
      }
  
***************
*** 268,271 ****
--- 298,302 ----
          List entries= convertEntries(rollerEntries);
          
+         releaseRoller();
          return entries;
      }
***************
*** 310,313 ****
--- 341,345 ----
          List entries= convertEntries(rollerEntries);
          
+         releaseRoller();
          return entries;
      }
***************
*** 337,340 ****
--- 369,373 ----
          List entries= convertEntries(rollerEntries);
          
+         releaseRoller();
          return entries;
      }
***************
*** 378,382 ****
                   wmanager.getWeblogEntryByAnchor(username, anchor);
               searchResults.add( convertToAtomEntry(entry) );
!         }
          return searchResults;
      }
--- 411,416 ----
                   wmanager.getWeblogEntryByAnchor(username, anchor);
               searchResults.add( convertToAtomEntry(entry) );
!         }        
!         releaseRoller();
          return searchResults;
      }
***************
*** 398,402 ****
              template.setTitle(pages[i].getName());
              templates.add(template);
!         }
          return templates;
      }
--- 432,437 ----
              template.setTitle(pages[i].getName());
              templates.add(template);
!         }        
!         releaseRoller();
          return templates;
      }
***************
*** 410,413 ****
--- 445,449 ----
          PageData page = getUserManager().retrievePage(pathInfo[2]); // page id
          
+         releaseRoller();
          return page.getTemplate().getBytes();
      }
***************
*** 422,426 ****
          page.setTemplate(template);
          getUserManager().storePage(page);
!         flushPageCache( RollerRequest.getRollerRequest() );
      }
  
--- 458,463 ----
          page.setTemplate(template);
          getUserManager().storePage(page);
!         flushPageCache( RollerRequest.getRollerRequest() );        
!         releaseRoller();
      }
  
***************
*** 434,438 ****
          byte[] bytes = page.getTemplate().getBytes();
          getUserManager().removePage(pathInfo[2]); // page id
!         flushPageCache( RollerRequest.getRollerRequest() );
          return bytes;
      }
--- 471,476 ----
          byte[] bytes = page.getTemplate().getBytes();
          getUserManager().removePage(pathInfo[2]); // page id
!         flushPageCache( RollerRequest.getRollerRequest() );        
!         releaseRoller();
          return bytes;
      }
***************
*** 449,453 ****
          userPrefs.setEmail( user.getEmailAddress() );
          userPrefs.setId(user.getUserName());
!         userPrefs.setName(user.getFullName());
          return userPrefs;
      }
--- 487,492 ----
          userPrefs.setEmail( user.getEmailAddress() );
          userPrefs.setId(user.getUserName());
!         userPrefs.setName(user.getFullName());        
!         releaseRoller();
          return userPrefs;
      }
***************
*** 463,467 ****
          user.setFullName( userPrefs.getName() );
          getUserManager().storeUser(user);
!         flushPageCache( RollerRequest.getRollerRequest() );
      }
  
--- 502,507 ----
          user.setFullName( userPrefs.getName() );
          getUserManager().storeUser(user);
!         flushPageCache( RollerRequest.getRollerRequest() );        
!         releaseRoller();
      }
  
***************
*** 485,490 ****
              getWeblogManager().storeComment(rollerComment);
              flushPageCache( RollerRequest.getRollerRequest() );
!         }
!         
      }
  }
--- 525,530 ----
              getWeblogManager().storeComment(rollerComment);
              flushPageCache( RollerRequest.getRollerRequest() );
!         }        
!         releaseRoller();        
      }
  }




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