Author: chris.laprun(a)jboss.com Date: 2009-08-17 16:06:05 -0400 (Mon, 17 Aug 2009) New Revision: 13773 Modified: jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java Log: - Re-enabled registration of producer invoker. - Register federating portlet invoker instead of invoker directly on the consumer side. Modified: jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java =================================================================== --- jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-17 20:04:27 UTC (rev 13772) +++ jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-08-17 20:06:05 UTC (rev 13773) @@ -57,7 +57,6 @@ { protected PortletApplicationDeployer portletApplicationRegistry; - private static final String LOCAL_PORTLET_INVOKER_ID = "local"; public void init() { @@ -118,8 +117,7 @@ producerPortletInvoker.setStateConverter(producerStateConverter); // register producer portlet invoker so that WSRP can use it - // TODO: renable this. We cannot have two services registered that provide the portlet invoker interface - //container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker); + container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker); // The consumer portlet invoker PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor(); @@ -129,18 +127,17 @@ PortletInvokerInterceptor consumerPortletInvoker = new PortletInvokerInterceptor(); consumerPortletInvoker.setNext(consumerCacheInterceptor); - //container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); + container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); // Federating portlet invoker FederatingPortletInvoker federatingPortletInvoker = new FederatingPortletInvokerService(); // register local portlet invoker with federating portlet invoker - federatingPortletInvoker.registerInvoker(LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker);//containerPortletInvoker); + federatingPortletInvoker.registerInvoker(FederatingPortletInvoker.LOCAL_PORTLET_INVOKER_ID, consumerPortletInvoker); /* register with container */ - container.registerComponentInstance(PortletInvoker.class, consumerPortletInvoker); //federatingPortletInvoker); - - + container.registerComponentInstance(PortletInvoker.class, federatingPortletInvoker); + portletApplicationRegistry.start(); }