Author: keith
Date: Fri Mar 28 23:24:06 2008
New Revision: 15320
Log:
Fixing Mashup-739
Modified:
trunk/mashup/java/modules/www/error.jsp
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/signin.jsp
trunk/mashup/java/modules/www/taskbar.jsp
trunk/mashup/java/modules/www/validate_login.jsp
Modified: trunk/mashup/java/modules/www/error.jsp
==============================================================================
--- trunk/mashup/java/modules/www/error.jsp (original)
+++ trunk/mashup/java/modules/www/error.jsp Fri Mar 28 23:24:06 2008
@@ -55,7 +55,7 @@
<head>
<title>Sorry. An error occured while processing your request.</title>
<!-- Required CSS -->
- <link href="/css/styles.css" rel="stylesheet" type="text/css"/>
+ <link href="css/styles.css" rel="stylesheet" type="text/css"/>
</head>
<body>
<div id="page">
Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Fri Mar 28 23:24:06 2008
@@ -378,22 +378,22 @@
<script type="text/javascript">
function customUiCallback() {
document.getElementById("custom_ui_link").innerHTML =
- 'View the <a href="/services/<%=author%>/<%= mashup
%>/" target="_blank">HTML Interface</a> to the service'
+ 'View the <a href="services/<%=author%>/<%= mashup
%>/" target="_blank">HTML Interface</a> to the service'
}
- isCustomUiAvailable('/services/<%=author%>/<%= mashup %>',
customUiCallback);
+ isCustomUiAvailable('services/<%=author%>/<%= mashup %>',
customUiCallback);
</script>
- <li><a href="/services/<%=author%>/<%= mashup %>?tryit"
title="?tryit"
+ <li><a href="services/<%=author%>/<%= mashup %>?tryit"
title="?tryit"
target="_blank">Try</a> the
service
</li>
- <li>Read <a href="/services/<%=author%>/<%= mashup %>?doc"
title="?doc"
+ <li>Read <a href="services/<%=author%>/<%= mashup %>?doc"
title="?doc"
target="_blank">API
documentation</a>
</li>
<li>View the <a
- href="/services/<%=author%>/<%= mashup
%>?source&content-type=text/plain"
+ href="services/<%=author%>/<%= mashup
%>?source&content-type=text/plain"
title="?source" target="_blank">source code</a></li>
</ul>
@@ -407,25 +407,25 @@
<td>
<div class="mashup_details">
<ul>
- <li><a href="/services/<%=author%>/<%= mashup
%>?wsdl2&annotation=true">WSDL 2.0</a>
+ <li><a href="services/<%=author%>/<%= mashup
%>?wsdl2&annotation=true">WSDL 2.0</a>
(<a
- href="/services/<%=author%>/<%= mashup
%>?wsdl2">raw</a>)
+ href="services/<%=author%>/<%= mashup
%>?wsdl2">raw</a>)
</li>
- <li><a href="/services/<%=author%>/<%= mashup
%>?wsdl&annotation=true">WSDL 1.1</a>
+ <li><a href="services/<%=author%>/<%= mashup
%>?wsdl&annotation=true">WSDL 1.1</a>
(<a
- href="/services/<%=author%>/<%= mashup
%>?wsdl">raw</a>)
+ href="services/<%=author%>/<%= mashup %>?wsdl">raw</a>)
</li>
- <li><a href="/services/<%=author%>/<%= mashup
%>?xsd&annotation=true">XML Schema</a>
+ <li><a href="services/<%=author%>/<%= mashup
%>?xsd&annotation=true">XML Schema</a>
(<a
- href="/services/<%=author%>/<%= mashup %>?xsd">raw</a>)
+ href="services/<%=author%>/<%= mashup %>?xsd">raw</a>)
</li>
- <li><a href="/services/<%=author%>/<%= mashup
%>?stub&content-type=text/plain">Javascript
+ <li><a href="services/<%=author%>/<%= mashup
%>?stub&content-type=text/plain">Javascript
(DOM) stub</a> - optimum for a cross-browser web page
</li>
- <li><a href="/services/<%=author%>/<%= mashup
%>?stub&lang=e4x&content-type=text/plain">Javascript
+ <li><a href="services/<%=author%>/<%= mashup
%>?stub&lang=e4x&content-type=text/plain">Javascript
(E4X) stub</a> - optimum for a Firefox web page or Mashup
with a fixed IP address
</li>
- <li><a href="/services/<%=author%>/<%= mashup
%>?stub&lang=e4x&localhost=true&content-type=text/plain">Javascript
+ <li><a href="services/<%=author%>/<%= mashup
%>?stub&lang=e4x&localhost=true&content-type=text/plain">Javascript
(E4X) stub using "localhost" endpoints</a> - optimum for a
Mashup hosted on this server
</li>
</ul>
Modified: trunk/mashup/java/modules/www/signin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp (original)
+++ trunk/mashup/java/modules/www/signin.jsp Fri Mar 28 23:24:06 2008
@@ -94,7 +94,8 @@
UserRealm realm =
(UserRealm)
context.getAttribute(RegistryConstants.REGISTRY_REALM);
- MashupUtils.login(nameProvided, passwordProvided,
session.getId());
+ MashupUtils.login(nameProvided, passwordProvided,
session.getId(),
+ request.getContextPath());
SecureRegistry secureRegistry =
RegistryUtils.createSecureRegistry(nameProvided,
jdbcRegistry, realm);
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Fri Mar 28 23:24:06 2008
@@ -214,7 +214,7 @@
<%if((paramPath != null)&&(paramMashupServiceName != null)){
%>
<li>
- <a href="/services/<%=author%>/<%=paramMashup%>?download">Download
this mashup</a>
+ <a href="services/<%=author%>/<%=paramMashup%>?download">Download this
mashup</a>
</li>
<%
}%>
@@ -271,7 +271,7 @@
<a href="http://blog.mooshup.com/";>Mashup Server blog</a>
</li>
<li>
- <a href="/docs/index.html">User guide</a>
+ <a href="docs/index.html">User guide</a>
and <a
href="http://www.wso2.org/wiki/display/mashup/WSO2+Mashup+Server+Reference";>Documentation</a>
</li>
<li>
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 Fri Mar 28 23:24:06 2008
@@ -99,7 +99,8 @@
(UserRealm)
context.getAttribute(RegistryConstants.REGISTRY_REALM);
try {
- MashupUtils.login(userNameStored, passwordStored,
session.getId());
+ MashupUtils.login(userNameStored, passwordStored,
session.getId(),
+ request.getContextPath());
} catch (MashupFault mashupFault) {
//The credentials stored in the cookie is invalid.
Deleting the cookie.
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
