Author: chris.laprun(a)jboss.com Date: 2008-10-02 09:46:31 -0400 (Thu, 02 Oct 2008) New Revision: 12020 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java Log: - JBPORTAL-2183: do not keep a local copy of the configuration in producer but retrieve it from configuration service to avoid de-synchronization of state. - Changed property name generation algorithm to avoid collisions. Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-10-02 12:24:08 UTC (rev 12019) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-10-02 13:46:31 UTC (rev 12020) @@ -53,7 +53,6 @@ private String policyClassName; private String validatorClassName; private static final String PROPERTY = "property"; - private static int counter = 0; private static final String PRODUCER = "producer"; private String selectedProp; @@ -206,7 +205,7 @@ public String addRegistrationProperty() { - getRegRequirements().addEmptyRegistrationProperty(PROPERTY + counter++); + getRegRequirements().addEmptyRegistrationProperty(PROPERTY + System.currentTimeMillis()); return PRODUCER; } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2008-10-02 12:24:08 UTC (rev 12019) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java 2008-10-02 13:46:31 UTC (rev 12020) @@ -277,11 +277,6 @@ throw new UnsupportedOperationException("getProducerConfiguration not implemented"); } - public void setProducerConfiguration(ProducerConfiguration producerConfiguration) - { - throw new UnsupportedOperationException("setProducerConfiguration not implemented"); - } - public void usingStrictModeChangedTo(boolean strictMode) { WSRPValidator.setStrict(strictMode); Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2008-10-02 12:24:08 UTC (rev 12019) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/WSRPProducer.java 2008-10-02 13:46:31 UTC (rev 12020) @@ -39,8 +39,8 @@ * @since 2.4 */ public interface WSRPProducer - extends WSRP_v1_ServiceDescription_PortType, WSRP_v1_Markup_PortType, WSRP_v1_Registration_PortType, - WSRP_v1_PortletManagement_PortType, ProducerConfigurationChangeListener + extends WSRP_v1_ServiceDescription_PortType, WSRP_v1_Markup_PortType, WSRP_v1_Registration_PortType, + WSRP_v1_PortletManagement_PortType, ProducerConfigurationChangeListener { /** The default session expiration time in mili seconds. */ int DEFAULT_SESSION_EXPIRATION_TIME = 300000; @@ -109,10 +109,4 @@ * @since 2.6 */ ProducerConfiguration getProducerConfiguration(); - - /** - * @param producerConfiguration - * @since 2.6 - */ - void setProducerConfiguration(ProducerConfiguration producerConfiguration); } Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-10-02 12:24:08 UTC (rev 12019) +++ branches/JBoss_Portal_Branch_2_7/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2008-10-02 13:46:31 UTC (rev 12020) @@ -112,9 +112,6 @@ /** Handles Portlet Management interface calls. */ private PortletManagementHandler portletManagementHandler; - /** Registration configuration service */ - private ProducerConfiguration producerConfiguration; - /** Registration Manager */ private RegistrationManager registrationManager; @@ -125,6 +122,7 @@ /** Supported locales. */ private String[] supportedLocales = WSRPConstants.getDefaultLocales(); + /** configuration service */ private ProducerConfigurationService configurationService; public WSRPProducerImpl() @@ -137,7 +135,7 @@ public ProducerRegistrationRequirements getProducerRegistrationRequirements() { - return producerConfiguration.getRegistrationRequirements(); + return getProducerConfiguration().getRegistrationRequirements(); } // ServiceDescription implementation ******************************************************************************** @@ -242,14 +240,9 @@ public ProducerConfiguration getProducerConfiguration() { - return producerConfiguration; + return configurationService.getConfiguration(); } - public void setProducerConfiguration(ProducerConfiguration producerConfiguration) - { - this.producerConfiguration = producerConfiguration; - } - public RegistrationManager getRegistrationManager() { return registrationManager; @@ -274,11 +267,11 @@ { super.startService(); - producerConfiguration = configurationService.getConfiguration(); + ProducerConfiguration configuration = configurationService.getConfiguration(); // register to listen to changes in configuration and get initial state - producerConfiguration.addChangeListener(this); - usingStrictModeChangedTo(producerConfiguration.isUsingStrictMode()); + configuration.addChangeListener(this); + usingStrictModeChangedTo(configuration.isUsingStrictMode()); ProducerRegistrationRequirements registrationRequirements = getProducerRegistrationRequirements(); registrationRequirements.addRegistrationPolicyChangeListener(registrationManager); @@ -296,7 +289,7 @@ registrationRequirements.removeRegistrationPropertyChangeListener(registrationManager); registrationRequirements.removeRegistrationPolicyChangeListener(registrationManager); - producerConfiguration.removeChangeListener(this); + getProducerConfiguration().removeChangeListener(this); super.stopService(); } @@ -465,7 +458,7 @@ { Registration registration = getRegistrationFrom(registrationContext); isRegistrationValid(registration, true); - + return registration; }