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/01 06:42:57 UTC
svn commit: r561652 -
/portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
Author: esm
Date: Tue Jul 31 21:42:56 2007
New Revision: 561652
URL: http://svn.apache.org/viewvc?view=rev&rev=561652
Log:
* Fix portlet name and application id derivation
* Map wsrp modes/states to jsr168 modes/states
Modified:
portals/wsrp4j/branches/wsrp4j-pluto11/src/java/org/apache/wsrp4j/producer/provider/pluto/driver/PortletInvokerImpl.java
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=561652&r1=561651&r2=561652
==============================================================================
--- 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 Tue Jul 31 21:42:56 2007
@@ -72,6 +72,7 @@
private PortletPool pool = null;
private PortletRegistryService registrySvc = null;
+
PortletInvokerImpl( PortletContainer container, PortletPool pool, PortletRegistryService registrySvc )
{
if ( container == null )
@@ -155,6 +156,7 @@
}
catch ( java.io.UnsupportedEncodingException e )
{
+ LOG.warn( "Unable to set character encoding on servlet request: " + e.getMessage() );
}
servletResponse.setLocale( usedLocale );
@@ -173,12 +175,11 @@
container.doRender( window, servletRequest, servletResponse );
markup = servletResponse.getOutputBufferAsString();
locale = servletResponse.getLocale().toString();
-
}
- catch ( Throwable t )
+ catch ( Exception e )
{
locale = Constants.LOCALE_EN_US;
-
+ LOG.error( "Portlet rendering failed: [" + e.getMessage() + "]", e );
}
// build MarkupResponse
@@ -385,18 +386,19 @@
{
String parentHandle = ( (ConsumerConfiguredPortlet) portlet ).getParentHandle();
appId = parentHandle.substring( 0, parentHandle.lastIndexOf( "/" ) );
- portletName = parentHandle.substring( parentHandle.lastIndexOf( "/" ) );
+ portletName = parentHandle.substring( parentHandle.lastIndexOf( "/" ) + 1 );
}
else
{
appId = portletHandle.substring( 0, portletHandle.lastIndexOf( "/" ) );
- portletName = portletHandle.substring( portletHandle.lastIndexOf( "/" ) );
+ portletName = portletHandle.substring( portletHandle.lastIndexOf( "/" ) + 1 );
}
String instanceKey = runtimeContext.getPortletInstanceKey();
PortletWindow window = new org.apache.wsrp4j.producer.provider.pluto.driver.PortletWindowImpl( portletName,
- appId, params.getMode(), params.getWindowState(), instanceKey );
+ appId, ModesMap.forWsrpMode( params.getMode() ),
+ WindowStateMap.forWsrpWindowState( params.getWindowState() ), instanceKey );
return window;
}