Author: tyrell
Date: Wed Jan 16 09:59:46 2008
New Revision: 12359

Log:

Adding validate_login.jsp as a jsp include, which will enforce the 'Remember 
Me' functionality across all jsp pages. Please add this include at the very 
beginning of any new jsp file. This will also provide an instance of the 
registry.

Added:
   trunk/mashup/java/modules/www/validate_login.jsp
Modified:
   trunk/mashup/java/modules/www/about.jsp
   trunk/mashup/java/modules/www/add_user.jsp
   trunk/mashup/java/modules/www/ajax_profile.jsp
   trunk/mashup/java/modules/www/ajax_rating.jsp
   trunk/mashup/java/modules/www/ajax_tag.jsp
   trunk/mashup/java/modules/www/ajax_userQuery.jsp
   trunk/mashup/java/modules/www/allow_guests.jsp
   trunk/mashup/java/modules/www/delete_user.jsp
   trunk/mashup/java/modules/www/editor.jsp
   trunk/mashup/java/modules/www/error.jsp
   trunk/mashup/java/modules/www/index.jsp
   trunk/mashup/java/modules/www/infocardaccept.jsp
   trunk/mashup/java/modules/www/js/mashup-main.js
   trunk/mashup/java/modules/www/log_reader.jsp
   trunk/mashup/java/modules/www/manage_users.jsp
   trunk/mashup/java/modules/www/mashup.jsp
   trunk/mashup/java/modules/www/register_admin.jsp
   trunk/mashup/java/modules/www/register_self.jsp
   trunk/mashup/java/modules/www/register_self_infocard.jsp
   trunk/mashup/java/modules/www/registration_result.jsp
   trunk/mashup/java/modules/www/search.jsp
   trunk/mashup/java/modules/www/signout.jsp
   trunk/mashup/java/modules/www/stub_gen.jsp
   trunk/mashup/java/modules/www/tag_cloud.jsp
   trunk/mashup/java/modules/www/user.jsp
   trunk/mashup/java/modules/www/validate.jsp

Modified: trunk/mashup/java/modules/www/about.jsp
==============================================================================
--- trunk/mashup/java/modules/www/about.jsp     (original)
+++ trunk/mashup/java/modules/www/about.jsp     Wed Jan 16 09:59:46 2008
@@ -17,11 +17,10 @@
 <%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
 <%@ page import="org.wso2.registry.Registry" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
 
-%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 <html>
 <head>

Modified: trunk/mashup/java/modules/www/add_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/add_user.jsp  (original)
+++ trunk/mashup/java/modules/www/add_user.jsp  Wed Jan 16 09:59:46 2008
@@ -51,11 +51,14 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     String firstCall = request.getParameter("firstcall");
     String userName = request.getParameter("username");
     String editMode = request.getParameter("editmode");
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
     String title = "Add User";
     

Modified: trunk/mashup/java/modules/www/ajax_profile.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_profile.jsp      (original)
+++ trunk/mashup/java/modules/www/ajax_profile.jsp      Wed Jan 16 09:59:46 2008
@@ -25,6 +25,10 @@
 <%@ page import="java.util.Map" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     boolean success = false;
     String usernameParam;
@@ -35,7 +39,7 @@
         usernameParam = request.getParameter("name");
         fieldParam = request.getParameter("field");
         value = RegistryUtils.getRequestBody(request);
-        Registry registry = RegistryUtils.getRegistry(request);
+
         String currentUser = RegistryUtils.getCurrentUser(registry);
 
         UserStoreAdmin userStoreAdmin = 
RegistryUtils.getUserStoreAdmin(registry);

Modified: trunk/mashup/java/modules/www/ajax_rating.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_rating.jsp       (original)
+++ trunk/mashup/java/modules/www/ajax_rating.jsp       Wed Jan 16 09:59:46 2008
@@ -17,12 +17,14 @@
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
 <%@ page import="org.wso2.registry.Registry" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     String path = request.getParameter("path");
     String ratingDivId = request.getParameter("ratingDivId");
 
-    Registry registry = RegistryUtils.getRegistry(request);
-
     int rating = Integer.parseInt(request.getParameter("rating"));
 
     if (rating == 0) {

Modified: trunk/mashup/java/modules/www/ajax_tag.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_tag.jsp  (original)
+++ trunk/mashup/java/modules/www/ajax_tag.jsp  Wed Jan 16 09:59:46 2008
@@ -22,12 +22,16 @@
 <%@ page import="org.wso2.registry.Resource" %>
 <%@ page import="org.wso2.registry.Tag" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     boolean success = true;
     String path = "", author = "", tagValue, reason = "";
     Resource resource;
     Tag[] tags = new Tag[] {};
-    Registry registry = RegistryUtils.getRegistry(request);
+
     try {
         path = request.getParameter("path");
         author = request.getParameter("author");

Modified: trunk/mashup/java/modules/www/ajax_userQuery.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_userQuery.jsp    (original)
+++ trunk/mashup/java/modules/www/ajax_userQuery.jsp    Wed Jan 16 09:59:46 2008
@@ -21,11 +21,15 @@
 <%@ page import="org.wso2.registry.Registry" %>
 <%@ page import="org.wso2.registry.RegistryException" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     boolean success = true;
     String title="", queryParams="", path="", direction="";
     String[] params = new String[] {};
-    Registry registry = RegistryUtils.getRegistry(request);
+
     try {
         title = request.getParameter("queryTitle");
         direction = request.getParameter("direction");

Modified: trunk/mashup/java/modules/www/allow_guests.jsp
==============================================================================
--- trunk/mashup/java/modules/www/allow_guests.jsp      (original)
+++ trunk/mashup/java/modules/www/allow_guests.jsp      Wed Jan 16 09:59:46 2008
@@ -49,8 +49,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
     String enable = request.getParameter("enable");
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/delete_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/delete_user.jsp       (original)
+++ trunk/mashup/java/modules/www/delete_user.jsp       Wed Jan 16 09:59:46 2008
@@ -18,12 +18,15 @@
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
 <%@ page import="org.wso2.registry.Registry" %>
 <%@ page import="java.net.URLDecoder" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     String firstcall = request.getParameter("firstcall");
     String userName = request.getParameter("username");
     String fullName = request.getParameter("fullname");
     String message = "Confirm User Deletion";
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
     boolean deletionFailed = false;
 

Modified: trunk/mashup/java/modules/www/editor.jsp
==============================================================================
--- trunk/mashup/java/modules/www/editor.jsp    (original)
+++ trunk/mashup/java/modules/www/editor.jsp    Wed Jan 16 09:59:46 2008
@@ -20,13 +20,16 @@
 <%@ page import="org.wso2.registry.Registry" %>
 <%@ page import="java.net.URLDecoder" %>
 <%@ page import="java.util.Enumeration" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
     //Disabling browser caching
     response.setHeader("Cache-Control", "no-cache"); //HTTP 1.1
     response.setHeader("Pragma", "no-cache"); //HTTP 1.0
     response.setDateHeader("Expires", 0); //prevents caching at the proxy 
server
 
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
 
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/error.jsp
==============================================================================
--- trunk/mashup/java/modules/www/error.jsp     (original)
+++ trunk/mashup/java/modules/www/error.jsp     Wed Jan 16 09:59:46 2008
@@ -51,9 +51,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
+<%                       
     String bounceback = request.getParameter("bounceback");
 
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp     (original)
+++ trunk/mashup/java/modules/www/index.jsp     Wed Jan 16 09:59:46 2008
@@ -63,55 +63,19 @@
         response.sendRedirect("register_admin.jsp?firstcall=true");
     }
 
-    Registry registry = RegistryUtils.getRegistry(request);
-    User userProfile =
-            
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(registry), registry);
-
-    //Check whether the remember me option is set
-    Cookie cookies[] = request.getCookies();
-
-    boolean rememberMe = false;
-    String userName = null;
-    String password = null;
-
-    Cookie curCookie = null;
-    for (int x = 0; x < cookies.length; x++) {
-        curCookie = cookies[x];
-        if (curCookie.getName().equalsIgnoreCase("rememberMe")) {
-            rememberMe = true;
-        } else if (curCookie.getName().equalsIgnoreCase("username")) {
-            userName = curCookie.getValue();
-        } else if (curCookie.getName().equalsIgnoreCase("password")) {
-            password = new String(new 
sun.misc.BASE64Decoder().decodeBuffer(curCookie.getValue()),
-                                  "UTF-8");
-        }
-    }
-
-    if (rememberMe && (userName != null) && (password != null)) {
-        if (!RegistryUtils.isLoggedIn(registry)) {
-            ServletContext context = request.getSession().getServletContext();
-
-            JDBCRegistry jdbcRegistry = (JDBCRegistry) context.getAttribute(
-                    RegistryConstants.REGISTRY);
-
-            Realm realm = (Realm) 
context.getAttribute(RegistryConstants.REGISTRY_REALM);
-
-            MashupUtils.login(userName, password);
-
-            SecureRegistry secureRegistry =
-                    new SecureRegistry(userName, jdbcRegistry, realm);
+    String thisPage = "index.jsp";
 
-            request.getSession().setAttribute(MashupConstants.USER_REGISTRY, 
secureRegistry);
+%>
 
-            registry = RegistryUtils.getRegistry(request);
-            userProfile =
-                    
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(registry), registry);
-        }
-    }
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
 
-    String thisPage = "index.jsp";
+<%
+    User userProfile =
+            
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(registry), registry);
+%>
 
-%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 <html>
 <head>
     <title>WSO2 Mashup Server - Home</title>

Modified: trunk/mashup/java/modules/www/infocardaccept.jsp
==============================================================================
--- trunk/mashup/java/modules/www/infocardaccept.jsp    (original)
+++ trunk/mashup/java/modules/www/infocardaccept.jsp    Wed Jan 16 09:59:46 2008
@@ -19,9 +19,11 @@
 <%@ page import="org.wso2.registry.Registry" %>
 <%@ page import="java.net.URLDecoder" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
+<%
     boolean isLoggedIn = RegistryUtils.isLoggedIn(registry);
 %>
 <html>

Modified: trunk/mashup/java/modules/www/js/mashup-main.js
==============================================================================
--- trunk/mashup/java/modules/www/js/mashup-main.js     (original)
+++ trunk/mashup/java/modules/www/js/mashup-main.js     Wed Jan 16 09:59:46 2008
@@ -27,13 +27,6 @@
 
     init : function(isSecure) {
 
-        if (WSO2.MashupUtils.getCookieValue("userName")) {
-            //User is already logged in
-            wso2.wsf.Util.initURLs();
-            wso2.wsf.XSLTHelper.init();
-            wso2.mashup.loginSuccessful();
-
-        } else {
             wso2.wsf.Util.initURLs();
 
             if (isSecure) {
@@ -51,7 +44,7 @@
 
             //Initializing the helper function for XSLT transformations 
inherited from WSO2 AdminUI
             wso2.wsf.XSLTHelper.init();
-        }
+
 
     },
 

Modified: trunk/mashup/java/modules/www/log_reader.jsp
==============================================================================
--- trunk/mashup/java/modules/www/log_reader.jsp        (original)
+++ trunk/mashup/java/modules/www/log_reader.jsp        Wed Jan 16 09:59:46 2008
@@ -22,9 +22,11 @@
 <%@ page import="java.net.URLDecoder" %>
 <%@ page import="org.wso2.wsas.ServerManager" %>
 <%@ page import="org.apache.axis2.context.ConfigurationContext" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
+<%
     String bounceback = request.getParameter("bounceback");
 
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/manage_users.jsp
==============================================================================
--- trunk/mashup/java/modules/www/manage_users.jsp      (original)
+++ trunk/mashup/java/modules/www/manage_users.jsp      Wed Jan 16 09:59:46 2008
@@ -49,8 +49,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
     if (bounceback == null) {
         bounceback = "index.jsp";

Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp    (original)
+++ trunk/mashup/java/modules/www/mashup.jsp    Wed Jan 16 09:59:46 2008
@@ -55,8 +55,12 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
+
     String currentUser = RegistryUtils.getCurrentUser(registry);
 
     String path = request.getParameter("path");

Modified: trunk/mashup/java/modules/www/register_admin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_admin.jsp    (original)
+++ trunk/mashup/java/modules/www/register_admin.jsp    Wed Jan 16 09:59:46 2008
@@ -18,8 +18,11 @@
 <%@ page import="org.wso2.mashup.utils.MashupUtils" %>
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
 <%@ page import="org.wso2.registry.Registry" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     String firstCall = request.getParameter("firstcall");
 %>
 <jsp:useBean id="registrationHandler" 
class="org.wso2.mashup.webapp.identity.RegistrationBean"

Modified: trunk/mashup/java/modules/www/register_self.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self.jsp     (original)
+++ trunk/mashup/java/modules/www/register_self.jsp     Wed Jan 16 09:59:46 2008
@@ -51,8 +51,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
     String firstCall = request.getParameter("firstcall");
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/register_self_infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self_infocard.jsp    (original)
+++ trunk/mashup/java/modules/www/register_self_infocard.jsp    Wed Jan 16 
09:59:46 2008
@@ -51,8 +51,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     String bounceback = request.getParameter("bounceback");
     String infoCardPresented = request.getParameter("InfoCardSignin");
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/registration_result.jsp
==============================================================================
--- trunk/mashup/java/modules/www/registration_result.jsp       (original)
+++ trunk/mashup/java/modules/www/registration_result.jsp       Wed Jan 16 
09:59:46 2008
@@ -51,9 +51,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
+<%
     String bounceback = request.getParameter("bounceback");
     String success = request.getParameter("success");
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/search.jsp
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp    (original)
+++ trunk/mashup/java/modules/www/search.jsp    Wed Jan 16 09:59:46 2008
@@ -51,9 +51,10 @@
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
 
-<%
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<%
     String currentUser = RegistryUtils.getCurrentUser(registry);
     // Set bounceback location
     String queryString = request.getQueryString();

Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp   (original)
+++ trunk/mashup/java/modules/www/signout.jsp   Wed Jan 16 09:59:46 2008
@@ -50,8 +50,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     // required by header.jsp
     String thisPage = "signout.jsp";
 
@@ -96,9 +99,7 @@
         request.getSession().setAttribute(MashupConstants.USER_REGISTRY, 
secureRegistry);
 
         //Deleting user login cookies
-        Cookie cookies[] = request.getCookies();
-
-        Cookie curCookie = null;
+        curCookie = null;
         for (int x = 0; x < cookies.length; x++) {
             curCookie = cookies[x];
             if (curCookie.getName().equalsIgnoreCase("rememberMe")) {

Modified: trunk/mashup/java/modules/www/stub_gen.jsp
==============================================================================
--- trunk/mashup/java/modules/www/stub_gen.jsp  (original)
+++ trunk/mashup/java/modules/www/stub_gen.jsp  Wed Jan 16 09:59:46 2008
@@ -51,9 +51,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
+<%
     String bounceback = request.getParameter("bounceback");
 
     if (bounceback == null) {

Modified: trunk/mashup/java/modules/www/tag_cloud.jsp
==============================================================================
--- trunk/mashup/java/modules/www/tag_cloud.jsp (original)
+++ trunk/mashup/java/modules/www/tag_cloud.jsp Wed Jan 16 09:59:46 2008
@@ -51,8 +51,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     User userProfile = 
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(registry), registry);
 
     String mashupPath = request.getParameter("path");

Modified: trunk/mashup/java/modules/www/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp      (original)
+++ trunk/mashup/java/modules/www/user.jsp      Wed Jan 16 09:59:46 2008
@@ -55,8 +55,11 @@
 <%@ page import="java.util.Iterator" %>
 <%@ page import="java.util.List" %>
 <%@ page import="java.util.Map" %>
+
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
+
 <%
-    Registry registry = RegistryUtils.getRegistry(request);
     Realm realm = (Realm) request.getSession().getServletContext().
             getAttribute(RegistryConstants.REGISTRY_REALM);
 

Modified: trunk/mashup/java/modules/www/validate.jsp
==============================================================================
--- trunk/mashup/java/modules/www/validate.jsp  (original)
+++ trunk/mashup/java/modules/www/validate.jsp  Wed Jan 16 09:59:46 2008
@@ -17,11 +17,10 @@
 <%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
 <%@ page import="org.wso2.registry.Registry" %>
-<%
 
-    Registry registry = RegistryUtils.getRegistry(request);
+<!--Required to keep a user logged in if 'Remember Me' option is selected-->
+<%@ include file="validate_login.jsp" %>
 
-%>
 <html>
 <head>
     <title>WSO2 Mashup Server - Self Registration</title>

Added: trunk/mashup/java/modules/www/validate_login.jsp
==============================================================================
--- (empty file)
+++ trunk/mashup/java/modules/www/validate_login.jsp    Wed Jan 16 09:59:46 2008
@@ -0,0 +1,69 @@
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.utils.MashupUtils" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.Registry" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
+<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
+<%@ page import="org.wso2.usermanager.Realm" %>
+<%--
+ * Copyright 2006,2007 WSO2, Inc. http://www.wso2.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+    Registry registry = RegistryUtils.getRegistry(request);
+
+    //Check whether the remember me option is set
+    Cookie cookies[] = request.getCookies();
+
+    boolean rememberMe = false;
+    String userNameStored = null;
+    String passwordStored = null;
+
+    Cookie curCookie = null;
+    for (int x = 0; x < cookies.length; x++) {
+        curCookie = cookies[x];
+        if (curCookie.getName().equalsIgnoreCase("rememberMe")) {
+            rememberMe = true;
+        } else if (curCookie.getName().equalsIgnoreCase("username")) {
+            userNameStored = curCookie.getValue();
+        } else if (curCookie.getName().equalsIgnoreCase("password")) {
+            passwordStored =
+                    new String(new 
sun.misc.BASE64Decoder().decodeBuffer(curCookie.getValue()),
+                               "UTF-8");
+        }
+    }
+
+    if (rememberMe && (userNameStored != null) && (passwordStored != null)) {
+        if (!RegistryUtils.isLoggedIn(registry)) {
+            ServletContext context = request.getSession().getServletContext();
+
+            JDBCRegistry jdbcRegistry = (JDBCRegistry) context.getAttribute(
+                    RegistryConstants.REGISTRY);
+
+            Realm realm = (Realm) 
context.getAttribute(RegistryConstants.REGISTRY_REALM);
+
+            MashupUtils.login(userNameStored, passwordStored);
+
+            SecureRegistry secureRegistry =
+                    new SecureRegistry(userNameStored, jdbcRegistry, realm);
+
+            request.getSession().setAttribute(MashupConstants.USER_REGISTRY, 
secureRegistry);
+
+            registry = RegistryUtils.getRegistry(request);
+        }         
+    }
+%>
\ No newline at end of file

_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev

Reply via email to