[MMBASE CVS] contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core PortalURL.java PortletURLProviderImpl.java

[jkoster]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core
In directory 
james.mmbase.org:/tmp/cvs-serv26901/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core

Modified Files:
      Tag: b1_4
        PortalURL.java PortletURLProviderImpl.java 
Log Message:
CMSC-1193 - Tag cmsc:renderURL does not take account of the host location of 
the page


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core
See also: http://www.mmbase.org/jira/browse/CMSC-1193


Index: PortalURL.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core/PortalURL.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- PortalURL.java      21 Apr 2008 10:11:29 -0000      1.13.2.1
+++ PortalURL.java      17 Dec 2008 13:33:35 -0000      1.13.2.2
@@ -95,17 +95,12 @@
 
 
    public PortalURL(String host, HttpServletRequest request, String 
globalNavigation) {
-      this(request, globalNavigation);
-      this.host = host;
-   }
-
-
-   public PortalURL(HttpServletRequest request, String globalNavigation) {
       this(request.getContextPath(), request.isSecure(), 
request.getServerPort(), globalNavigation);
+      this.host = host;
    }
 
 
-   public PortalURL(String basePortalURL, boolean secure, int port, String 
globalNavigation) {
+   private PortalURL(String basePortalURL, boolean secure, int port, String 
globalNavigation) {
       this.basePortalURL = basePortalURL;
       this.secure = secure;
       this.port = port;


Index: PortletURLProviderImpl.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/portal/src/java/com/finalist/pluto/portalImpl/core/PortletURLProviderImpl.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- PortletURLProviderImpl.java 26 Nov 2007 11:43:40 -0000      1.3
+++ PortletURLProviderImpl.java 17 Dec 2008 13:33:35 -0000      1.3.2.1
@@ -34,6 +34,7 @@
 
    protected String windowid;
    protected String page;
+   protected String host;
 
    private DynamicInformationProviderImpl provider;
 
@@ -101,7 +102,7 @@
    public String toString() {
       PortalURL url = null;
       if (page != null) {
-         url = new PortalURL(provider.request, page);
+         url = new PortalURL(host, provider.request, page);
       }
       else {
          url = 
PortalEnvironment.getPortalEnvironment(provider.request).getRequestedPortalURL();
@@ -176,4 +177,8 @@
       this.windowid = windowid;
    }
 
+   public void setHost(String host) {
+      this.host = host;
+   }
+
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs