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

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

Modified Files:
        RollerAtomServlet.java 
Log Message:
Fixes for RollerAtomServlet - nearly there.

Index: RollerAtomServlet.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/atom/RollerAtomServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RollerAtomServlet.java      3 Sep 2003 22:03:56 -0000       1.2
--- RollerAtomServlet.java      4 Sep 2003 18:16:47 -0000       1.3
***************
*** 48,51 ****
--- 48,53 ----
   * @web.servlet name="AtomServlet"
   * @web.servlet-mapping url-pattern="/atom/*"
+  * @web.security-role-ref role-name="Atom" role-link="atomuser"
+  * @web.security-role role-name="atomuser" description="Authenticated 
AtomServlet User"
   */
  public class RollerAtomServlet extends AtomServlet
***************
*** 55,59 ****
                  
      protected static String mBaseUrl = null;
!     
      /* (non-Javadoc)
       * @see javax.servlet.GenericServlet#init()
--- 57,62 ----
                  
      protected static String mBaseUrl = null;
! 
!     
//------------------------------------------------------------------------    
      /* (non-Javadoc)
       * @see javax.servlet.GenericServlet#init()
***************
*** 64,78 ****
  
          RollerContext rContext = 
RollerContext.getRollerContext(getServletContext());
!         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)
--- 67,95 ----
  
          RollerContext rContext = 
RollerContext.getRollerContext(getServletContext());
!         if (rContext == null)
!         {
!             mLogger.error("RollerContext not initialized yet!");
!             mBaseUrl = "/" + getServletContext().getServletContextName();
!         }
!         else
!         {
!             mBaseUrl = rContext.getAbsoluteContextUrl();
!         }
          super.baseURL = mBaseUrl;
      }
! 
!     
//------------------------------------------------------------------------    
!     private void startRoller(HttpServletRequest req)
      {
          try
          {
!             RollerRequest.getRollerRequest(req, getServletContext());    
!             if (mBaseUrl == null)
!             {
!                 mBaseUrl = RollerContext.getRollerContext(
!                     getServletContext() ).getAbsoluteContextUrl(req);
!                 mLogger.error("mBaseUrl is null, set to " + mBaseUrl);
!                 super.baseURL = mBaseUrl;                          
!             }
          }
          catch (RollerException e)
***************
*** 80,86 ****
--- 97,115 ----
              // do nothing about it just yet, seeing as how it
              // could just be a 404.
+             mLogger.error(e.getMessage());
+             
          }
+     }
+     
+     
//------------------------------------------------------------------------   
+     protected void service(HttpServletRequest req, HttpServletResponse resp) 
+         throws ServletException, IOException
+     {
+         mLogger.error("Entering RollerAtomServlet service() method");
+         startRoller(req);
          super.service(req, resp);
      }
+ 
+     
//------------------------------------------------------------------------    
      private void releaseRoller()
      {




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