Author: chris.laprun(a)jboss.com Date: 2010-09-06 17:13:10 -0400 (Mon, 06 Sep 2010) New Revision: 4058 Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducer.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v2/WSRP2Producer.java Log: - Moved ExportManager accessors to WSRPProducer as the integration in GateIn doesn't distinguish between both versions and the WSRP 1 producer actually delegates to the WSRP 2 version so it needs to be properly configured. Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducer.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducer.java 2010-09-06 21:10:09 UTC (rev 4057) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/WSRPProducer.java 2010-09-06 21:13:10 UTC (rev 4058) @@ -23,6 +23,7 @@ package org.gatein.wsrp.producer; +import org.gatein.exports.ExportManager; import org.gatein.pc.api.PortletInvoker; import org.gatein.registration.RegistrationManager; import org.gatein.wsrp.producer.config.ProducerConfigurationChangeListener; @@ -83,4 +84,18 @@ /** Removes this WSRPProducer from active use. */ void stop(); + + /** + * Retrieves the ExportManager used by this WSRPProducer. + * + * @return The ExportManager used by this WSRPProducer to manage exports + */ + ExportManager getExportManager(); + + /** + * Sets the ExportManager used by this WSRPProducer + * + * @param exportManager the ExportManager to be used by this WSRPProducer + */ + void setExportManager(ExportManager exportManager); } Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java 2010-09-06 21:10:09 UTC (rev 4057) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v1/WSRP1Producer.java 2010-09-06 21:13:10 UTC (rev 4058) @@ -23,6 +23,7 @@ package org.gatein.wsrp.producer.v1; +import org.gatein.exports.ExportManager; import org.gatein.pc.api.PortletInvoker; import org.gatein.registration.RegistrationManager; import org.gatein.wsrp.producer.ProducerHolder; @@ -169,6 +170,16 @@ producer.usingStrictModeChangedTo(strictMode); } + public ExportManager getExportManager() + { + return producer.getExportManager(); + } + + public void setExportManager(ExportManager exportManager) + { + producer.setExportManager(exportManager); + } + public V1ServiceDescription getServiceDescription(V1GetServiceDescription gs) throws V1InvalidRegistration, V1OperationFailed { try Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v2/WSRP2Producer.java =================================================================== --- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v2/WSRP2Producer.java 2010-09-06 21:10:09 UTC (rev 4057) +++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/v2/WSRP2Producer.java 2010-09-06 21:13:10 UTC (rev 4058) @@ -23,7 +23,6 @@ package org.gatein.wsrp.producer.v2; -import org.gatein.exports.ExportManager; import org.gatein.wsrp.producer.MarkupInterface; import org.gatein.wsrp.producer.PortletManagementInterface; import org.gatein.wsrp.producer.RegistrationInterface; @@ -37,17 +36,4 @@ public interface WSRP2Producer extends WSRPProducer, MarkupInterface, PortletManagementInterface, RegistrationInterface, ServiceDescriptionInterface { - /** - * Retrieves the ExportManager used by this WSRPProducer. - * - * @return The ExportManager used by this WSRPProducer to manage exports - */ - ExportManager getExportManager(); - - /** - * Sets the ExportManager used by this WSRPProducer - * - * @param exportManager the ExportManager to be used by this WSRPProducer - */ - void setExportManager(ExportManager exportManager); }