Author: chris.laprun(a)jboss.com Date: 2008-10-23 12:51:39 -0400 (Thu, 23 Oct 2008) New Revision: 12156 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties Log: - JBPORTAL-2209: duplicate old registration instead of duplicating the ref (!) - Improved robustness and user notification. Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:51:11 UTC (rev 12155) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-10-23 16:51:39 UTC (rev 12156) @@ -326,11 +326,18 @@ return getSortedProperties(getExpectedRegistrationInfo()); } - private LinkedList<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo) + private List<RegistrationProperty> getSortedProperties(RegistrationInfo registrationInfo) { - LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values()); - Collections.sort(list); - return list; + if (registrationInfo != null) + { + LinkedList<RegistrationProperty> list = new LinkedList<RegistrationProperty>(registrationInfo.getRegistrationProperties().values()); + Collections.sort(list); + return list; + } + else + { + return Collections.emptyList(); + } } // Actions @@ -437,7 +444,7 @@ { // if we want to change an existing registration property (for example, to upgrade service) then there are // no expected information, we're just using the modified local version - newReg = oldReg; + newReg = new RegistrationInfo(oldReg); if (!isRegistrationLocallyModified()) { Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2008-10-23 16:51:11 UTC (rev 12155) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2008-10-23 16:51:39 UTC (rev 12156) @@ -155,7 +155,9 @@ bean_consumermanager_refresh_success = Refresh was successful. bean_consumermanager_refresh_failure = Refresh failed (probably because the registration information was not valid). bean_consumermanager_refresh_exception = An unexpected error occurred. -bean_consumermanager_refresh_modify = Either local or remote information has been changed, you should modify your registration with the remote producer. +bean_consumermanager_refresh_modify = Either local or remote information has been changed, you should modify your registration with the remote producer.\n\ +The new local information will be saved but your current registration data will be used until you successfully \ +modify the registration with the producer. # ProducerBean bean_producer_regpolicy_unset = RegistrationPolicy unset Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2008-10-23 16:51:11 UTC (rev 12155) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2008-10-23 16:51:39 UTC (rev 12156) @@ -133,7 +133,9 @@ bean_consumermanager_refresh_success=Le rafra\u00eechissement a r\u00e9ussi. bean_producer_cancel_success=Toutes les modifications faites \u00e0 la configuration du producteur ont \u00e9t\u00e9 annull\u00e9es! bean_producer_save_success=La configuration du producteur a bien \u00e9t\u00e9 sauvegard\u00e9e! -bean_consumermanager_refresh_modify=Les informations locales ou distantes ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur. +bean_consumermanager_refresh_modify=Les informations locales ou distantes ont chang\u00e9, vous devriez modifier votre enregistrement avec le producteur.\n\ +Les nouvelles informations locales sont enregistr\u00e9es mais les donn\u00e9es d'enregistrement courantes seront utilis\u00e9es\ +tant que vous n'aurez pas mis \u00e0 jour votre enregistrement aupr\u00e8s du producteur. bean_consumer_update_success=Consommateur mis \u00e0 jour! registration_property_status_inexistent=Inexistant sur le producteur registration_property_status_invalid_value=Invalide valeur