[mashup-dev] svn commit r14169 - trunk/mashup/java/modules/www

[svn]

Author: tyrell
Date: Mon Feb 25 03:16:52 2008
New Revision: 14169

Log:

Refactoring as a result of the merger between registry and user manager.

Modified:
   trunk/mashup/java/modules/www/signin.jsp
   trunk/mashup/java/modules/www/signout.jsp

Modified: trunk/mashup/java/modules/www/signin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp    (original)
+++ trunk/mashup/java/modules/www/signin.jsp    Mon Feb 25 03:16:52 2008
@@ -14,14 +14,21 @@
  * limitations under the License.
 --%>
 <%@ page errorPage="error.jsp" %>
-<%@ page import="com.sun.syndication.feed.synd.*"
+<%@ page import="com.sun.syndication.feed.synd.SyndContent"
         %>
+<%@ page import="com.sun.syndication.feed.synd.SyndContentImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntry" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntryImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndFeed" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndFeedImpl" %>
 <%@ page import="com.sun.syndication.io.SyndFeedOutput" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
 <%@ page import="org.wso2.mashup.MashupConstants" %>
 <%@ page import="org.wso2.mashup.MashupFault" %>
 <%@ page import="org.wso2.mashup.utils.MashupUtils" %>
 <%@ page import="org.wso2.mashup.utils.QueryResult" %>
 <%@ page import="org.wso2.mashup.utils.QueryResults" %>
+<%@ page import="org.wso2.mashup.webapp.MashupUiFault" %>
 <%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
 <%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
 <%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
@@ -30,9 +37,15 @@
 <%@ page import="org.wso2.mashup.webapp.userprofile.UserQuery" %>
 <%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
-<%@ page import="org.wso2.registry.*" %>
+<%@ page import="org.wso2.registry.Comment" %>
+<%@ page import="org.wso2.registry.Registry" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.RegistryException" %>
+<%@ page import="org.wso2.registry.Resource" %>
+<%@ page import="org.wso2.registry.Tag" %>
 <%@ 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" %>
@@ -42,7 +55,12 @@
 <%@ page import="java.io.FileReader" %>
 <%@ page import="java.net.URL" %>
 <%@ page import="java.net.URLDecoder" %>
-<%@ page import="java.util.*" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="java.util.ResourceBundle" %>
 <%
     ResourceBundle bundle = ResourceBundle.getBundle("UI");
     Registry registry = RegistryUtils.getRegistry(request);
@@ -76,7 +94,7 @@
                 JDBCRegistry jdbcRegistry = (JDBCRegistry) 
context.getAttribute(
                         RegistryConstants.REGISTRY);
 
-                Realm realm = (Realm) 
context.getAttribute(RegistryConstants.REGISTRY_REALM);
+                UserRealm realm = (UserRealm) 
context.getAttribute(RegistryConstants.REGISTRY_REALM);
                 MashupUtils.login(nameProvided, passwordProvided, 
session.getId());
 
                 SecureRegistry secureRegistry =

Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp   (original)
+++ trunk/mashup/java/modules/www/signout.jsp   Mon Feb 25 03:16:52 2008
@@ -14,11 +14,20 @@
  * limitations under the License.
 --%>
 <%@ page errorPage="error.jsp" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndContent" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndContentImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntry" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntryImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndFeed" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndFeedImpl" %>
+<%@ page import="com.sun.syndication.io.SyndFeedOutput" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
 <%@ page import="org.wso2.mashup.MashupConstants" %>
 <%@ page import="org.wso2.mashup.MashupFault" %>
 <%@ page import="org.wso2.mashup.utils.MashupUtils" %>
 <%@ page import="org.wso2.mashup.utils.QueryResult" %>
 <%@ page import="org.wso2.mashup.utils.QueryResults" %>
+<%@ page import="org.wso2.mashup.webapp.MashupUiFault" %>
 <%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
 <%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
 <%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
@@ -27,17 +36,30 @@
 <%@ page import="org.wso2.mashup.webapp.userprofile.UserQuery" %>
 <%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
 <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
-<%@ page import="org.wso2.registry.*" %>
+<%@ page import="org.wso2.registry.Comment" %>
+<%@ page import="org.wso2.registry.Registry" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.RegistryException" %>
+<%@ page import="org.wso2.registry.Resource" %>
+<%@ page import="org.wso2.registry.Tag" %>
 <%@ 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" %>
 <%@ page import="java.io.FileReader" %>
 <%@ page import="java.net.URL" %>
 <%@ page import="java.net.URLDecoder" %>
-<%@ page import="java.util.*" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="java.util.ResourceBundle" %>
 
 <%
     ResourceBundle bundle = ResourceBundle.getBundle("UI");
@@ -79,7 +101,7 @@
         JDBCRegistry jdbcRegistry =
                 (JDBCRegistry) 
context.getAttribute(RegistryConstants.REGISTRY);
 
-        Realm realm = (Realm) 
context.getAttribute(RegistryConstants.REGISTRY_REALM);
+        UserRealm realm = (UserRealm) 
context.getAttribute(RegistryConstants.REGISTRY_REALM);
 
         MashupUtils.logout(session.getId());
 

_______________________________________________
Mashup-dev mailing list
Mashup-dev@wso2.org
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev