taylor 2004/04/06 12:57:39
Modified: portal/src/java/org/apache/jetspeed/services/information
ResourceURLProviderImpl.java
DynamicInformationProviderImpl.java
PortletURLProviderImpl.java
portal/src/java/org/apache/jetspeed/request
RequestContext.java JetspeedRequestContext.java
portal/src/java/org/apache/jetspeed/portlets/pam
PortletApplicationDetail.java
Log:
Update deps on new PortalURL
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.4 +1 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/ResourceURLProviderImpl.java
Index: ResourceURLProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/ResourceURLProviderImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ResourceURLProviderImpl.java 31 Mar 2004 01:19:24 -0000 1.3
+++ ResourceURLProviderImpl.java 6 Apr 2004 19:57:38 -0000 1.4
@@ -44,7 +44,7 @@
{
this.portletWindow = portletWindow;
this.context = context;
- this.base = context.getNavigationalState().getBaseURL();
+ this.base = context.getPortalURL().getBaseURL();
}
// ResourceURLProvider implementation.
1.5 +7 -7
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java
Index: DynamicInformationProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynamicInformationProviderImpl.java 31 Mar 2004 01:19:24 -0000 1.4
+++ DynamicInformationProviderImpl.java 6 Apr 2004 19:57:38 -0000 1.5
@@ -33,6 +33,7 @@
import org.apache.pluto.util.NamespaceMapperAccess;
import org.apache.pluto.services.information.PortletURLProvider;
import org.apache.jetspeed.container.session.NavigationalState;
+import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.engine.core.PortletActionProviderImpl;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.request.RequestContextComponent;
@@ -78,8 +79,7 @@
public PortletURLProvider getPortletURLProvider(PortletWindow portletWindow)
{
- return new PortletURLProviderImpl(this,
- portletWindow);
+ return new PortletURLProviderImpl(this.context, portletWindow);
}
public String getRequestContentType()
@@ -182,7 +182,7 @@
public String getBasePortalURL()
{
- return context.getNavigationalState().getBaseURL();
+ return context.getPortalURL().getBaseURL();
}
public Map getAllParameters(PortletWindow portletWindow)
@@ -203,14 +203,14 @@
}
}
- NavigationalState navState = context.getNavigationalState();
+ PortalURL url = context.getPortalURL();
- Iterator iterator = navState.getRenderParamNames(portletWindow);
+ Iterator iterator = url.getRenderParamNames(portletWindow);
while (iterator.hasNext())
{
String name = (String)iterator.next();
- String[] values = navState.getRenderParamValues(portletWindow, name);
+ String[] values = url.getRenderParamValues(portletWindow, name);
portletParameters.put(name, values );
1.7 +20 -17
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java
Index: PortletURLProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/PortletURLProviderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PortletURLProviderImpl.java 1 Apr 2004 17:18:46 -0000 1.6
+++ PortletURLProviderImpl.java 6 Apr 2004 19:57:38 -0000 1.7
@@ -24,8 +24,8 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.container.session.NavigationalState;
import org.apache.jetspeed.container.session.NavigationalStateComponent;
+import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.request.RequestContext;
-import org.apache.jetspeed.request.RequestContextComponent;
import org.apache.pluto.om.window.PortletWindow;
import org.apache.pluto.services.information.PortletURLProvider;
@@ -38,7 +38,6 @@
*/
public class PortletURLProviderImpl implements PortletURLProvider
{
- private DynamicInformationProviderImpl provider = null;
private PortletWindow portletWindow = null;
private PortletMode mode = null;
private WindowState state = null;
@@ -48,21 +47,25 @@
private Map parameters = null;
private RequestContext context;
- private NavigationalState nav;
+ private PortalURL url;
- public PortletURLProviderImpl(DynamicInformationProviderImpl provider,
PortletWindow portletWindow)
+ public PortletURLProviderImpl(RequestContext context, PortletWindow
portletWindow)
{
- this.provider = provider;
this.portletWindow = portletWindow;
// TODO: assemble this with factory
- RequestContextComponent rcc =
(RequestContextComponent)Jetspeed.getComponentManager().getComponent(RequestContextComponent.class);
NavigationalStateComponent nsc =
(NavigationalStateComponent)Jetspeed.getComponentManager().getComponent(NavigationalStateComponent.class);
- context = rcc.getRequestContext(provider.request);
- nav = nsc.create(context);
+ context = this.context = context;
+ url = nsc.createURL(context);
}
+ public PortletURLProviderImpl(RequestContext context, NavigationalState nav,
PortletWindow portletWindow)
+ {
+ this.context = context;
+ this.portletWindow = portletWindow;
+ }
+
public void setPortletMode(PortletMode mode)
{
this.mode = mode;
@@ -85,7 +88,7 @@
public void clearParameters()
{
- nav.clearRenderParameters(portletWindow);
+ url.clearRenderParameters(portletWindow);
}
public void setParameters(Map parameters)
@@ -97,12 +100,12 @@
{
if (mode != null)
{
- nav.setMode(portletWindow, mode);
+ url.setMode(portletWindow, mode);
}
if (state != null)
{
- nav.setState(portletWindow, state);
+ url.setState(portletWindow, state);
}
// STW: Spec reference PLT:12:2
@@ -115,7 +118,7 @@
if (action)
{
- nav.setAction(portletWindow);
+ url.setAction(portletWindow);
}
if (parameters != null)
@@ -129,18 +132,18 @@
: (String[]) value;
if (action)
{
- //nav.setRequestParam(
+ //url.setRequestParam(
//
NamespaceMapperAccess.getNamespaceMapper().encode(portletWindow.getId(), name),
// values);
- nav.setRequestParam(name, values);
+ url.setRequestParam(name, values);
}
else
{
- nav.setRenderParam(portletWindow, name, values);
+ url.setRenderParam(portletWindow, name, values);
}
}
}
- return nav.toString(secure);
+ return url.toString(secure);
}
}
1.11 +9 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java
Index: RequestContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/RequestContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RequestContext.java 31 Mar 2004 01:19:24 -0000 1.10
+++ RequestContext.java 6 Apr 2004 19:57:38 -0000 1.11
@@ -26,6 +26,7 @@
import org.apache.jetspeed.aggregator.ContentDispatcher;
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.container.session.NavigationalState;
+import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.profiler.ProfileLocator;
import org.apache.jetspeed.om.page.Page;
import org.apache.pluto.om.window.PortletWindow;
@@ -152,6 +153,13 @@
* @return The navigational state context object for the current request.
*/
public NavigationalState getNavigationalState();
+
+ /**
+ * Gets the Portal URL for the current request.
+ *
+ * @return The Portal URL object for the current request.
+ */
+ public PortalURL getPortalURL();
/**
* Get the target Action Window
1.13 +12 -3
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JetspeedRequestContext.java 31 Mar 2004 01:19:24 -0000 1.12
+++ JetspeedRequestContext.java 6 Apr 2004 19:57:38 -0000 1.13
@@ -31,6 +31,7 @@
import org.apache.jetspeed.capability.CapabilityMap;
import org.apache.jetspeed.container.session.NavigationalState;
import org.apache.jetspeed.container.session.NavigationalStateComponent;
+import org.apache.jetspeed.container.url.PortalURL;
import org.apache.jetspeed.engine.servlet.ServletRequestFactory;
import org.apache.jetspeed.engine.servlet.ServletResponseFactory;
import org.apache.pluto.om.window.PortletWindow;
@@ -61,6 +62,7 @@
private String mimeType;
private String mediaType;
private NavigationalState navstate;
+ private PortalURL url;
private PortletWindow actionWindow;
private String encoding;
@@ -92,7 +94,8 @@
if (navcomponent != null)
{
- navstate = navcomponent.create(this);
+ url = navcomponent.createURL(this);
+ navstate = navcomponent.create(this);
}
}
@@ -392,7 +395,7 @@
while (tokenizer.hasMoreTokens())
{
String token = tokenizer.nextToken();
- if (this.navstate.isNavigationalParameter(token))
+ if (this.url.isNavigationalParameter(token))
{
break;
}
@@ -410,4 +413,10 @@
}
return result;
}
+
+ public PortalURL getPortalURL()
+ {
+ return url;
+ }
+
}
1.2 +16 -71
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java
Index: PortletApplicationDetail.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/portlets/pam/PortletApplicationDetail.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletApplicationDetail.java 3 Apr 2004 01:10:15 -0000 1.1
+++ PortletApplicationDetail.java 6 Apr 2004 19:57:39 -0000 1.2
@@ -1,74 +1,19 @@
-/*
- * Copyright 2000-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.portlets.pam;
-
-import java.io.IOException;
-//import java.io.InputStream;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletMode;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletURL;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.jetspeed.portlet.ServletPortlet;
-
-//import org.apache.jetspeed.cps.util.Streams;
-
-/**
- * This portlet is a browser over all the portlet applications in the system.
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
- * @author <a href="mailto:[EMAIL PROTECTED]">Chris Cardona</a>
- * @version $Id$
- */
-public class PortletApplicationDetail extends ServletPortlet
-{
-
- public void doView(RenderRequest request, RenderResponse response)
- throws PortletException, IOException
- {
- PortletContext context = getPortletContext();
- response.setContentType("text/html");
-
- PortletURL url = response.createRenderURL();
- PortletURL actionUrl = response.createActionURL();
- url.setWindowState(WindowState.MAXIMIZED);
- actionUrl.setPortletMode(PortletMode.EDIT);
-
+/*
* Copyright 2000-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.jetspeed.portlets.pam;
+
+import java.io.IOException;
//import java.io.InputStream;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
import javax.portlet.PortletContext;
import javax.portlet.PortletException;
import javax.portlet.PortletMode;
import javax.portlet.PortletURL;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.WindowState;
+import org.apache.jetspeed.portlet.ServletPortlet;
+/**
* This portlet is a browser over all the portlet applications in the system.
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Chris Cardona</a>
* @version $Id$
*/
public class PortletApplicationDetail extends ServletPortlet
{
public void doView(RenderRequest request, RenderResponse response)
+ throws PortletException, IOException
+ {
+ PortletContext context = getPortletContext();
+ response.setContentType("text/html");
+ PortletURL url = response.createRenderURL();
+ PortletURL actionUrl = response.createActionURL();
+ url.setWindowState(WindowState.MAXIMIZED);
+ actionUrl.setPortletMode(PortletMode.EDIT);
// url.addParameter("test", "value");
- response.getWriter().println("<br/><b>Init Param 'Template' = " +
this.getInitParameter("template") + "</b>");
- response.getWriter().println("<br/><b>Render URL = <a href='" + url + "'>"
+ url + "</a></b>");
- response.getWriter().println("<br/><b>Action URL = <a href='" + actionUrl +
"'>" + actionUrl + "</a></b>");
- response.getWriter().println("<br/><b>Request dispatching now</b>");
-
- super.doView(request, response);
+ response.getWriter().println("<br/><b>Init Param 'Template' = " +
this.getInitParameter("template") + "</b>");
response.getWriter().println("<br/><b>Render URL = <a href='" + url + "'>" +
url + "</a></b>");
response.getWriter().println("<br/><b>Action URL = <a href='" + actionUrl +
"'>" + actionUrl + "</a></b>");
response.getWriter().println("<br/><b>Request dispatching now</b>");
+ super.doView(request, response);
}
-
-
- public void processAction(ActionRequest actionRequest, ActionResponse
actionResponse) throws PortletException, IOException
- {
- System.out.println("PorletApplicationDetail: processAction()");
- }
+ public void processAction(ActionRequest actionRequest, ActionResponse
actionResponse) throws PortletException, IOException
{
System.out.println("PorletApplicationDetail: processAction()");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
