Author: tyrell
Date: Wed Apr 23 23:31:49 2008
New Revision: 16088
Log:
Fixing imports.
Modified:
trunk/mashup/java/modules/www/about.jsp
trunk/mashup/java/modules/www/add_user.jsp
trunk/mashup/java/modules/www/admin_act_user.jsp
trunk/mashup/java/modules/www/ajax_profile.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/faulty_mashup.jsp
trunk/mashup/java/modules/www/header.jsp
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/infocardaccept.jsp
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/promote_user.jsp
trunk/mashup/java/modules/www/register_self.jsp
trunk/mashup/java/modules/www/register_self_infocard.jsp
trunk/mashup/java/modules/www/reset_password.jsp
trunk/mashup/java/modules/www/scraper.jsp
trunk/mashup/java/modules/www/search.jsp
trunk/mashup/java/modules/www/signin.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/taskbar.jsp
trunk/mashup/java/modules/www/user.jsp
trunk/mashup/java/modules/www/validate_login.jsp
trunk/mashup/java/modules/www/welcome.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 Apr 23 23:31:49 2008
@@ -14,10 +14,18 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
+<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+%>
+
<!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 Apr 23 23:31:49 2008
@@ -15,13 +15,18 @@
--%>
<%@ page errorPage="error.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
String firstCall = request.getParameter("firstcall");
String userName = request.getParameter("username");
String editMode = request.getParameter("editmode");
Modified: trunk/mashup/java/modules/www/admin_act_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/admin_act_user.jsp (original)
+++ trunk/mashup/java/modules/www/admin_act_user.jsp Wed Apr 23 23:31:49 2008
@@ -14,13 +14,18 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
String bounceback = request.getParameter("bounceback");
String enable = request.getParameter("enable");
if (bounceback == null) {
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 Apr 23 23:31:49 2008
@@ -14,13 +14,23 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.Resource" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="org.wso2.registry.users.UserRealm" %>
<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
+<%@ page import="java.util.Map" %>
<%@ 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" %>
<%
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
boolean success = false;
String usernameParam;
String fieldParam;
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 Apr 23 23:31:49 2008
@@ -14,44 +14,19 @@
* 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.wso2.mashup.MashupConstants" %>
-<%@ page import="org.wso2.mashup.utils.QueryResult" %>
-<%@ page import="org.wso2.mashup.utils.QueryResults" %>
-<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
<%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ 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.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.usermanager.Realm" %>
-<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="javax.servlet.ServletContext" %>
-<%@ page import="java.net.URL" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
<%@ page import="java.net.URLDecoder" %>
-<%@ 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" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = 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 Apr 23 23:31:49 2008
@@ -14,13 +14,19 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
String firstcall = request.getParameter("firstcall");
String reactivate = request.getParameter("reactivate");
String userName = request.getParameter("username");
Modified: trunk/mashup/java/modules/www/editor.jsp
==============================================================================
--- trunk/mashup/java/modules/www/editor.jsp (original)
+++ trunk/mashup/java/modules/www/editor.jsp Wed Apr 23 23:31:49 2008
@@ -15,13 +15,21 @@
--%>
<%@ page errorPage="error.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.utils.MashupUtils" %>
+<%@ page import="org.wso2.mashup.webapp.MashupUiFault" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
//Disabling browser caching
response.setHeader("Cache-Control", "no-cache"); //HTTP 1.1
response.setHeader("Pragma", "no-cache"); //HTTP 1.0
Modified: trunk/mashup/java/modules/www/error.jsp
==============================================================================
--- trunk/mashup/java/modules/www/error.jsp (original)
+++ trunk/mashup/java/modules/www/error.jsp Wed Apr 23 23:31:49 2008
@@ -15,50 +15,7 @@
--%>
<%@ page isErrorPage="true" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ 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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
-<%@ 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.net.URLEncoder" %>
-<%@ 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" %>
+
<html>
<head>
<title>Sorry. An error occured while processing your request.</title>
Modified: trunk/mashup/java/modules/www/faulty_mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/faulty_mashup.jsp (original)
+++ trunk/mashup/java/modules/www/faulty_mashup.jsp Wed Apr 23 23:31:49 2008
@@ -1,7 +1,33 @@
+<%--
+ * 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 import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.RegistryException" %>
+<%@ page import="org.wso2.registry.Resource" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
+
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
String bounceback = request.getParameter("bounceback");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/header.jsp
==============================================================================
--- trunk/mashup/java/modules/www/header.jsp (original)
+++ trunk/mashup/java/modules/www/header.jsp Wed Apr 23 23:31:49 2008
@@ -13,7 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.ResourceBundle" %>
+
+<%
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+%>
+
<script type="text/javascript" src="../wsasadmin/global_params.js"></script>
<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
<script type="text/javascript" src="js/utils.js"></script>
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Wed Apr 23 23:31:49 2008
@@ -14,9 +14,22 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ 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.userprofile.User" %>
+<%@ 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.session.UserRegistry" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.ResourceBundle" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
if (!MashupUtils.isInitialSetupComplete() &&
MashupUtils.isFromLocalHost(request)) {
//Deleting previous user login cookies, if found
Cookie[] cookies = request.getCookies();
Modified: trunk/mashup/java/modules/www/infocardaccept.jsp
==============================================================================
--- trunk/mashup/java/modules/www/infocardaccept.jsp (original)
+++ trunk/mashup/java/modules/www/infocardaccept.jsp Wed Apr 23 23:31:49 2008
@@ -14,12 +14,20 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
+<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<%@ 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" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
boolean isLoggedIn = RegistryUtils.isLoggedIn(userRegistry);
%>
<html>
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 Apr 23 23:31:49 2008
@@ -15,13 +15,22 @@
--%>
<%@ page errorPage="error.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="org.wso2.wsas.ServerManager" %>
+<%@ page import="java.io.BufferedReader" %>
+<%@ page import="java.io.FileReader" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
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 Apr 23 23:31:49 2008
@@ -14,13 +14,23 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
if (!RegistryUtils.isAdminRole(userRegistry)) {
response.sendRedirect("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 Apr 23 23:31:49 2008
@@ -14,13 +14,25 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.utils.QueryResults" %>
+<%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.Comment" %>
+<%@ 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.session.UserRegistry" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
String currentUser = RegistryUtils.getCurrentUser(userRegistry);
Modified: trunk/mashup/java/modules/www/promote_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/promote_user.jsp (original)
+++ trunk/mashup/java/modules/www/promote_user.jsp Wed Apr 23 23:31:49 2008
@@ -14,13 +14,19 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
String firstcall = request.getParameter("firstcall");
String demote = request.getParameter("demote");
String userName = request.getParameter("username");
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 Apr 23 23:31:49 2008
@@ -15,49 +15,13 @@
--%>
<%@ page errorPage="error.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ 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.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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.EmbeddedRegistry" %>
<%@ page import="org.wso2.registry.session.UserRegistry" %>
-<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
<%@ 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.ArrayList" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Map" %>
+<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.ResourceBundle" %>
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 Apr 23
23:31:49 2008
@@ -20,6 +20,7 @@
<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
<%@ page import="org.wso2.registry.session.UserRegistry" %>
<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.ResourceBundle" %>
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
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 Wed Apr 23 23:31:49 2008
@@ -15,49 +15,9 @@
--%>
<%@ page errorPage="error.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ 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.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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.EmbeddedRegistry" %>
<%@ page import="org.wso2.registry.session.UserRegistry" %>
-<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
-<%@ 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.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" %>
<%
Modified: trunk/mashup/java/modules/www/scraper.jsp
==============================================================================
--- trunk/mashup/java/modules/www/scraper.jsp (original)
+++ trunk/mashup/java/modules/www/scraper.jsp Wed Apr 23 23:31:49 2008
@@ -1,3 +1,8 @@
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<%--
* Copyright 2006,2007 WSO2, Inc. http://www.wso2.org
*
@@ -20,6 +25,8 @@
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+
//Disabling browser caching
response.setHeader("Cache-Control", "no-cache"); //HTTP 1.1
response.setHeader("Pragma", "no-cache"); //HTTP 1.0
Modified: trunk/mashup/java/modules/www/search.jsp
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp (original)
+++ trunk/mashup/java/modules/www/search.jsp Wed Apr 23 23:31:49 2008
@@ -14,13 +14,35 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ 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.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.utils.QueryResult" %>
+<%@ page import="org.wso2.mashup.utils.QueryResults" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
+<%@ 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.session.UserRegistry" %>
+<%@ page import="java.net.URL" %>
+<%@ page import="java.util.ArrayList" %>
+<%@ page import="java.util.Date" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.List" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
String currentUser = RegistryUtils.getCurrentUser(userRegistry);
// Set bounceback location
String queryString = request.getQueryString();
Modified: trunk/mashup/java/modules/www/signin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp (original)
+++ trunk/mashup/java/modules/www/signin.jsp Wed Apr 23 23:31:49 2008
@@ -14,50 +14,17 @@
* 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.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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.EmbeddedRegistry" %>
<%@ page import="org.wso2.registry.session.UserRegistry" %>
-<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
<%@ 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.ArrayList" %>
-<%@ page import="java.util.Date" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Map" %>
+<%@ page import="java.net.URLEncoder" %>
<%@ page import="java.util.ResourceBundle" %>
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp (original)
+++ trunk/mashup/java/modules/www/signout.jsp Wed Apr 23 23:31:49 2008
@@ -14,49 +14,14 @@
* 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.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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.EmbeddedRegistry" %>
<%@ page import="org.wso2.registry.session.UserRegistry" %>
<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
-<%@ 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.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" %>
<%
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 Apr 23 23:31:49 2008
@@ -15,13 +15,18 @@
--%>
<%@ page errorPage="error.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.net.URLDecoder" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
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 Apr 23 23:31:49 2008
@@ -14,11 +14,22 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ 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.session.UserRegistry" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
User userProfile =
RegistryUtils.getUserProfile(RegistryUtils.getCurrentUser(userRegistry),
userRegistry);
String mashupPath = request.getParameter("path");
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Wed Apr 23 23:31:49 2008
@@ -13,53 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ 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.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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.EmbeddedRegistry" %>
<%@ page import="org.wso2.registry.session.UserRegistry" %>
-<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
-<%@ 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.net.URLEncoder" %>
-<%@ 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");
//Setting variables required for the taskbar.jsp
Modified: trunk/mashup/java/modules/www/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp (original)
+++ trunk/mashup/java/modules/www/user.jsp Wed Apr 23 23:31:49 2008
@@ -14,13 +14,30 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.utils.QueryResult" %>
+<%@ page import="org.wso2.mashup.utils.QueryResults" %>
+<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
+<%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.RegistryException" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="org.wso2.registry.users.UserRealm" %>
<%@ page import="org.wso2.registry.users.UserStoreException" %>
+<%@ page import="java.net.URLEncoder" %>
+<%@ page import="java.util.Iterator" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="java.util.ResourceBundle" %>
<!--Required to keep a user logged in if 'Remember Me' option is selected-->
<%@ include file="validate_login.jsp" %>
<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+
//Setting variables required for the taskbar.jsp
String author = "";
String currentUser = RegistryUtils.getCurrentUser(userRegistry);
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 Wed Apr 23 23:31:49 2008
@@ -1,48 +1,3 @@
-<%@ 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.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" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
-<%@ page import="org.wso2.mashup.webapp.userprofile.UserInformation" %>
-<%@ 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.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.EmbeddedRegistry" %>
-<%@ page import="org.wso2.registry.session.UserRegistry" %>
-<%@ page import="org.wso2.registry.users.UserRealm" %>
-<%@ page import="org.wso2.registry.users.UserStoreAdmin" %>
-<%@ page import="org.wso2.registry.users.UserStoreException" %>
-<%@ 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.net.URLEncoder" %>
-<%@ 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" %>
<%--
* Copyright 2006,2007 WSO2, Inc. http://www.wso2.org
*
@@ -58,7 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
+<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.utils.MashupUtils" %>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.RegistryConstants" %>
+<%@ page import="org.wso2.registry.jdbc.EmbeddedRegistry" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.util.ResourceBundle" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
<%
ResourceBundle bundle = ResourceBundle.getBundle("UI");
UserRegistry userRegistry = RegistryUtils.getRegistry(request);
Modified: trunk/mashup/java/modules/www/welcome.jsp
==============================================================================
--- trunk/mashup/java/modules/www/welcome.jsp (original)
+++ trunk/mashup/java/modules/www/welcome.jsp Wed Apr 23 23:31:49 2008
@@ -13,7 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
+<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
+<%@ page import="org.wso2.registry.session.UserRegistry" %>
+<%@ page import="java.util.ResourceBundle" %>
<%@ page errorPage="error.jsp" %>
+
+<%
+ ResourceBundle bundle = ResourceBundle.getBundle("UI");
+ UserRegistry userRegistry = RegistryUtils.getRegistry(request);
+%>
+
<% if (RegistryUtils.isLoggedIn(userRegistry)) { %>
<div id="welcome">
<img src="images/vOneDotOh.jpg" alt="v1.0" style="float:left; margin:2em
1em 4em 1em;"/>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
