Author: keith Date: Sat Jan 19 23:33:38 2008 New Revision: 12533 Log:
Updating the jsps to use some messages defined in the properties files. We may need to mve more stuff into the properties file. Fixing Mashup-511. Modified: trunk/mashup/java/modules/www/about.jsp trunk/mashup/java/modules/www/add_user.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/faulty_mashup.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/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/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.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 Sat Jan 19 23:33:38 2008 @@ -24,7 +24,7 @@ <!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 - About</title> + <title><%= bundle.getString("main.title")%> - About</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> @@ -36,7 +36,7 @@ <%@ include file="header.jsp" %> <div id="search"></div> <div id="content"> - <div class="mashup_title">About WSO2 Mashup Server [EMAIL PROTECTED]@</div> + <div class="mashup_title">About <%= bundle.getString("main.title")%> [EMAIL PROTECTED]@</div> <dl style="margin: 1em; margin-right:3.5em"> <dt><strong>About</strong></dt> 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 Sat Jan 19 23:33:38 2008 @@ -103,7 +103,7 @@ <!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 - Add User</title> + <title><%= bundle.getString("main.title")%> - Add User</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> 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 Sat Jan 19 23:33:38 2008 @@ -64,7 +64,7 @@ %> <html> <head> - <title>WSO2 Mashup Server - Allow Guests</title> + <title><%= bundle.getString("main.title")%> - Allow Guests</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> 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 Sat Jan 19 23:33:38 2008 @@ -80,7 +80,7 @@ <!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 - Delete User</title> + <title><%= bundle.getString("main.title")%> - Delete User</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> Modified: trunk/mashup/java/modules/www/editor.jsp ============================================================================== --- trunk/mashup/java/modules/www/editor.jsp (original) +++ trunk/mashup/java/modules/www/editor.jsp Sat Jan 19 23:33:38 2008 @@ -95,7 +95,7 @@ <meta http-equiv="PRAGMA" content="NO-CACHE"> <meta http-equiv="expires" content=<%= new java.util.Date() %>> -<title>WSO2 Mashup Server - Editing <%=mashupName%> by <%=RegistryUtils +<title><%= bundle.getString("main.title")%> - Editing <%=mashupName%> by <%=RegistryUtils .getFullName(request, author)%></title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> 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 Sat Jan 19 23:33:38 2008 @@ -34,7 +34,7 @@ %> <html> <head> - <title>Details of the faulty mashup '<%=mashup%>' by <%=author%> + <title><%= bundle.getString("main.title")%> - Details of the faulty mashup '<%=mashup%>' by <%=author%> </title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> Modified: trunk/mashup/java/modules/www/index.jsp ============================================================================== --- trunk/mashup/java/modules/www/index.jsp (original) +++ trunk/mashup/java/modules/www/index.jsp Sat Jan 19 23:33:38 2008 @@ -96,7 +96,7 @@ <!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> +<title><%= bundle.getString("main.title")%> - Home</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> Modified: trunk/mashup/java/modules/www/infocardaccept.jsp ============================================================================== --- trunk/mashup/java/modules/www/infocardaccept.jsp (original) +++ trunk/mashup/java/modules/www/infocardaccept.jsp Sat Jan 19 23:33:38 2008 @@ -28,7 +28,7 @@ %> <html> <head> - <title>WSO2 Mashup Server - Accept Infocard</title> + <title><%= bundle.getString("main.title")%> - Accept Infocard</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> @@ -57,7 +57,7 @@ } } else { // Unauthenticated users are trying to sign in. - title = "Sign-in to WSO2 Mashup Server"; + title = "Sign-in to " + bundle.getString("main.title"); if (InfoCardHandler.signIn(request)) { response.sendRedirect(bounceback); return; 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 Sat Jan 19 23:33:38 2008 @@ -39,7 +39,7 @@ <!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 - Log Reader</title> + <title><%= bundle.getString("main.title")%> - Log Reader</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> 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 Sat Jan 19 23:33:38 2008 @@ -69,7 +69,7 @@ <!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 - Manage Users</title> + <title><%= bundle.getString("main.title")%> - Manage Users</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> Modified: trunk/mashup/java/modules/www/mashup.jsp ============================================================================== --- trunk/mashup/java/modules/www/mashup.jsp (original) +++ trunk/mashup/java/modules/www/mashup.jsp Sat Jan 19 23:33:38 2008 @@ -92,7 +92,7 @@ <html> <head> -<title>WSO2 Mashup Server - <%=mashup%> by <%=authorFullName%></title> +<title><%= bundle.getString("main.title")%> - <%=mashup%> by <%=authorFullName%></title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> 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 Sat Jan 19 23:33:38 2008 @@ -18,8 +18,10 @@ <%@ page import="org.wso2.mashup.utils.MashupUtils" %> <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %> <%@ page import="org.wso2.registry.Registry" %> +<%@ page import="java.util.ResourceBundle" %> <% + ResourceBundle bundle = ResourceBundle.getBundle("UI"); String firstCall = request.getParameter("firstcall"); Registry registry = RegistryUtils.getRegistry(request); @@ -44,7 +46,7 @@ <!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 - First Run</title> + <title><%= bundle.getString("main.title")%> - First Run</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> @@ -57,12 +59,8 @@ <%@ include file="header.jsp" %> <div id="search"></div> <div id="content" style="height:400px; "> - <div class="mashup_title">Welcome to the WSO2 Mashup Server!</div> - <p>Please take a moment to secure the WSO2 Mashup Server by providing a user name and password for the primary account. - This primary account will have administrative privileges, with full control over all the resources - and users. Additional users can be added by this account, or self-registration with email verification - can be enabled.</p> - <p>Note that if no email address is provided, you will be unable to recover a lost password for this account.</p> + <div class="mashup_title"><%= bundle.getString("register.admin.title")%></div> + <p><%= bundle.getString("register.admin.message")%></p> <br /> <form name="formRegisterAdmin" method='post' action="register_admin.jsp"> <table width="100%" border="0" cellpadding="3" cellspacing="0" > 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 Sat Jan 19 23:33:38 2008 @@ -15,45 +15,34 @@ --%> <%@ 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.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.LogEntry" %> -<%@ 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.*" %> <%@ 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.verification.email.EmailVerifier" %> -<%@ page import="javax.servlet.ServletContext" %> +<%@ page import="org.wso2.usermanager.UserStoreAdmin" %> +<%@ 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 bundle = ResourceBundle.getBundle("UI"); Registry registry = RegistryUtils.getRegistry(request); String bounceback = request.getParameter("bounceback"); @@ -84,7 +73,7 @@ <!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 - Self Registration</title> + <title><%= bundle.getString("main.title")%> - Self Registration</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> 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 Sat Jan 19 23:33:38 2008 @@ -15,43 +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.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.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.LogEntry" %> <%@ 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.usermanager.Realm" %> -<%@ page import="org.wso2.usermanager.UserManagerException" %> -<%@ page import="org.wso2.usermanager.verification.email.EmailVerifier" %> -<%@ page import="javax.servlet.ServletContext" %> -<%@ 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" %> <% + ResourceBundle bundle = ResourceBundle.getBundle("UI"); Registry registry = RegistryUtils.getRegistry(request); String bounceback = request.getParameter("bounceback"); @@ -85,7 +55,7 @@ <!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 - Infocard Self Registration</title> + <title><%= bundle.getString("main.title")%> - Infocard Self Registration</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> 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 Sat Jan 19 23:33:38 2008 @@ -15,44 +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.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.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.LogEntry" %> <%@ 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.usermanager.Realm" %> -<%@ page import="org.wso2.usermanager.UserManagerException" %> -<%@ page import="org.wso2.usermanager.verification.email.EmailVerifier" %> -<%@ page import="javax.servlet.ServletContext" %> -<%@ 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" %> <% + ResourceBundle bundle = ResourceBundle.getBundle("UI"); Registry registry = RegistryUtils.getRegistry(request); String bounceback = request.getParameter("bounceback"); @@ -65,7 +34,7 @@ %> <html> <head> - <title>WSO2 Mashup Server - Self Registration</title> + <title><%= bundle.getString("main.title")%> - Self Registration</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> @@ -81,7 +50,7 @@ </div> <div id="content"> - <div class="mashup_title">WSO2 Mashup Server Self Registration</div> + <div class="mashup_title"><%= bundle.getString("main.title")%> - Self Registration</div> <table width="100%" height="400" border="0" cellspacing="0" cellpadding="5"> <tr> Modified: trunk/mashup/java/modules/www/scraper.jsp ============================================================================== --- trunk/mashup/java/modules/www/scraper.jsp (original) +++ trunk/mashup/java/modules/www/scraper.jsp Sat Jan 19 23:33:38 2008 @@ -48,7 +48,7 @@ %> <html> <head> - <title>WSO2 Mashup Server - Scraping Assistant</title> + <title><%= bundle.getString("main.title")%> - Scraping Assistant</title> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <link rel="stylesheet" type="text/css" href="js/yui/grids/grids.css"> <link rel="stylesheet" type="text/css" href="js/yui/menu/assets/menu.css"> Modified: trunk/mashup/java/modules/www/search.jsp ============================================================================== --- trunk/mashup/java/modules/www/search.jsp (original) +++ trunk/mashup/java/modules/www/search.jsp Sat Jan 19 23:33:38 2008 @@ -321,7 +321,7 @@ SyndEntry entry = new SyndEntryImpl(); entry.setTitle(result.getName()); entry.setPublishedDate(today); - entry.setAuthor("WSO2 Mashup Server"); + entry.setAuthor(bundle.getString("main.title")); SyndContent description = new SyndContentImpl(); description.setType("text/html"); @@ -346,7 +346,7 @@ %><!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 - Search</title> + <title><%= bundle.getString("main.title")%> - Search</title> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> Modified: trunk/mashup/java/modules/www/signin.jsp ============================================================================== --- trunk/mashup/java/modules/www/signin.jsp (original) +++ trunk/mashup/java/modules/www/signin.jsp Sat Jan 19 23:33:38 2008 @@ -14,16 +14,8 @@ * limitations under the License. --%> <%@ page errorPage="error.jsp" %> -<%@ page import="com.sun.syndication.feed.synd.SyndContent" +<%@ page import="org.wso2.mashup.MashupConstants" %> -<%@ 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" %> @@ -32,36 +24,23 @@ <%@ 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.*" %> <%@ 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="javax.crypto.Cipher" %> -<%@ page import="javax.crypto.KeyGenerator" %> -<%@ page import="javax.crypto.SecretKey" %> -<%@ page import="javax.servlet.ServletContext" %> <%@ 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 bundle = ResourceBundle.getBundle("UI"); Registry registry = RegistryUtils.getRegistry(request); // required by header.jsp String thisPage = "signin.jsp"; @@ -156,7 +135,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html> <head> - <title>WSO2 Mashup Server - Sign In</title> + <title><%= bundle.getString("main.title")%> - Sign In</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/prototype.js" type="text/javascript"></script> @@ -198,8 +177,8 @@ <table width="675" border="0" align="right" cellpadding="3" cellspacing="0" class="box"> <tr> - <th align="center">Sign-in to WSO2 Mashup Server</th> - <th width="50%" align="center">Use info card to enter WSO2 Mashup Server</th> + <th align="center">Sign-in to <%= bundle.getString("main.title")%></th> + <th width="50%" align="center">Use info card to enter <%= bundle.getString("main.title")%></th> </tr> <tr> <td align="center" height="175"> Modified: trunk/mashup/java/modules/www/signout.jsp ============================================================================== --- trunk/mashup/java/modules/www/signout.jsp (original) +++ trunk/mashup/java/modules/www/signout.jsp Sat Jan 19 23:33:38 2008 @@ -14,44 +14,33 @@ * 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.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.LogEntry" %> -<%@ 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.*" %> <%@ 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.verification.email.EmailVerifier" %> -<%@ page import="javax.servlet.ServletContext" %> +<%@ page import="org.wso2.usermanager.UserStoreAdmin" %> +<%@ 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 bundle = ResourceBundle.getBundle("UI"); // required by header.jsp String thisPage = "signout.jsp"; @@ -128,7 +117,7 @@ %><!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 - Sign Out</title> + <title><%= bundle.getString("main.title")%> - Sign Out</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> 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 Sat Jan 19 23:33:38 2008 @@ -66,7 +66,7 @@ %> <html> <head> - <title>WSO2 Mashup Server - Javascript Stub Generator</title> + <title><%= bundle.getString("main.title")%> - Javascript Stub Generator</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <link href="css/mashup-main.css" rel="stylesheet" type="text/css"/> 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 Sat Jan 19 23:33:38 2008 @@ -77,7 +77,7 @@ <html> <head> - <title>WSO2 Mashup Server - <%=authorFullName%>'s Tags</title> + <title><%= bundle.getString("main.title")%> - <%=authorFullName%>'s Tags</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> Modified: trunk/mashup/java/modules/www/taskbar.jsp ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Sat Jan 19 23:33:38 2008 @@ -13,14 +13,6 @@ * 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.apache.axis2.context.ConfigurationContext" %> <%@ page import="org.wso2.mashup.MashupConstants" %> <%@ page import="org.wso2.mashup.MashupFault" %> <%@ page import="org.wso2.mashup.utils.MashupUtils" %> @@ -29,34 +21,26 @@ <%@ 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.*" %> <%@ 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="javax.servlet.ServletContext" %> <%@ 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 bundle = ResourceBundle.getBundle("UI"); //Setting variables required for the taskbar.jsp String paramCurrentUser = request.getParameter("currentUser"); String paramMashupServiceName = request.getParameter("mashupServiceName"); @@ -297,7 +281,7 @@ <td> <ul> <li> - <a href="../about.jsp">About the WSO2 Mashup Server</a> + <a href="../about.jsp">About the <%= bundle.getString("main.title")%></a> </li> <!--<li> <a href="#">Mashup Server blog</a> Modified: trunk/mashup/java/modules/www/user.jsp ============================================================================== --- trunk/mashup/java/modules/www/user.jsp (original) +++ trunk/mashup/java/modules/www/user.jsp Sat Jan 19 23:33:38 2008 @@ -102,7 +102,7 @@ <html> <head> - <title>WSO2 Mashup Server - <%=customizedAuthor%>'s Profile</title> + <title><%= bundle.getString("main.title")%> - <%=customizedAuthor%>'s Profile</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> Modified: trunk/mashup/java/modules/www/validate.jsp ============================================================================== --- trunk/mashup/java/modules/www/validate.jsp (original) +++ trunk/mashup/java/modules/www/validate.jsp Sat Jan 19 23:33:38 2008 @@ -17,14 +17,16 @@ <%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %> <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %> <%@ page import="org.wso2.registry.Registry" %> +<%@ page import="java.util.ResourceBundle" %> <% - Registry registry = RegistryUtils.getRegistry(request); + ResourceBundle bundle = ResourceBundle.getBundle("UI"); + Registry registry = RegistryUtils.getRegistry(request); %> <html> <head> - <title>WSO2 Mashup Server - Self Registration</title> + <title><%= bundle.getString("main.title")%> - Self Registration</title> <!-- Required CSS --> <link href="css/styles.css" rel="stylesheet" type="text/css"/> <script language="javascript" src="js/common.js" type="text/javascript"></script> @@ -37,7 +39,7 @@ <div id="search"></div> <div id="welcome"></div> <div id="content"> - <div class="mashup_title">WSO2 Mashup Server - Self Registration</div> + <div class="mashup_title"><%= bundle.getString("main.title")%> - Self Registration</div> <table width="100%" height="400" border="0" cellspacing="0" cellpadding="5"> <tr> <td align="center" height="150"> 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 Sat Jan 19 23:33:38 2008 @@ -1,12 +1,28 @@ <%@ 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.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.Registry" %> -<%@ page import="org.wso2.registry.RegistryConstants" %> +<%@ 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" %> +<%@ page import="java.net.URLDecoder" %> +<%@ page import="java.net.URLEncoder" %> +<%@ page import="java.util.*" %> <%-- * Copyright 2006,2007 WSO2, Inc. http://www.wso2.org * @@ -24,6 +40,7 @@ --%> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% + ResourceBundle bundle = ResourceBundle.getBundle("UI"); Registry registry = RegistryUtils.getRegistry(request); //Check whether the remember me option is set Modified: trunk/mashup/java/modules/www/welcome.jsp ============================================================================== --- trunk/mashup/java/modules/www/welcome.jsp (original) +++ trunk/mashup/java/modules/www/welcome.jsp Sat Jan 19 23:33:38 2008 @@ -18,18 +18,14 @@ <div id="welcome"> <img src="images/beta.png" alt="beta" style="float:left; left:-30px; position:relative; padding:.5em 0 0 0; margin:0 0 4em 0;"/> <h2>Welcome <%= RegistryUtils.getCurrentUserFullName(request) %>!</h2> - <p>The WSO2 Mashup Server is a completely free and open source platform for acquiring, converting, combining, and republishing - digital information. Each mashup is exposed as a Web Service, accessible through multiple formats and protocols. We hope you - enjoy trying out this beta and encourage you to provide feedback on the <a href="http://www.wso2.org/forum/226";>Mashup Server Forum</a>.</p> + <p><%= bundle.getString("welcome.message")%></p> <p>View or change your <a href="user.jsp?name=<%=RegistryUtils.getCurrentUser(registry)%>">profile</a>.</p> </div> <% } else { %> <div id="welcome"> <img src="images/beta.png" alt="beta" style="float:left; left:-30px; position:relative; padding:.5em 0 0 0; margin:0 0 4em 0;"/> - <h2>Welcome to the WSO2 Mashup Server beta!</h2> - <p>The WSO2 Mashup Server is a completely free and open source platform for acquiring, converting, combining, and republishing - digital information. Each mashup is exposed as a Web Service, accessible through multiple formats and protocols. We hope you - enjoy trying out this beta and encourage you to provide feedback on the <a href="http://www.wso2.org/forum/226";>Mashup Server Forum</a>.</p> + <h2><%= bundle.getString("welcome.header")%></h2> + <p><%= bundle.getString("welcome.message")%></p> <p><a href="signin.jsp?bounceback=index.jsp">Sign in</a> to view your customized home page.</p> <p style="clear:left"/> </div> _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
