[MMBASE SCM] r42489 - in CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib: . portlet

[fpunt]

Author: fpunt
Date: 2010-06-09 14:54:35 +0200 (Wed, 09 Jun 2010)
New Revision: 42489

Modified:
   
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
   
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
Log:
[CMSC-1701]

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
    2010-06-09 10:10:19 UTC (rev 42488)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ContentUrlTag.java
    2010-06-09 12:54:35 UTC (rev 42489)
@@ -22,6 +22,8 @@
 import com.finalist.cmsc.mmbase.ResourcesUtil;
 import com.finalist.cmsc.util.HttpUtil;
 import com.finalist.cmsc.util.ServerUtil;
+import com.finalist.pluto.portalImpl.core.PortalEnvironment;
+import com.finalist.pluto.portalImpl.core.PortalURL;
 
 @SuppressWarnings("serial")
 public class ContentUrlTag extends NodeReferrerTag {
@@ -73,7 +75,11 @@
                url = makeAbsolute(url);
             }
             if(!ServerUtil.useServerName()) {
-               url += 
"?server="+URLEncoder.encode(pageContext.getRequest().getServerName());
+               PortalEnvironment env = 
PortalEnvironment.getPortalEnvironment((HttpServletRequest)pageContext.getRequest());
+               PortalURL currentURL = env.getRequestedPortalURL();
+               String path = currentURL.getGlobalNavigationAsString();
+               String server = (path.indexOf("/") != -1)?(path.substring(0, 
path.indexOf("/"))):path;
+               url += "?server="+server;
             }
          }
       }

Modified: 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
===================================================================
--- 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
      2010-06-09 10:10:19 UTC (rev 42488)
+++ 
CMSContainer/trunk/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java
      2010-06-09 12:54:35 UTC (rev 42489)
@@ -20,6 +20,8 @@
 import com.finalist.cmsc.services.sitemanagement.SiteManagement;
 import com.finalist.cmsc.util.HttpUtil;
 import com.finalist.cmsc.util.ServerUtil;
+import com.finalist.pluto.portalImpl.core.PortalEnvironment;
+import com.finalist.pluto.portalImpl.core.PortalURL;
 
 /**
  * Supporting class for the <CODE>actionURL</CODE> and <CODE>renderURL</CODE>
@@ -133,7 +135,11 @@
          urlString = HttpUtil.makeAbsolute((HttpServletRequest) 
pageContext.getRequest(), urlString);
       }
       if(!ServerUtil.useServerName() && urlString.contains("/content/")) {
-         urlString += 
"?server="+URLEncoder.encode(pageContext.getRequest().getServerName());
+         PortalEnvironment env = 
PortalEnvironment.getPortalEnvironment((HttpServletRequest)pageContext.getRequest());
+         PortalURL currentURL = env.getRequestedPortalURL();
+         String path = currentURL.getGlobalNavigationAsString();
+         String server = (path.indexOf("/") != -1)?(path.substring(0, 
path.indexOf("/"))):path;
+         urlString += "?server="+server;
       }
       
       if (var == null) {

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs