Author: tyrell
Date: Thu Jan 17 16:11:48 2008
New Revision: 12437
Log:
Removing error.jsp from jsp includes to prevent error page getting embedded
inside main pages. Also removing remember me include from registration pages.
Modified:
trunk/mashup/java/modules/core/conf/web_root.xml
trunk/mashup/java/modules/www/ajax_rating.jsp
trunk/mashup/java/modules/www/ajax_tag.jsp
trunk/mashup/java/modules/www/ajax_userQuery.jsp
trunk/mashup/java/modules/www/error.jsp
trunk/mashup/java/modules/www/footer.jsp
trunk/mashup/java/modules/www/header.jsp
trunk/mashup/java/modules/www/rating.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/taskbar.jsp
trunk/mashup/java/modules/www/validate.jsp
Modified: trunk/mashup/java/modules/core/conf/web_root.xml
==============================================================================
--- trunk/mashup/java/modules/core/conf/web_root.xml (original)
+++ trunk/mashup/java/modules/core/conf/web_root.xml Thu Jan 17 16:11:48 2008
@@ -151,10 +151,10 @@
<error-page>
<error-code>500</error-code>
- <location>/error.jsp</location>
+ <location>error.jsp</location>
</error-page>
<error-page>
<error-code>404</error-code>
- <location>/error.jsp</location>
+ <location>error.jsp</location>
</error-page>
</web-app>
Modified: trunk/mashup/java/modules/www/ajax_rating.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_rating.jsp (original)
+++ trunk/mashup/java/modules/www/ajax_rating.jsp Thu Jan 17 16:11:48 2008
@@ -13,15 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page errorPage="error.jsp" %>
<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
<%@ page import="org.wso2.registry.Registry" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
-
<%
+ Registry registry = RegistryUtils.getRegistry(request);
+
String path = request.getParameter("path");
String ratingDivId = request.getParameter("ratingDivId");
Modified: trunk/mashup/java/modules/www/ajax_tag.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_tag.jsp (original)
+++ trunk/mashup/java/modules/www/ajax_tag.jsp Thu Jan 17 16:11:48 2008
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page errorPage="error.jsp" %>
<%@ page import="org.wso2.mashup.MashupConstants" %>
<%@ page import="org.wso2.mashup.utils.QueryResults" %>
<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
@@ -23,10 +22,9 @@
<%@ page import="org.wso2.registry.Tag" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
-
<%
+ Registry registry = RegistryUtils.getRegistry(request);
+
boolean success = true;
String path = "", author = "", tagValue, reason = "";
Resource resource;
Modified: trunk/mashup/java/modules/www/ajax_userQuery.jsp
==============================================================================
--- trunk/mashup/java/modules/www/ajax_userQuery.jsp (original)
+++ trunk/mashup/java/modules/www/ajax_userQuery.jsp Thu Jan 17 16:11:48 2008
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page errorPage="error.jsp" %>
<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
<%@ page import="org.wso2.mashup.webapp.userprofile.UserQuery" %>
<%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
@@ -22,10 +21,9 @@
<%@ page import="org.wso2.registry.RegistryException" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
-
<%
+ Registry registry = RegistryUtils.getRegistry(request);
+
boolean success = true;
String title="", queryParams="", path="", direction="";
String[] params = new String[] {};
Modified: trunk/mashup/java/modules/www/error.jsp
==============================================================================
--- trunk/mashup/java/modules/www/error.jsp (original)
+++ trunk/mashup/java/modules/www/error.jsp Thu Jan 17 16:11:48 2008
@@ -68,9 +68,7 @@
<title>Sorry. An error occured while processing your request.</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
- <script language="javascript" src="js/common.js"
type="text/javascript"></script>
- <script language="javascript"
- type="text/javascript">userLoggedOn =
<%=RegistryUtils.isLoggedIn(registry) %>;</script>
+ <script language="javascript" src="js/common.js"
type="text/javascript"></script>
</head>
<body>
<div id="page">
@@ -80,14 +78,14 @@
<div id="welcome">
</div>
<div id="content">
- <% if (exception.getMessage() != null) {%>
+ <% if (exception!=null && (exception.getMessage() != null)) {%>
<div class="mashup_title"><%= exception.getMessage() %>
</div>
<table width="100%" height="400" border="0" cellspacing="0"
cellpadding="5">
<tr>
<td valign="top">
- <%--<div><%= exception.printStackTrace() %></div>--%>
+ <%-- <div><%=exception.printStackTrace()%></div>--%>
</td>
</tr>
Modified: trunk/mashup/java/modules/www/footer.jsp
==============================================================================
--- trunk/mashup/java/modules/www/footer.jsp (original)
+++ trunk/mashup/java/modules/www/footer.jsp Thu Jan 17 16:11:48 2008
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page errorPage="error.jsp" %>
<div id="footer">
<p><a href="http://wso2.com/products/mashup/";>WSO2 Mashup Server</a>
© 2007-2008 WSO2 Inc.</p>
</div>
Modified: trunk/mashup/java/modules/www/header.jsp
==============================================================================
--- trunk/mashup/java/modules/www/header.jsp (original)
+++ trunk/mashup/java/modules/www/header.jsp Thu Jan 17 16:11:48 2008
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page errorPage="error.jsp" %>
<%@ page import="java.net.URLEncoder" %>
<div id="banner">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
Modified: trunk/mashup/java/modules/www/rating.jsp
==============================================================================
--- trunk/mashup/java/modules/www/rating.jsp (original)
+++ trunk/mashup/java/modules/www/rating.jsp Thu Jan 17 16:11:48 2008
@@ -17,7 +17,7 @@
Requires the path of the mashup (path)
Also requires the common.js script to be included in the page
--%>
-<%@ page errorPage="error.jsp" %>
+
<div id="<%=id%>"
class="rating_<%=path.replace('/', '_')%>"
initialState="00 00 00 00 00"
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 Thu Jan 17 16:11:48 2008
@@ -52,10 +52,10 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
<%
+ Registry registry = RegistryUtils.getRegistry(request);
+
String bounceback = request.getParameter("bounceback");
String firstCall = request.getParameter("firstcall");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/register_self_infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self_infocard.jsp (original)
+++ trunk/mashup/java/modules/www/register_self_infocard.jsp Thu Jan 17
16:11:48 2008
@@ -51,11 +51,9 @@
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
-
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
-
<%
+ Registry registry = RegistryUtils.getRegistry(request);
+
String bounceback = request.getParameter("bounceback");
String infoCardPresented = request.getParameter("InfoCardSignin");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/registration_result.jsp
==============================================================================
--- trunk/mashup/java/modules/www/registration_result.jsp (original)
+++ trunk/mashup/java/modules/www/registration_result.jsp Thu Jan 17
16:11:48 2008
@@ -52,10 +52,9 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.Map" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
-
<%
+ Registry registry = RegistryUtils.getRegistry(request);
+
String bounceback = request.getParameter("bounceback");
String success = request.getParameter("success");
if (bounceback == null) {
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Thu Jan 17 16:11:48 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page errorPage="error.jsp" %>
+
<table width="100%" border="0" class="box" cellspacing="0" cellpadding="3">
<tr>
<th>Tasks</th>
Modified: trunk/mashup/java/modules/www/validate.jsp
==============================================================================
--- trunk/mashup/java/modules/www/validate.jsp (original)
+++ trunk/mashup/java/modules/www/validate.jsp Thu Jan 17 16:11:48 2008
@@ -18,8 +18,9 @@
<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
<%@ page import="org.wso2.registry.Registry" %>
-<!--Required to keep a user logged in if 'Remember Me' option is selected-->
-<%@ include file="validate_login.jsp" %>
+<%
+ Registry registry = RegistryUtils.getRegistry(request);
+%>
<html>
<head>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
