Author: rwatler
Date: Mon Dec 21 21:52:55 2009
New Revision: 893003
URL: http://svn.apache.org/viewvc?rev=893003&view=rev
Log:
set PATH_ATTRIBUTE value for content pages only to accomodate FilePortlet
defaulting
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java?rev=893003&r1=893002&r2=893003&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/PortalSiteRequestContextImpl.java
Mon Dec 21 21:52:55 2009
@@ -28,6 +28,7 @@
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.FragmentDefinition;
import org.apache.jetspeed.om.page.FragmentReference;
+import org.apache.jetspeed.om.page.DynamicPage;
import org.apache.jetspeed.om.page.BaseConcretePageElement;
import org.apache.jetspeed.om.page.PageTemplate;
import org.apache.jetspeed.page.document.Node;
@@ -80,7 +81,7 @@
* requestPage - cached request profiled page proxy
*/
private BaseConcretePageElement requestPage;
-
+
/**
* requestPageTemplate - cached request page template proxy
*/
@@ -288,6 +289,19 @@
}
return null;
}
+
+ /**
+ * isContentPage - returns flag indicating request page is honoring
+ * a content request
+ *
+ * @return page template
+ * @throws NodeNotFoundException if page not found
+ * @throws SecurityException if page view access not granted
+ */
+ public boolean isContentPage() throws NodeNotFoundException
+ {
+ return (getPage() instanceof DynamicPage);
+ }
/**
* getPage - get request profiled page proxy
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java?rev=893003&r1=893002&r2=893003&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
Mon Dec 21 21:52:55 2009
@@ -29,7 +29,6 @@
import org.apache.jetspeed.layout.PageLayoutComponent;
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.BaseConcretePageElement;
-import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.PageTemplate;
import org.apache.jetspeed.page.document.NodeNotFoundException;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -165,24 +164,22 @@
{
try
{
- // save original request in the event it is modified below
- // and some down stream content portlet needs it set
- request.setAttribute(PortalReservedParameters.PATH_ATTRIBUTE,
request.getPath());
+ String requestPath = request.getPath();
if (log.isDebugEnabled())
{
- log.debug("Request path: "+request.getPath());
+ log.debug("Request path: "+requestPath);
}
// get profiler locators for request subject/principal using the
profiler
Subject subject = request.getSubject();
if (subject == null)
{
- throw new ProfilerException("Missing subject for request: " +
request.getPath());
+ throw new ProfilerException("Missing subject for request: " +
requestPath);
}
Principal principal = SubjectHelper.getBestPrincipal(subject,
User.class);
if (principal == null)
{
- throw new ProfilerException("Missing principal for request: "
+ request.getPath());
+ throw new ProfilerException("Missing principal for request: "
+ requestPath);
}
// get request specific profile locators if required
@@ -271,6 +268,12 @@
request.setPage(contentPage);
request.setProfileLocators(requestContext.getLocators());
+ // save original request for down stream content portlets
+ if (requestContext.isContentPage())
+ {
+
request.setAttribute(PortalReservedParameters.PATH_ATTRIBUTE, requestPath);
+ }
+
request.setAttribute(PortalReservedParameters.PAGE_EDIT_ACCESS_ATTRIBUTE,getPageActionAccess(request));
if (log.isDebugEnabled())
Modified:
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java?rev=893003&r1=893002&r2=893003&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
(original)
+++
portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/PortalSiteRequestContext.java
Mon Dec 21 21:52:55 2009
@@ -78,6 +78,16 @@
* @throws SecurityException if page view access not granted
*/
Map getManagedFragmentDefinitions() throws NodeNotFoundException;
+
+ /**
+ * isContentPage - returns flag indicating request page is honoring
+ * a content request
+ *
+ * @return page template
+ * @throws NodeNotFoundException if page not found
+ * @throws SecurityException if page view access not granted
+ */
+ boolean isContentPage() throws NodeNotFoundException;
/**
* getPage - get request profiled page proxy
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscr...@portals.apache.org
For additional commands, e-mail: jetspeed-dev-h...@portals.apache.org
