Relative URL fixes

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@509 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/admin/SidebarTag.java

@@ -18,6 +18,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
 import java.util.Iterator;
 import java.io.IOException;
@@ -153,7 +154,7 @@ public class SidebarTag extends BodyTagSupport {
      */
     public int doEndTag() throws JspException {
         // Start by getting the request from the page context
-        ServletRequest request = pageContext.getRequest();
+        HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
 
         // Check for body of this tag and the child tag
         if (getBodyContent().getString() == null) {
@@ -228,7 +229,8 @@ public class SidebarTag extends BodyTagSupport {
                                         value = StringUtils.replace(value, "[id]", clean(subitemID));
                                         value = StringUtils.replace(value, "[name]", clean(subitemName));
                                         value = StringUtils.replace(value, "[description]", clean(subitemDescr));
-                                        value = StringUtils.replace(value, "[url]", clean(subitemURL));
+                                        value = StringUtils.replace(value, "[url]",
+                                                request.getContextPath() + "/" + clean(subitemURL));
                                     }
                                     String css = getCss();
                                     boolean isCurrent = item.equals(current);
@@ -271,7 +273,8 @@ public class SidebarTag extends BodyTagSupport {
                                                 svalue = StringUtils.replace(svalue, "[id]", clean(sibID));
                                                 svalue = StringUtils.replace(svalue, "[name]", clean(sibName));
                                                 svalue = StringUtils.replace(svalue, "[description]", clean(sibDescr));
-                                                svalue = StringUtils.replace(svalue, "[url]", clean(sibURL));
+                                                svalue = StringUtils.replace(svalue, "[url]",
+                                                        request.getContextPath() + "/" + clean(sibURL));
                                             }
                                             buf.append("<li class=\"").append(subcss).append("\">").append(svalue).append("</li>\n");
                                         }

src/java/org/jivesoftware/admin/TabsTag.java

@@ -18,6 +18,7 @@ import javax.servlet.jsp.tagext.BodyTagSupport;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.io.IOException;
 
@@ -114,7 +115,7 @@ public class TabsTag extends BodyTagSupport {
      * @throws JspException if an exception occurs while rendering the tabs.
      */
     public int doEndTag() throws JspException {
-        ServletRequest request = pageContext.getRequest();
+        HttpServletRequest request = (HttpServletRequest)pageContext.getRequest();
         String beanName = getBean();
         // Get the page data bean from the request:
         AdminPageBean pageInfo = (AdminPageBean)request.getAttribute(beanName);
@@ -143,7 +144,8 @@ public class TabsTag extends BodyTagSupport {
                 if (value != null) {
                     // The URL for the tab should be the URL of the first item in the tab.
                     value = StringUtils.replace(value, "[id]", clean(tab.attributeValue("id")));
-                    value = StringUtils.replace(value, "[url]", clean(tab.attributeValue("url")));
+                    value = StringUtils.replace(value, "[url]",
+                            request.getContextPath() + "/" + clean(tab.attributeValue("url")));
                     value = StringUtils.replace(value, "[name]", clean(tab.attributeValue("name")));
                     value = StringUtils.replace(value, "[description]", clean(tab.attributeValue("description")));
                 }

src/java/org/jivesoftware/messenger/container/PluginManager.java

@@ -129,7 +129,7 @@ public class PluginManager {
                     List urls = adminElement.selectNodes("//@url");
                     for (int i=0; i<urls.size(); i++) {
                         Attribute attr = (Attribute)urls.get(i);
-                        attr.setValue("/plugins/" + pluginDir.getName() + "/" + attr.getValue());
+                        attr.setValue("plugins/" + pluginDir.getName() + "/" + attr.getValue());
                     }
                     AdminConsole.addModel(adminElement);
                 }

src/web/top.jsp

@@ -78,7 +78,7 @@
                         </div>
                     </td>
                     <td width="1%" id="jive-logout" nowrap>
-                        <a href="index.jsp?logout=true">Logout [<%= StringUtils.escapeHTMLTags(admin.getUser().getUsername()) %>]</a>
+                        <a href="<%= path %>/index.jsp?logout=true">Logout [<%= StringUtils.escapeHTMLTags(admin.getUser().getUsername()) %>]</a>
                         &nbsp;&nbsp;&nbsp;
                     </td>
                 </tr>