Author: keith Date: Thu Jun 5 08:11:08 2008 New Revision: 18031 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18031
Log: Fixing link generation when in context mode (The links were incorrect when the user was not signed in) Modified: trunk/mashup/java/modules/www/taskbar.jsp trunk/mashup/java/modules/www/validate_login.jsp Modified: trunk/mashup/java/modules/www/taskbar.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/taskbar.jsp?rev=18031&r1=18030&r2=18031&view=diff ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Thu Jun 5 08:11:08 2008 @@ -18,6 +18,7 @@ <%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %> <%@ page import="org.wso2.registry.Resource" %> <%@ page import="org.wso2.registry.session.UserRegistry" %> +<%@ page import="org.wso2.adminui.AdminUIServletContextListener" %> <%@ page import="java.util.ResourceBundle" %> <%@ page import="org.wso2.mashup.MashupConstants" %> <%@ page import="org.wso2.wsas.ServerManager" %> @@ -25,7 +26,7 @@ <% ConfigurationContext axis2ConfigContext = ServerManager.getInstance().configContext; - String contextRoot = axis2ConfigContext.getContextRoot(); + String contextRoot = AdminUIServletContextListener.contextPath; if (!contextRoot.endsWith(MashupConstants.FORWARD_SLASH)) { contextRoot = contextRoot + MashupConstants.FORWARD_SLASH; } Modified: trunk/mashup/java/modules/www/validate_login.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/validate_login.jsp?rev=18031&r1=18030&r2=18031&view=diff ============================================================================== --- trunk/mashup/java/modules/www/validate_login.jsp (original) +++ trunk/mashup/java/modules/www/validate_login.jsp Thu Jun 5 08:11:08 2008 @@ -20,13 +20,14 @@ <%@ page import="org.wso2.registry.RegistryConstants" %> <%@ page import="org.wso2.registry.jdbc.EmbeddedRegistry" %> <%@ page import="org.wso2.registry.session.UserRegistry" %> +<%@ page import="org.wso2.adminui.AdminUIServletContextListener" %> <%@ page import="java.util.ResourceBundle" %> <%@ page import="org.wso2.wsas.ServerManager" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> <% ConfigurationContext axis2ConfigContext = ServerManager.getInstance().configContext; - String contextRoot = axis2ConfigContext.getContextRoot(); + String contextRoot = AdminUIServletContextListener.contextPath; if (!contextRoot.endsWith(MashupConstants.FORWARD_SLASH)) { contextRoot = contextRoot + MashupConstants.FORWARD_SLASH; } _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
