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 es...@apache.org on 2007/08/05 20:11:51 UTC
svn commit: r562926 - in
/portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto:
driver/ interfaces/
Author: esm
Date: Sun Aug 5 11:11:50 2007
New Revision: 562926
URL: http://svn.apache.org/viewvc?view=rev&rev=562926
Log:
Renamed WSRPDynamicInformationProvider to AttrKeys. Added a couple of debug log statements.
Added:
portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/AttrKeys.java
- copied, changed from r559324, portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java
Removed:
portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java
Modified:
portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortalCallbackServiceImpl.java
portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java
Modified: portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortalCallbackServiceImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortalCallbackServiceImpl.java?view=diff&rev=562926&r1=562925&r2=562926
==============================================================================
--- portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortalCallbackServiceImpl.java (original)
+++ portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortalCallbackServiceImpl.java Sun Aug 5 11:11:50 2007
@@ -19,7 +19,7 @@
import org.apache.pluto.spi.PortletURLProvider;
import org.apache.pluto.spi.ResourceURLProvider;
import org.apache.wsrp4j.commons.producer.provider.interfaces.URLComposer;
-import org.apache.wsrp4j.producer.provider.pluto.interfaces.WSRPDynamicInformationProvider;
+import org.apache.wsrp4j.producer.provider.pluto.interfaces.AttrKeys;
public class PortalCallbackServiceImpl implements PortalCallbackService
{
@@ -49,7 +49,7 @@
public PortletURLProvider getPortletURLProvider( HttpServletRequest request,
PortletWindow portletWindow )
{
- Object wsrpRequest = request.getAttribute( WSRPDynamicInformationProvider.REQUEST );
+ Object wsrpRequest = request.getAttribute( AttrKeys.REQUEST );
if ( wsrpRequest == null )
{
@@ -104,7 +104,7 @@
public ResourceURLProvider getResourceURLProvider( HttpServletRequest request,
PortletWindow portletWindow )
{
- Object wsrpRequest = request.getAttribute( WSRPDynamicInformationProvider.REQUEST );
+ Object wsrpRequest = request.getAttribute( AttrKeys.REQUEST );
if ( wsrpRequest == null )
{
Modified: portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java?view=diff&rev=562926&r1=562925&r2=562926
==============================================================================
--- portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java (original)
+++ portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java Sun Aug 5 11:11:50 2007
@@ -50,7 +50,7 @@
import org.apache.wsrp4j.commons.producer.util.ServletAccess;
import org.apache.wsrp4j.commons.util.Constants;
import org.apache.wsrp4j.commons.util.LocaleHelper;
-import org.apache.wsrp4j.producer.provider.pluto.interfaces.WSRPDynamicInformationProvider;
+import org.apache.wsrp4j.producer.provider.pluto.interfaces.AttrKeys;
/**
* <p>
@@ -163,8 +163,8 @@
servletResponse.setContentType( request.getMarkupParams().getMimeTypes()[0] );
// put getMarkup-request and Provider in servletRequest
- //servletRequest.setAttribute( WSRPDynamicInformationProvider.REQUEST, request );
- //servletRequest.setAttribute( WSRPDynamicInformationProvider.PROVIDER, this.provider );
+ //servletRequest.setAttribute( AttrKeys.REQUEST, request );
+ //servletRequest.setAttribute( AttrKeys.PROVIDER, this.provider );
String markup = "Error occured while invoking portlet service!";
String locale = null;
@@ -174,6 +174,7 @@
//provider.getPortletContainer().renderPortlet( win, servletRequest, servletResponse );
container.doRender( window, servletRequest, servletResponse );
markup = servletResponse.getOutputBufferAsString();
+ LOG.debug( "Servlet Response: " + markup );
locale = servletResponse.getLocale().toString();
}
catch ( Exception e )
@@ -194,7 +195,8 @@
markupContext.setMimeType( servletRequest.getContentType() );
markupResponse.setMarkupContext( markupContext );
}
-
+
+ LOG.debug( "Markup response: " + markupResponse.getMarkupContext().getMarkupString() );
return markupResponse;
}
@@ -284,7 +286,7 @@
// set the nav state
// get render params from servlet request and serialize the map
String navState = null;
- Map renderParams = (Map) servletRequest.getAttribute( WSRPDynamicInformationProvider.RENDER_PARAMS );
+ Map renderParams = (Map) servletRequest.getAttribute( AttrKeys.RENDER_PARAMS );
if ( renderParams != null )
{
try
Modified: portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java?view=diff&rev=562926&r1=562925&r2=562926
==============================================================================
--- portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java (original)
+++ portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletURLProviderImpl.java Sun Aug 5 11:11:50 2007
@@ -33,7 +33,7 @@
import org.apache.wsrp4j.commons.producer.provider.interfaces.URLComposer;
import org.apache.wsrp4j.commons.producer.util.Base64;
import org.apache.wsrp4j.commons.producer.util.MapSerializer;
-import org.apache.wsrp4j.producer.provider.pluto.interfaces.WSRPDynamicInformationProvider;
+import org.apache.wsrp4j.producer.provider.pluto.interfaces.AttrKeys;
@@ -117,7 +117,7 @@
this.urlComposer = urlComposer;
this.runtimeContext = runtimeContext;
this.portletContext = portletContext;
- this.userContext = userContext;
+ this.userContext = userContext;
}
/**
@@ -184,7 +184,7 @@
// in addition store as request attribute
// needed to allow our portlet invoker to set navigational state after
// action processing returned
- request.setAttribute( WSRPDynamicInformationProvider.RENDER_PARAMS, this.parameters );
+ request.setAttribute( AttrKeys.RENDER_PARAMS, this.parameters );
}
/**
@@ -192,7 +192,7 @@
* @return java.lang.String
*/
public String toString()
- {
+ {
if ( mode == null )
{
//WSRP4J-54 missing view is ok, retain current mode
Copied: portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/AttrKeys.java (from r559324, portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java)
URL: http://svn.apache.org/viewvc/portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/AttrKeys.java?view=diff&rev=562926&p1=portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java&r1=559324&p2=portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/AttrKeys.java&r2=562926
==============================================================================
--- portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/WSRPDynamicInformationProvider.java (original)
+++ portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/interfaces/AttrKeys.java Sun Aug 5 11:11:50 2007
@@ -24,7 +24,7 @@
*
* @version $Id$
*/
-public interface WSRPDynamicInformationProvider {
+public interface AttrKeys {
/**
* String constant representing an attribute name of a servlet request.