weaver 2005/04/29 07:02:19
Modified: portal/src/java/org/apache/jetspeed/request
JetspeedRequestContext.java
portal/src/java/org/apache/jetspeed/profiler/impl
ProfilerValveImpl.java
Log:
See JS2-252: http://issues.apache.org/jira/browse/JS2-252
Revision Changes Path
1.39 +4 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
Index: JetspeedRequestContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- JetspeedRequestContext.java 23 Mar 2005 22:52:20 -0000 1.38
+++ JetspeedRequestContext.java 29 Apr 2005 14:02:18 -0000 1.39
@@ -38,8 +38,8 @@
import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.impl.LanguageImpl;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Fragment;
-import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.userinfo.UserInfoManager;
import org.apache.jetspeed.velocity.JetspeedPowerTool;
import org.apache.pluto.om.common.Language;
@@ -63,7 +63,7 @@
private HttpServletResponse response;
private ServletConfig config;
private Map locators;
- private Page page;
+ private ContentPage page;
private PortletDefinition portletDefinition;
private Subject subject;
private Locale locale;
@@ -137,12 +137,12 @@
this.locators = locators;
}
- public Page getPage()
+ public ContentPage getPage()
{
return this.page;
}
- public void setPage( Page page )
+ public void setPage( ContentPage page )
{
this.page = page;
}
1.24 +3 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java
Index: ProfilerValveImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ProfilerValveImpl.java 12 Jan 2005 11:56:20 -0000 1.23
+++ ProfilerValveImpl.java 29 Apr 2005 14:02:19 -0000 1.24
@@ -26,6 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jetspeed.om.page.psml.ContentPageImpl;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.document.NodeNotFoundException;
import org.apache.jetspeed.pipeline.PipelineException;
@@ -122,7 +123,7 @@
}
// set request page and profile locator
- request.setPage(profiledPageContext.getPage());
+ request.setPage(new
ContentPageImpl(profiledPageContext.getPage()));
request.setProfileLocators(profiledPageContext.getLocators());
// return profiled page context in request attribute
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
