Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
In directory
james.mmbase.org:/tmp/cvs-serv26901/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
Modified Files:
Tag: b1_4
BasicURLTag.java ActionURLTag.java RenderURLTag.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/taglib/src/java/com/finalist/cmsc/taglib/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-1193
Index: BasicURLTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- BasicURLTag.java 28 Jan 2008 21:15:45 -0000 1.9
+++ BasicURLTag.java 17 Dec 2008 13:33:35 -0000 1.9.2.1
@@ -170,6 +170,14 @@
return link;
}
+ public String getHost() {
+ String host = null;
+ if (ServerUtil.useServerName()) {
+ NavigationItem item = SiteManagement.convertToNavigationItem(page);
+ host = SiteManagement.getSite(item);
+ }
+ return host;
+ }
/**
* Returns the portletMode.
Index: ActionURLTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/ActionURLTag.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- ActionURLTag.java 26 Nov 2007 11:43:41 -0000 1.4
+++ ActionURLTag.java 17 Dec 2008 13:33:35 -0000 1.4.2.1
@@ -18,7 +18,8 @@
PortletURL renderUrl = null;
if (page != null && window != null) {
String link = getLink();
- renderUrl = new PortletURLImpl(link, window, (HttpServletRequest)
pageContext.getRequest(),
+ String host = getHost();
+ renderUrl = new PortletURLImpl(host, link, window,
(HttpServletRequest) pageContext.getRequest(),
(HttpServletResponse) pageContext.getResponse(), true);
}
else {
Index: RenderURLTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/RenderURLTag.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- RenderURLTag.java 26 Nov 2007 11:43:41 -0000 1.4
+++ RenderURLTag.java 17 Dec 2008 13:33:35 -0000 1.4.2.1
@@ -20,7 +20,8 @@
PortletURL renderUrl = null;
if (!StringUtil.isEmpty(page) && !StringUtil.isEmpty(window)) {
String link = getLink();
- renderUrl = new PortletURLImpl(link, window, (HttpServletRequest)
pageContext.getRequest(),
+ String host = getHost();
+ renderUrl = new PortletURLImpl(host, link, window,
(HttpServletRequest) pageContext.getRequest(),
(HttpServletResponse) pageContext.getResponse(), false);
}
else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
