Author: dimuthul
Date: Mon Mar 3 01:31:15 2008
New Revision: 14440
Log:
Fixing the issue 706.
And doing some clean up along the way.
Modified:
trunk/mashup/java/modules/www/ajax_profile.jsp
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/manage_users.jsp
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/register_self.jsp
trunk/mashup/java/modules/www/reset_password.jsp
trunk/mashup/java/modules/www/signin.jsp
trunk/mashup/java/modules/www/signout.jsp
trunk/mashup/java/modules/www/taskbar.jsp
trunk/mashup/java/modules/www/user.jsp
trunk/mashup/java/modules/www/validate_login.jsp
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 Mon Mar 3 01:31:15 2008
@@ -20,8 +20,8 @@
<%@ page import="org.wso2.registry.Registry" %>
<%@ page import="org.wso2.registry.RegistryConstants" %>
<%@ page import="org.wso2.registry.Resource" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
+<%@ page import="org.wso2.registry.users.UserRealm" %>
+<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.HashMap" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
@@ -56,7 +56,7 @@
}
} else {
- Realm realm = (Realm) request.getSession().getServletContext().
+ UserRealm realm = (UserRealm)
request.getSession().getServletContext().
getAttribute(RegistryConstants.REGISTRY_REALM);
Map userProperties = null;
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Mon Mar 3 01:31:15 2008
@@ -42,9 +42,6 @@
<%@ page import="org.wso2.registry.Tag" %>
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="javax.servlet.ServletContext" %>
<%@ page import="java.io.BufferedReader" %>
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 Mon Mar 3 01:31:15 2008
@@ -35,8 +35,6 @@
<%@ page import="org.wso2.registry.RegistryException" %>
<%@ page import="org.wso2.registry.Resource" %>
<%@ page import="org.wso2.registry.Tag" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.utils.ServerConfiguration" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="javax.servlet.ServletContext" %>
Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Mon Mar 3 01:31:15 2008
@@ -41,9 +41,6 @@
<%@ page import="org.wso2.registry.Tag" %>
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="javax.servlet.ServletContext" %>
<%@ page import="java.io.BufferedReader" %>
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 Mon Mar 3 01:31:15 2008
@@ -31,9 +31,6 @@
<%@ page import="org.wso2.registry.*" %>
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="java.io.BufferedReader" %>
<%@ page import="java.io.FileReader" %>
<%@ page import="java.net.URL" %>
Modified: trunk/mashup/java/modules/www/reset_password.jsp
==============================================================================
--- trunk/mashup/java/modules/www/reset_password.jsp (original)
+++ trunk/mashup/java/modules/www/reset_password.jsp Mon Mar 3 01:31:15 2008
@@ -45,9 +45,6 @@
<%@ page import="org.wso2.registry.Tag" %>
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.utils.ServerConfiguration" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="java.io.BufferedReader" %>
Modified: trunk/mashup/java/modules/www/signin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp (original)
+++ trunk/mashup/java/modules/www/signin.jsp Mon Mar 3 01:31:15 2008
@@ -46,9 +46,6 @@
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.utils.ServerConfiguration" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="java.io.BufferedReader" %>
Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp (original)
+++ trunk/mashup/java/modules/www/signout.jsp Mon Mar 3 01:31:15 2008
@@ -45,9 +45,6 @@
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.utils.ServerConfiguration" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="java.io.BufferedReader" %>
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Mon Mar 3 01:31:15 2008
@@ -29,9 +29,6 @@
<%@ page import="org.wso2.registry.*" %>
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="java.io.BufferedReader" %>
<%@ page import="java.io.FileReader" %>
<%@ page import="java.net.URL" %>
Modified: trunk/mashup/java/modules/www/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp (original)
+++ trunk/mashup/java/modules/www/user.jsp Mon Mar 3 01:31:15 2008
@@ -41,9 +41,9 @@
<%@ page import="org.wso2.registry.Tag" %>
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
+<%@ page import="org.wso2.registry.users.UserRealm" %>
+<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="javax.servlet.ServletContext" %>
<%@ page import="java.io.BufferedReader" %>
@@ -66,7 +66,7 @@
String mashupServiceName = "";
String path = "";
- Realm realm = (Realm) request.getSession().getServletContext().
+ UserRealm realm = (UserRealm) request.getSession().getServletContext().
getAttribute(RegistryConstants.REGISTRY_REALM);
String memberName = request.getParameter("name");
@@ -78,7 +78,7 @@
Map userProperties;
try {
userProperties =
realm.getUserStoreReader().getUserProperties(memberName);
- } catch (UserManagerException e) {
+ } catch (UserStoreException e) {
throw new RegistryException("Error retrieving user name", e);
}
Modified: trunk/mashup/java/modules/www/validate_login.jsp
==============================================================================
--- trunk/mashup/java/modules/www/validate_login.jsp (original)
+++ trunk/mashup/java/modules/www/validate_login.jsp Mon Mar 3 01:31:15 2008
@@ -29,9 +29,6 @@
<%@ page import="org.wso2.registry.jdbc.JDBCRegistry" %>
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
<%@ page import="org.wso2.utils.ServerConfiguration" %>
<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="java.io.BufferedReader" %>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
