[Yanel-commits] rev 32153 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2008-02-18 22:02:26 +0100 (Mon, 18 Feb 2008)
New Revision: 32153

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
doCreate method started and doLogout more documentation added

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-02-18 20:05:05 UTC (rev 32152)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-02-18 21:02:26 UTC (rev 32153)
@@ -173,10 +173,13 @@
         String httpAcceptMediaTypes = request.getHeader("Accept");
         String httpAcceptLanguage = request.getHeader("Accept-Language");
 
-        // Logout from Yanel
         String yanelUsecase = request.getParameter("yanel.usecase");
         if(yanelUsecase != null && yanelUsecase.equals("logout")) {
+            // Logout from Yanel
             if(doLogout(request, response) != null) return;
+        } else if(yanelUsecase != null && yanelUsecase.equals("create")) {
+            // Create a new resource
+            if(doCreate(request, response) != null) return;
         }
 
         // Check authorization and if authorization failed, then try to authenticate
@@ -1385,11 +1388,12 @@
         s = s.replaceAll("\"", """);
         return s;
     }
+
     /**
-     *
+     * Do logout
+     * @return null for a regular logout and a Neutron response if auth scheme is Neutron
      */
     public HttpServletResponse doLogout(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        log.info("Logout from Yanel ...");
         try {
             HttpSession session = request.getSession(true);
             // TODO: should we logout only from the current realm, or from all realms?
@@ -1397,8 +1401,10 @@
             Realm realm = map.getRealm(request.getServletPath());
             IdentityMap identityMap = (IdentityMap)session.getAttribute(IDENTITY_MAP_KEY);
             if (identityMap != null && identityMap.containsKey(realm.getID())) {
+                log.info("Logout from realm: " + realm.getID());
                 identityMap.remove(realm.getID());
             }
+
             String clientSupportedAuthScheme = request.getHeader("WWW-Authenticate");
             if (clientSupportedAuthScheme != null && clientSupportedAuthScheme.equals("Neutron-Auth")) {
                 // TODO: send some XML content, e.g. <logout-successful/>
@@ -1408,6 +1414,8 @@
                 writer.print("Neutron Logout Successful!");
                 return response;
             }
+
+            if (log.isDebugEnabled()) log.debug("Regular Logout Successful!");
             return null;
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -1416,6 +1424,14 @@
     }
 
     /**
+     * Do create a new resource
+     */
+    public HttpServletResponse doCreate(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        log.error("Not implemented yet!");
+        return null;
+    }
+
+    /**
      * Patches the mimetype of the Content-Type response field because
      * Microsoft Internet Explorer does not understand application/xhtml+xml
      * See http://en.wikipedia.org/wiki/Criticisms_of_Internet_Explorer#XHTML