svnno****@sourc*****
svnno****@sourc*****
2008年 11月 5日 (水) 15:37:34 JST
Revision: 1287
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1287
Author: sone
Date: 2008-11-05 15:37:33 +0900 (Wed, 05 Nov 2008)
Log Message:
-----------
patch 'r699305: JSP Portlet Decorators: Decorator-specific decorator.jsp ignored'
Modified Paths:
--------------
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp
-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp 2008-11-05 06:09:24 UTC (rev 1286)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/columns/layout.jsp 2008-11-05 06:37:33 UTC (rev 1287)
@@ -132,10 +132,8 @@
<%
// TODO hack alert, we need to do this because PortletDecorationImpl has
- // decorator.vm hard coded sigh!
- String _tempPath = _frag.getDecoration().getBasePath();
- String _portletJSP = _tempPath.substring(0,_tempPath.lastIndexOf('/')) +
- "/decorator.jsp";
+ // decorator.vm hard coded sigh!
+ String _portletJSP = "/" + _frag.getDecoration().getResource("decorator.jsp");
pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
%>
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp 2008-11-05 06:09:24 UTC (rev 1286)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp 2008-11-05 06:37:33 UTC (rev 1287)
@@ -69,9 +69,7 @@
_jpt.setCurrentFragment(maxFragment);
// TODO hack alert, we need to do this because PortletDecorationImpl has
// decorator.vm hard coded sigh!
- String _tempPath = maxFragment.getDecoration().getBasePath();
- String _portletJSP = _tempPath.substring(0,_tempPath.lastIndexOf('/')) +
- "/decorator.jsp";
+ String _portletJSP = "/" + maxFragment.getDecoration().getResource("decorator.jsp");
pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
%>
<c:import url="${fragTemplateUrl}"></c:import>
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp 2008-11-05 06:09:24 UTC (rev 1286)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/templates/layout/html/solo/layout.jsp 2008-11-05 06:37:33 UTC (rev 1287)
@@ -82,9 +82,7 @@
<%
// TODO hack alert, we need to do this because PortletDecorationImpl has
// decorator.vm hard coded sigh!
- String _tempPath = maxFragment.getDecoration().getBasePath();
- String _portletJSP = _tempPath.substring(0,_tempPath.lastIndexOf('/')) +
- "/decorator.jsp";
+ String _portletJSP = "/" + maxFragment.getDecoration().getResource("decorator.jsp");
pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
%>