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

[jkoster]

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

Modified Files:
      Tag: b1_4
        RssFeedNavigationRenderer.java 
Log Message:
CMSC-762 - Don't use the getWebappUri function, because it is not used 
correctly here.


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
retrieving revision 1.5.2.1
diff -u -b -r1.5 -r1.5.2.1
--- RssFeedNavigationRenderer.java      28 Jan 2008 21:16:17 -0000      1.5
+++ RssFeedNavigationRenderer.java      6 Feb 2008 17:31:07 -0000       1.5.2.1
@@ -157,7 +157,16 @@
    }
 
    private String getServerDocRoot(HttpServletRequest request) {
-       return HttpUtil.getWebappUri(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();
    }
 
    private String getContentUrl(Node node) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs