Author: chris.laprun(a)jboss.com Date: 2009-07-31 18:41:38 -0400 (Fri, 31 Jul 2009) New Revision: 13648 Modified: jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java jbossexo/modules/portlet/trunk/portal/pom.xml jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml Log: - Register persistence manager and producer portlet invoker with kernel so that they can be used in WSRP. - Added portlet-federation dependency. 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-07-31 20:23:34 UTC (rev 13647) +++ jbossexo/modules/portlet/trunk/exo/src/main/java/org/jboss/portal/portlet/exo/ExoKernelIntegration.java 2009-07-31 22:41:38 UTC (rev 13648) @@ -43,6 +43,7 @@ import org.jboss.portal.portlet.impl.state.StateManagementPolicyService; import org.jboss.portal.portlet.impl.state.producer.PortletStatePersistenceManagerService; import org.jboss.portal.portlet.mc.PortletApplicationDeployer; +import org.jboss.portal.portlet.state.producer.PortletStatePersistenceManager; import org.jboss.portal.portlet.state.producer.ProducerPortletInvoker; import org.jboss.portal.web.ServletContainer; @@ -63,7 +64,9 @@ ExoContainer container = ExoContainerContext.getCurrentContainer(); // The producer persistence manager - PortletStatePersistenceManagerService producerPersistanceManager = new PortletStatePersistenceManagerService(); + PortletStatePersistenceManagerService producerPersistenceManager = new PortletStatePersistenceManagerService(); + // register the persistence manager so that it can be used by WSRP + container.registerComponentInstance(PortletStatePersistenceManager.class, producerPersistenceManager); // The producer state management policy StateManagementPolicyService producerStateManagementPolicy = new StateManagementPolicyService(); @@ -126,10 +129,12 @@ // The producer portlet invoker ProducerPortletInvoker producerPortletInvoker = new ProducerPortletInvoker(); producerPortletInvoker.setNext(containerPortletInvoker); - producerPortletInvoker.setPersistenceManager(producerPersistanceManager); + producerPortletInvoker.setPersistenceManager(producerPersistenceManager); producerPortletInvoker.setStateManagementPolicy(producerStateManagementPolicy); producerPortletInvoker.setStateConverter(producerStateConverter); + // register producer portlet invoker so that WSRP can use it + container.registerComponentInstance(ProducerPortletInvoker.class, producerPortletInvoker); // The consumer portlet invoker PortletCustomizationInterceptor portletCustomizationInterceptor = new PortletCustomizationInterceptor(); Modified: jbossexo/modules/portlet/trunk/portal/pom.xml =================================================================== --- jbossexo/modules/portlet/trunk/portal/pom.xml 2009-07-31 20:23:34 UTC (rev 13647) +++ jbossexo/modules/portlet/trunk/portal/pom.xml 2009-07-31 22:41:38 UTC (rev 13648) @@ -69,6 +69,11 @@ </dependency> <dependency> <groupId>org.jboss.portal.portlet</groupId> + <artifactId>portlet-federation</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.portlet</groupId> <artifactId>portlet-exo</artifactId> <version>${project.version}</version> </dependency> Modified: jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml =================================================================== --- jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-07-31 20:23:34 UTC (rev 13647) +++ jbossexo/modules/portlet/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-07-31 22:41:38 UTC (rev 13648) @@ -1,3 +1,26 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2009, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ This is free software; you can redistribute it and/or modify it + ~ under the terms of the GNU Lesser General Public License as + ~ published by the Free Software Foundation; either version 2.1 of + ~ the License, or (at your option) any later version. + ~ + ~ This software is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + ~ Lesser General Public License for more details. + ~ + ~ You should have received a copy of the GNU Lesser General Public + ~ License along with this software; if not, write to the Free + ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + <assembly> <id>jboss42</id> <formats> @@ -19,6 +42,7 @@ <include>org.jboss.portal.web:web-web</include> <include>org.jboss.portal.portlet:portlet-portlet</include> <include>org.jboss.portal.portlet:portlet-api</include> + <include>org.jboss.portal.portlet:portlet-federation</include> <include>javax.ccpp:ccpp</include> <include>javax.portlet:portlet-api</include>