Author: keith Date: Thu Jun 19 09:41:25 2008 New Revision: 18488 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18488
Log: More changes needed for Mashup-858 Modified: trunk/mashup/java/modules/dashboard/login_validator.jsp trunk/mashup/java/modules/www/signin.jsp trunk/mashup/java/modules/www/validate_login.jsp Modified: trunk/mashup/java/modules/dashboard/login_validator.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/dashboard/login_validator.jsp?rev=18488&r1=18487&r2=18488&view=diff ============================================================================== --- trunk/mashup/java/modules/dashboard/login_validator.jsp (original) +++ trunk/mashup/java/modules/dashboard/login_validator.jsp Thu Jun 19 09:41:25 2008 @@ -7,6 +7,7 @@ <%@ page import="org.wso2.registry.session.UserRegistry" %> <%@ page import="org.wso2.wsas.ServerManager" %> <%@ page import="java.util.ResourceBundle" %> +<%@ page import="org.apache.axiom.om.util.Base64" %> <% String signout = request.getParameter("signout"); @@ -54,8 +55,7 @@ userNameStored = curCookie.getValue(); } else if (curCookie.getName().equalsIgnoreCase("password")) { passwordStored = - new String( - new sun.misc.BASE64Decoder().decodeBuffer(curCookie.getValue()), + new String(Base64.decode(curCookie.getValue()), "UTF-8"); } } @@ -114,10 +114,8 @@ response.addCookie(usernameCookie); // Encode the password - Cookie passwordCookie = new Cookie("password", - new sun.misc.BASE64Encoder().encode( - password.getBytes( - "UTF-8"))); + Cookie passwordCookie = + new Cookie("password", Base64.encode(password.getBytes("UTF-8"))); passwordCookie.setMaxAge(expireIn); passwordCookie.setSecure(true); response.addCookie(passwordCookie); Modified: trunk/mashup/java/modules/www/signin.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/signin.jsp?rev=18488&r1=18487&r2=18488&view=diff ============================================================================== --- trunk/mashup/java/modules/www/signin.jsp (original) +++ trunk/mashup/java/modules/www/signin.jsp Thu Jun 19 09:41:25 2008 @@ -26,6 +26,7 @@ <%@ page import="java.net.URLDecoder" %> <%@ page import="java.net.URLEncoder" %> <%@ page import="java.util.ResourceBundle" %> +<%@ page import="org.apache.axiom.om.util.Base64" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% ResourceBundle bundle = ResourceBundle.getBundle("UI"); @@ -104,8 +105,7 @@ response.addCookie(usernameCookie); // Encode the password - Cookie passwordCookie = new Cookie("password", - new sun.misc.BASE64Encoder().encode( + Cookie passwordCookie = new Cookie("password",Base64.encode( passwordProvided.getBytes( "UTF-8"))); passwordCookie.setMaxAge(expireIn); Modified: trunk/mashup/java/modules/www/validate_login.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/validate_login.jsp?rev=18488&r1=18487&r2=18488&view=diff ============================================================================== --- trunk/mashup/java/modules/www/validate_login.jsp (original) +++ trunk/mashup/java/modules/www/validate_login.jsp Thu Jun 19 09:41:25 2008 @@ -23,6 +23,7 @@ <%@ page import="org.wso2.adminui.AdminUIServletContextListener" %> <%@ page import="java.util.ResourceBundle" %> <%@ page import="org.wso2.wsas.ServerManager" %> +<%@ page import="org.apache.axiom.om.util.Base64" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% @@ -55,8 +56,7 @@ userNameStored = curCookie.getValue(); } else if (curCookie.getName().equalsIgnoreCase("password")) { passwordStored = - new String( - new sun.misc.BASE64Decoder().decodeBuffer(curCookie.getValue()), + new String(Base64.decode(curCookie.getValue()), "UTF-8"); } } _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
