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

[michi at wyona.com]

Author: michi
Date: 2007-12-18 14:14:01 +0100 (Tue, 18 Dec 2007)
New Revision: 29975

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
use web authenticator impl

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	2007-12-18 13:13:22 UTC (rev 29974)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2007-12-18 13:14:01 UTC (rev 29975)
@@ -1227,7 +1227,17 @@
                 response.setHeader("WWW-Authenticate", "BASIC realm=\"" + realm.getName() + "\"");
                 response.sendError(response.SC_UNAUTHORIZED);
             } else {
-                getXHTMLAuthenticationForm(request, response, realm, null);
+                try {
+	        WebAuthenticator wa = map.getRealm(request.getServletPath()).getWebAuthenticator();
+                if (wa == null) {
+	            wa = defaultWA;
+                }
+                wa.getXHTMLAuthenticationForm(request, response, realm, null, reservedPrefix, xsltLoginScreenDefault, servletContextRealPath, sslPort, map);
+                } catch (Exception e) {
+                    log.error(e, e);
+                    throw new ServletException(e.getMessage());
+                }
+                //getXHTMLAuthenticationForm(request, response, realm, null);
             }
             return response;
         } else {
@@ -1588,6 +1598,7 @@
     /**
      * Custom XHTML Form for authentication
      */
+/*
     private void getXHTMLAuthenticationForm(HttpServletRequest request, HttpServletResponse response, Realm realm, String message) throws ServletException, IOException {
         String pathRelativeToRealm = request.getServletPath().replaceFirst(realm.getMountPoint(),"/");
         String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(pathRelativeToRealm);
@@ -1648,6 +1659,7 @@
             throw new ServletException(e.getMessage());
         }        
     }
+*/
 
     /**
      * Write to output stream of modifiable resource