Author: chris.laprun(a)jboss.com Date: 2008-10-02 15:43:18 -0400 (Thu, 02 Oct 2008) New Revision: 12026 Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java Log: - Hopefully fixed the mess I made with my hasty merge from 2.7. Let's see what Mr. Hudson will say! :) Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-02 19:16:30 UTC (rev 12025) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2008-10-02 19:43:18 UTC (rev 12026) @@ -81,7 +81,8 @@ boolean registrationValid = producer.isRegistrationValid(registration); ProducerRegistrationRequirements requirements = producer.getProducerRegistrationRequirements(); - PortletDescription[] offeredPortlets; + + PortletDescription[] offeredPortlets = null; ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(requirements.isRegistrationRequired()); serviceDescription.setRequiresInitCookie(BEA_8_CONSUMER_FIX); serviceDescription.setLocales(producer.getSupportedLocales()); Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-02 19:16:30 UTC (rev 12025) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfiguration.java 2008-10-02 19:43:18 UTC (rev 12026) @@ -23,8 +23,6 @@ package org.jboss.portal.wsrp.producer.config; -import java.util.List; - /** * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> * @version $Revision$ @@ -33,6 +31,4 @@ public interface ProducerConfiguration { ProducerRegistrationRequirements getRegistrationRequirements(); - - List<ProducerConfigurationChangeListener> getChangeListeners(); } Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-02 19:16:30 UTC (rev 12025) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationImpl.java 2008-10-02 19:43:18 UTC (rev 12026) @@ -45,11 +45,6 @@ return requirements; } - public List<ProducerConfigurationChangeListener> getChangeListeners() - { - return listeners; - } - public void setRegistrationRequirements(ProducerRegistrationRequirements requirements) { this.requirements = requirements; Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-02 19:16:30 UTC (rev 12025) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2008-10-02 19:43:18 UTC (rev 12026) @@ -30,7 +30,6 @@ import org.jboss.portal.registration.RegistrationPolicyChangeListener; import org.jboss.portal.registration.RegistrationPropertyChangeListener; import org.jboss.portal.wsrp.producer.config.ProducerConfiguration; -import org.jboss.portal.wsrp.producer.config.ProducerConfigurationChangeListener; import org.jboss.portal.wsrp.producer.config.ProducerConfigurationFactory; import org.jboss.portal.wsrp.producer.config.ProducerConfigurationProvider; import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService; @@ -56,7 +55,6 @@ import java.io.Writer; import java.net.URL; import java.util.Enumeration; -import java.util.List; import java.util.Set; /** @@ -142,13 +140,11 @@ ObjectModelFactory factory = new ProducerConfigurationFactory(); // save listeners if we already have a configuration - List<ProducerConfigurationChangeListener> listeners = null; Set<RegistrationPolicyChangeListener> policyListeners = null; Set<RegistrationPropertyChangeListener> propertyListeners = null; ProducerRegistrationRequirements registrationRequirements; if (configuration != null) { - listeners = configuration.getChangeListeners(); registrationRequirements = configuration.getRegistrationRequirements(); if (registrationRequirements != null) { @@ -161,13 +157,6 @@ configuration = (ProducerConfiguration)unmarshaller.unmarshal(configURL.openStream(), factory, null); // restore listeners - if (listeners != null) - { - for (ProducerConfigurationChangeListener listener : listeners) - { - configuration.addChangeListener(listener); - } - } registrationRequirements = configuration.getRegistrationRequirements(); if (registrationRequirements != null) {