=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulatorListener.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulatorListener.java	2011-12-03 18:00:10 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebLinkPopulatorListener.java	2011-12-03 19:03:12 +0000
@@ -41,6 +41,7 @@
 import org.hisp.dhis.organisationunit.*;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.Users;
+import org.springframework.web.util.UrlPathHelper;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.bind.Marshaller;
@@ -626,6 +627,7 @@
                 buffer.append( ":" + request.getServerPort() );
             }
 
+            buffer.append( request.getContextPath() );
             buffer.append( request.getServletPath() );
 
             rootPath = buffer.toString();