Author: chris.laprun(a)jboss.com
Date: 2008-11-07 17:14:25 -0500 (Fri, 07 Nov 2008)
New Revision: 12273
Added:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/test/faces/MessageFormatTestCase.java
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/ConsumerManagerBean.java
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/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
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
Log:
- JBPORTAL-2230:
+ Wrong version of createErrorMessage was sometimes called.
+ Single quotes need to be escape in localized messages containing parameters (added
test case showing the issue, even though it's not technically a Portal issue)
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-11-07
14:15:13 UTC (rev 12272)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerBean.java 2008-11-07
22:14:25 UTC (rev 12273)
@@ -515,7 +515,7 @@
}
catch (MalformedURLException e)
{
- beanContext.createErrorMessage(target, MALFORMED_URL, newValue,
e.getLocalizedMessage());
+ beanContext.createTargetedErrorMessage(target, MALFORMED_URL, newValue,
e.getLocalizedMessage());
}
}
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-11-07
14:15:13 UTC (rev 12272)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2008-11-07
22:14:25 UTC (rev 12273)
@@ -236,7 +236,7 @@
{
RefreshResult result = consumer.refresh(true);
- String status = getLocalizationKeyFrom(result);
+ String statusMessage = getLocalizationKeyFrom(result);
if (result.hasIssues())
{
// create the expected registration info and make it available
@@ -244,7 +244,7 @@
expected.refresh(result.getServiceDescription(), consumer.getProducerId(),
true, true, true);
setExpectedRegistrationInfo(expected);
- beanContext.createErrorMessage(status);
+ beanContext.createErrorMessage(statusMessage);
// refresh had issues, we should deactivate this consumer
registry.deactivateConsumerWith(consumer.getProducerId());
@@ -261,7 +261,7 @@
registry.deactivateConsumerWith(consumer.getProducerId());
}
- beanContext.createInfoMessage(status);
+ beanContext.createInfoMessage(statusMessage);
}
return result;
}
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-11-07
14:15:13 UTC (rev 12272)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java 2008-11-07
22:14:25 UTC (rev 12273)
@@ -23,7 +23,6 @@
package org.jboss.portal.wsrp.admin.ui;
-import org.jboss.portal.faces.gui.BeanContext;
import org.jboss.portal.faces.gui.ManagedBean;
import org.jboss.portal.registration.RegistrationPolicy;
import org.jboss.portal.registration.policies.DefaultRegistrationPolicy;
@@ -183,7 +182,7 @@
catch (Exception e)
{
log.debug(e);
- beanContext.createErrorMessage(BeanContext.STATUS,
"bean_producer_cannot_save", e.getLocalizedMessage());
+ beanContext.createErrorMessage("bean_producer_cannot_save",
e.getLocalizedMessage());
}
return PRODUCER;
}
@@ -198,7 +197,7 @@
catch (Exception e)
{
log.debug(e);
- beanContext.createErrorMessage(BeanContext.STATUS,
"bean_producer_cannot_reload", e.getLocalizedMessage());
+ beanContext.createErrorMessage("bean_producer_cannot_reload",
e.getLocalizedMessage());
}
return PRODUCER;
}
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-11-07
14:15:13 UTC (rev 12272)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2008-11-07
22:14:25 UTC (rev 12273)
@@ -138,7 +138,7 @@
bean_support_cause = Cause:
# ConsumerBean
-bean_consumer_cannot_find_consumer = Couldn't find consumer ''{0}''!
+bean_consumer_cannot_find_consumer = Couldn''t find consumer
''{0}''!
bean_consumer_cannot_update_consumer = Couldn't update consumer!
bean_consumer_cannot_refresh_consumer = Couldn't refresh consumer!
bean_consumer_modify_reg_success = Successfully modified registration!
@@ -161,8 +161,8 @@
# ProducerBean
bean_producer_regpolicy_unset = RegistrationPolicy unset
-bean_producer_cannot_save = Couldn't save producer configuration. Cause: {0}
-bean_producer_cannot_reload = Couldn't reload producer configuration. Cause: {0}
+bean_producer_cannot_save = Couldn''t save producer configuration. Cause: {0}
+bean_producer_cannot_reload = Couldn''t reload producer configuration. Cause:
{0}
bean_producer_save_success = Producer configuration successfully saved!
bean_producer_cancel_success = All modifications made to the producer configuration have
been cancelled!
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-11-07
14:15:13 UTC (rev 12272)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2008-11-07
22:14:25 UTC (rev 12273)
@@ -18,7 +18,7 @@
# 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. #
+# 02110-1301 USA, or see the FSF site:
http://www.fsf.org. #
`
################################################################################
# JBoss Portal display information
org.jboss.portal.object.name.WSRPConfigurationPortlet = Configuration WSRP
@@ -34,20 +34,20 @@
path_consumers_inactive = inactif
path_consumers_refreshNeeded = (rafra\u00eechissement requis)
confirm_delete_consumer_cancel=Annuler
-confirm_delete_consumer_message=Vous \u00eates sur le point d'effacer le concommateur
''{0}''!
+confirm_delete_consumer_message=Vous \u00eates sur le point d''effacer le
concommateur ''{0}''!
confirm_delete_consumer_submit=Effacer consommateur
confirm_delete_consumer_title=Voulez-vous r\u00e9ellement effacer le consommateur
''{0}''?
confirm_detete_consumer_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
confirm_delete_registration_cancel=Annuler
-confirm_delete_registration_message=Vous \u00eates sur le point d'effacer les
informations locales d'enregistrement pour le consommateur ''{0}''!
\n\
-Ceci n'est uniquement requis dans le cas o\u00f9 ce consommateur se serait
enregistr\u00e9 aupr\u00e8s d'un producteur distant \n\
-qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir d'enregistrement.
\n\
-N'effacez les informations locales d'enregistrement que si vous rencontrez des
probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\
-situation, avec le producteur distant. Effacer les donn\u00e9es d'enregistrement
quand ce n'est pas requis peut entra\u00eener \n\
-l'incapacit\u00e9 future d'acc\u00e9der \u00e0 ce producteur.
+confirm_delete_registration_message=Vous \u00eates sur le point d''effacer les
informations locales d''enregistrement pour le consommateur
''{0}''! \n\
+Ceci n''est uniquement requis dans le cas o\u00f9 ce consommateur se serait
enregistr\u00e9 aupr\u00e8s d''un producteur distant \n\
+qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir
d''enregistrement. \n\
+N''effacez les informations locales d''enregistrement que si vous
rencontrez des probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\
+situation, avec le producteur distant. Effacer les donn\u00e9es d''enregistrement
quand ce n''est pas requis peut entra\u00eener \n\
+l''incapacit\u00e9 future d''acc\u00e9der \u00e0 ce producteur.
confirm_delete_registration_proceed=\u00cates-vous certains de vouloir proc\u00e9der?
confirm_delete_registration_submit=Effacer enregistrement
-confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer
l'enregistrement du consommateur ''{0}''?
+confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer
l''enregistrement du consommateur ''{0}''?
consumers_create_submit=Cr\u00e9er Consommateur
consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
consumers_table_action_activate=Activer
@@ -89,12 +89,12 @@
edit_consumer_registration_no_props=Enregistrement indiqu\u00e9 sans besoin de
propri\u00e9t\u00e9s d'enregistrement
edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour
bean_consumer_cannot_erase_reg=L'effacement de l'enregistrement n'a pu
\u00eatre effectu\u00e9!
-bean_consumer_cannot_find_consumer=Le consommateur ''{0}'' n'a pu
\u00eatre trouv\u00e9!
+bean_consumer_cannot_find_consumer=Le consommateur ''{0}'' n''a
pu \u00eatre trouv\u00e9!
bean_consumer_cannot_modify_reg=La modification de l'enregistrement n'a pu
\u00eatre effectu\u00e9e!
bean_consumer_cannot_refresh_consumer=Le rafra\u00eechissement du consommateur n'a pu
\u00eatre effectu\u00e9!
bean_consumer_cannot_update_consumer=La mise \u00e0 jour du consommateur n'a pu
\u00eatre effectu\u00e9e!
bean_consumer_invalid_modify=Tentative invalide de modification d'enregistrement sans
modifications locales.
-bean_consumer_malformed_url=''{0}'' n'est pas une URL valide: {1}
+bean_consumer_malformed_url=''{0}'' n''est pas une URL valide:
{1}
bean_consumer_modify_reg_success=Enregistrement modifi\u00e9!
bean_support_cause=Cause:
bean_support_unexpected_error=Une erreur inattendue s'est produite:
@@ -104,8 +104,8 @@
bean_producer_cannot_save=La sauvegarde de la configuration du producteur a
\u00e9chou\u00e9. Cause: {0}
bean_producer_regpolicy_unset=RegistrationPolicy non sp\u00e9cifi\u00e9e
confirm_delete_reg_property_cancel=Annuler
-confirm_delete_reg_property_message=Vous \u00eates sur le point d'effacer la
description de la propri\u00e9t\u00e9 d'enregistrement ''{0}''! \n\
-Cel\u00e0 va entra\u00eener l'invalidation des enregistrements des consommateurs qui
devront alors modifier \n\
+confirm_delete_reg_property_message=Vous \u00eates sur le point d''effacer la
description de la propri\u00e9t\u00e9 d''enregistrement ''{0}''!
\n\
+Cel\u00e0 va entra\u00eener l''invalidation des enregistrements des consommateurs
qui devront alors modifier \n\
leur information d'enregistrement.
confirm_delete_reg_property_submit=Effacer la propri\u00e9t\u00e9
confirm_delete_reg_property_title=Voulez-vous r\u00e9ellement effacer la description de
la propri\u00e9t\u00e9 d'enregistrement ''{0}''?
Modified:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2008-11-07
14:15:13 UTC (rev 12272)
+++
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/BeanContext.java 2008-11-07
22:14:25 UTC (rev 12273)
@@ -65,7 +65,7 @@
createLocalizedMessage(STATUS, message, getErrorSeverity(), params);
}
- protected void createErrorMessage(String target, String message, Object... params)
+ public void createTargetedErrorMessage(String target, String message, Object...
params)
{
createLocalizedMessage(target, message, getErrorSeverity(), params);
}
Added:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/test/faces/MessageFormatTestCase.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/test/faces/MessageFormatTestCase.java
(rev 0)
+++
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/test/faces/MessageFormatTestCase.java 2008-11-07
22:14:25 UTC (rev 12273)
@@ -0,0 +1,51 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2008, 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.
+*/
+
+package org.jboss.portal.test.faces;
+
+import junit.framework.TestCase;
+
+import java.text.MessageFormat;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
+ * @version $Revision$
+ */
+public class MessageFormatTestCase extends TestCase
+{
+ public void testFormat()
+ {
+ String input = "''{0}'' is not a valid URL: {1}";
+ String output = "'foo' is not a valid URL: bar";
+ assertEquals(output, MessageFormat.format(input, new String[] {"foo",
"bar"}));
+
+
+ // Don't forget to escape single quotes in localization files if there are
parameters to be interpreted
+ input = "Couldn't reload producer configuration. Cause: {0}";
+ output = "Couldnt reload producer configuration. Cause: {0}";
+ assertEquals(output, MessageFormat.format(input, new String[]{"foo"}));
+
+ input = "Couldn''t reload producer configuration. Cause: {0}";
+ output = "Couldn't reload producer configuration. Cause: foo";
+ assertEquals(output, MessageFormat.format(input, new String[]{"foo"}));
+ }
+}