Author: rwatler
Date: Tue Mar 30 08:14:37 2010
New Revision: 929032
URL: http://svn.apache.org/viewvc?rev=929032&view=rev
Log:
JS2-1138: page layout/portal site support support for *.tpsml, *.fpsml, and
*.dpsml documents
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java?rev=929032&r1=929031&r2=929032&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/spaces/BreadcrumbMenu.java
Tue Mar 30 08:14:37 2010
@@ -72,7 +72,7 @@ public class BreadcrumbMenu extends Gene
{
RequestContext rc = (RequestContext)
request.getAttribute(RequestContext.REQUEST_PORTALENV);
Stack<BreadcrumbMenuItem> stack = new Stack<BreadcrumbMenuItem>();
- Node node = rc.getPage().getPage().getParent();
+ Node node = rc.getPage().getPageOrTemplate().getParent();
while (node != null)
{
stack.push(new BreadcrumbMenuItem(node.getTitle(),
admin.getPortalURL(request, response, node.getPath())));
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java?rev=929032&r1=929031&r2=929032&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/JetspeedToolbox.java
Tue Mar 30 08:14:37 2010
@@ -161,7 +161,7 @@ public class JetspeedToolbox extends Gen
{
try
{
- ContentFragment layoutFragment =
pageLayoutComponent.getUnlockedRootFragment(requestContext.getPage());
+ ContentFragment layoutFragment =
requestContext.getPage().getNonTemplateRootFragment();
pageLayoutComponent.updateName(layoutFragment, layout);
actionRequest.getPortletSession().removeAttribute("layouts");
}
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java?rev=929032&r1=929031&r2=929032&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/toolbox/LayoutBean.java
Tue Mar 30 08:14:37 2010
@@ -117,7 +117,7 @@ public class LayoutBean implements Seria
RequestContext rc = (RequestContext)
request.getAttribute(RequestContext.REQUEST_PORTALENV);
ContentPage page = rc.getPage();
- ContentFragment layoutFragment =
page.getPageLayoutComponent().getUnlockedRootFragment(page);
+ ContentFragment layoutFragment = page.getNonTemplateRootFragment();
String currentLayoutName = layoutFragment.getName();
for (LayoutBean layout : layouts)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
