You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrp4j-dev@portals.apache.org by cz...@apache.org on 2005/08/10 12:22:08 UTC
cvs commit: ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver DynamicInformationProviderImpl.java WSRPRenderResponseImpl.java
cziegeler 2005/08/10 03:22:08
Modified: src/org/apache/wsrp4j/producer/provider/pluto/driver
DynamicInformationProviderImpl.java
WSRPRenderResponseImpl.java
Log:
Update to latest pluto
Revision Changes Path
1.9 +17 -12 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java
Index: DynamicInformationProviderImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/DynamicInformationProviderImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DynamicInformationProviderImpl.java 26 Jul 2005 14:21:48 -0000 1.8
+++ DynamicInformationProviderImpl.java 10 Aug 2005 10:22:08 -0000 1.9
@@ -44,25 +44,25 @@
import org.apache.wsrp4j.util.WindowStates;
/**
- Provides access to information required for portlet rendering
-*/
-public class DynamicInformationProviderImpl implements WSRPDynamicInformationProvider
-{
+ *Provides access to information required for portlet rendering
+ */
+public class DynamicInformationProviderImpl
+ implements WSRPDynamicInformationProvider {
//references the servlet request
- private HttpServletRequest servletRequest = null;
+ private HttpServletRequest servletRequest;
//references the provider
- private Provider provider = null;
+ private Provider provider;
//references the registration context
- private RegistrationContext regContext = null;
+ private RegistrationContext regContext;
// reference to the runtime context of the request
- private RuntimeContext runtimeContext = null;
+ private RuntimeContext runtimeContext;
// reference to the user context of the request
- private UserContext userContext = null;
+ private UserContext userContext;
// default mode
private PortletMode mode = new PortletMode(PortletMode.VIEW.toString());
@@ -77,10 +77,10 @@
private boolean isSecure = false;
//portlet context
- private PortletContext portletContext = null;
+ private PortletContext portletContext;
//mime types
- private String[] mimeTypes = null;
+ private String[] mimeTypes;
/**
Constructor
@@ -310,7 +310,12 @@
* @return String the base portal URL
*/
public String getBasePortalURL() {
- return PortalURL.getBaseURLexcludeContext();
+ String fullPath = new PortalURL(this.servletRequest).getBasePortalURL(this.servletRequest);
+ int pos = fullPath.indexOf('/');
+ if ( pos != -1 ) {
+ fullPath = fullPath.substring(0, pos);
+ }
+ return fullPath;
}
/** Return the supported Window States
1.5 +7 -3 ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java
Index: WSRPRenderResponseImpl.java
===================================================================
RCS file: /home/cvs/ws-wsrp4j/src/org/apache/wsrp4j/producer/provider/pluto/driver/WSRPRenderResponseImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSRPRenderResponseImpl.java 26 Jul 2005 14:21:48 -0000 1.4
+++ WSRPRenderResponseImpl.java 10 Aug 2005 10:22:08 -0000 1.5
@@ -34,9 +34,9 @@
public class WSRPRenderResponseImpl extends org.apache.pluto.core.impl.RenderResponseImpl
{
//wspr4j specific provider
- private static Provider provider = null;
+ private static Provider provider;
//portlet entity
- private PortletEntity portletEntity = null;
+ private PortletEntity portletEntity;
/**
Constructor
@@ -85,7 +85,11 @@
}
} else
{
- String base = PortalURL.getBaseURLexcludeContext();
+ String base = new PortalURL(this.getHttpServletRequest()).getBasePortalURL(this.getHttpServletRequest());
+ int pos = base.indexOf('/');
+ if ( pos != -1 ) {
+ base = base.substring(0, pos);
+ }
if (desc.getDoesUrlTemplateProcessing().booleanValue())
{