portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From woon...@apache.org
Subject svn commit: r700371 - in /portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html: columns/layout.jsp maximized/layout.jsp solo/layout.jsp
Date Tue, 30 Sep 2008 07:30:43 GMT
Author: woonsan
Date: Tue Sep 30 00:30:43 2008
New Revision: 700371

URL: http://svn.apache.org/viewvc?rev=700371&view=rev
Log:
[JS2-905] JSP Portlet Decorators: Decorator-specific decorator.jsp ignored
Fixed to use each jsp template of decorations.

Modified:
    portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
    portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
    portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.jsp

Modified: portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.jsp?rev=700371&r1=700370&r2=700371&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/columns/layout.jsp
Tue Sep 30 00:30:43 2008
@@ -133,9 +133,7 @@
                           <%
                               // 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";
+                              String _portletJSP = "/" + _frag.getDecoration().getResource("decorator.jsp");
                               pageContext.setAttribute("fragTemplateUrl", _portletJSP, PageContext.PAGE_SCOPE);
                           %>
                           

Modified: portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp?rev=700371&r1=700370&r2=700371&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/maximized/layout.jsp
Tue Sep 30 00:30:43 2008
@@ -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: portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.jsp?rev=700371&r1=700370&r2=700371&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.jsp
(original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/applications/jetspeed/src/main/webapp/WEB-INF/templates/layout/html/solo/layout.jsp
Tue Sep 30 00:30:43 2008
@@ -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);
           %>
           



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message