[MMBASE CVS] contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed RssFeedNavigationRenderer.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed
In directory 
james.mmbase.org:/tmp/cvs-serv29667/rssfeed/src/java/com/finalist/cmsc/rssfeed

Modified Files:
      Tag: b1_4
        RssFeedNavigationRenderer.java 
Log Message:
CMSC-762 use HttpUtil.getServerDoc for contenturl.



See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed
See also: http://www.mmbase.org/jira/browse/CMSC-762


Index: RssFeedNavigationRenderer.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -b -r1.5.2.1 -r1.5.2.2
--- RssFeedNavigationRenderer.java      6 Feb 2008 17:31:07 -0000       1.5.2.1
+++ RssFeedNavigationRenderer.java      6 Feb 2008 20:08:39 -0000       1.5.2.2
@@ -157,16 +157,7 @@
    }
 
    private String getServerDocRoot(HttpServletRequest request) {
-         //Retrieve servername & port without WAR-file name
-      StringBuffer s = new StringBuffer();
-      
s.append(request.getScheme()).append("://").append(request.getServerName());
-
-      int serverPort = request.getServerPort();
-      if (serverPort != 80 && serverPort != 443) {
-         s.append(':').append(Integer.toString(serverPort));
-      }
-      s.append('/');
-      return s.toString();
+       return HttpUtil.getWebappUri(request);
    }
 
    private String getContentUrl(Node node) {
@@ -175,7 +166,7 @@
    }
 
    private String makeAbsolute(String url, HttpServletRequest request) {
-      String webapp = getServerDocRoot(request);
+      String webapp = HttpUtil.getServerDocRoot(request);
       if (url.startsWith("/")) {
          url = webapp + url.substring(1);
       }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs