Author: chris.laprun(a)jboss.com
Date: 2009-05-18 17:21:45 -0400 (Mon, 18 May 2009)
New Revision: 13390
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
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/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
Log:
- JBPORTAL-2393:
+ PropertyValidator now provides doSimpleChecks method to validate properties after
checking for null but
before checking for XSS or duplicates. In particular, we now forbid names containing .
or /
+ Made ManagedBean.DefaultPropertyValidator an inner class so that we can reuse more
code
+ Updated localization resources
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/CreateInstanceAction.java 2009-05-18
21:21:45 UTC (rev 13390)
@@ -42,15 +42,12 @@
*/
public class CreateInstanceAction extends ManagedBean
{
-
- /** . */
private String instanceId;
- /** . */
private PortletManagerBean portletMgr;
- /** . */
private InstanceManagerBean instanceMgr;
+
private static final String MESSAGE_TARGET =
"add_instance_form:instanceId";
protected static final String INSTANCE_TYPE = "INSTANCE_TYPE";
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -325,7 +325,7 @@
COORDINATION_PARAMETER=parameter binding
COORDINATION_ALIAS=alias binding
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty
or contain '\\', '<', '>', '(', ')',
'=' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty
or contain '/', '.', '\\', '<', '>',
'(', ')', '=' or '%5c'
NO_SELECTED_PORTLET_ERROR=No portlet was selected!
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
bean_support_unexpected_error=Unexpected error:
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_de.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -70,7 +70,6 @@
DESCRIPTION=Beschreibung
REMOTE=Remote
REMOTABLE=Remote-f\u00e4hig
-ACTIONS=Aktionen
CREATE_INSTANCE=Instanz erstellen
PORTLET_DEFINITIONS=Portlet-Definitionen
DETAILS=Details
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -325,7 +325,7 @@
COORDINATION_PARAMETER=collegamento al parametro
COORDINATION_ALIAS=collegamento all'alias
-INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non
pu\u00f2 essere null, vuoto o contenere '\\', '<', '>',
'(', ')', '=' o '%5c'
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido per {1}: Non
pu\u00f2 essere null, vuoto o contenere '/', '.', '\\',
'<', '>', '(', ')', '=' o '%5c'
NO_SELECTED_PORTLET_ERROR=Non \u00e8 stata selezionata nessuna portlet!
DUPLICATE_ERROR=Esiste gi\u00e0 un {1} chiamato ''{0}''!
bean_support_unexpected_error=Errore inatteso:
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -325,7 +325,7 @@
COORDINATION_PARAMETER=parameter binding
COORDINATION_ALIAS=alias binding
-INVALID_NAME_ERROR=''{0}'' \u00e9 um nome de {1} inv\u00e1lido\: N\u00e3o
pode ser nulo, vazio, ou que contenha ''\\', '<', '>',
'(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' \u00e9 um nome de {1} inv\u00e1lido\: N\u00e3o
pode ser nulo, vazio, ou que contenha '/', '.', '\\',
'<', '>', '(', ')', '=' ou '%5c'
NO_SELECTED_PORTLET_ERROR=Nenhum portlet foi selecionado!
DUPLICATE_ERROR=O {1} denominado ''{0}'' j\u00e1 existe\!
bean_support_unexpected_error=Erro inesperado:
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/BaseRoleAction.java 2009-05-18
21:21:45 UTC (rev 13390)
@@ -84,13 +84,8 @@
}
}
- private class DisplayNameValidator implements PropertyValidator
+ private class DisplayNameValidator extends DefaultPropertyValidator
{
- public boolean checkForDuplicates()
- {
- return true;
- }
-
public String getObjectTypeName()
{
return ROLE_DISPLAY_TYPE;
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -178,7 +178,7 @@
ROLE_TYPE=role
ROLE_DISPLAY_TYPE=role display
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty
or contain '\\', '<', '>', '(', ')',
'=' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty
or contain '/', '.', '\\', '<', '>',
'(', ')', '=' or '%5c'
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
# Example usage for dynamic values
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -299,4 +299,4 @@
ROLE_TYPE=r\u00f4le
ROLE_DISPLAY_TYPE=affichage r\u00f4le
DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0!
-INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas
\u00eatre null, vide ou contenir '\\', '<', '>',
'(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas
\u00eatre null, vide ou contenir '/', '.', '\\', '<',
'>', '(', ')', '=' ou '%5c'
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -186,5 +186,5 @@
javax.faces.component.UIInput.REQUIRED=Il valore \u00e8 richiesto
ROLE_TYPE=ruolo
-INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2
essere null, vuoto o contenere '\\', '<', '>', '(',
')', '=' o '%5c'
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2
essere null, vuoto o contenere '/', '.', '\\', '<',
'>', '(', ')', '=' o '%5c'
DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0!
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_pt_BR.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -186,5 +186,5 @@
javax.faces.component.UIInput.REQUIRED=Valor obrigat\u00f3rio
ROLE_TYPE=perfil
-INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\:
n\u00e3o deve ser nulo, vazio ou conter os caracteres '\\', '<',
'>', '(', ')', '=' ou '%5c'
+INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\:
n\u00e3o deve ser nulo, vazio ou conter os caracteres '/', '.',
'\\', '<', '>', '(', ')', '=' ou
'%5c'
DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00e1 existe\!
\ No newline at end of file
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 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -178,5 +178,5 @@
org.jboss.portal.object.name.admin.WSRP=WSRP
-INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty
or contain '\\', '<', '>', '(', ')',
'=' or '%5c'
+INVALID_NAME_ERROR=''{0}'' is an invalid {1} name: Cannot be null, empty
or contain '/', '.', '\\', '<', '>',
'(', ')', '=' or '%5c'
DUPLICATE_ERROR=A {1} named ''{0}'' already exists!
\ No newline at end of file
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 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -147,4 +147,4 @@
consumers_table_reload=Recharger consommateurs
CONSUMER_TYPE=Consommateur
DUPLICATE_ERROR=Un {1} nomm\u00e9 ''{0}'' existe d\u00e9j\u00e0!
-INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas
\u00eatre null, vide ou contenir '\\', '<', '>',
'(', ')', '=' ou '%5c'
\ No newline at end of file
+INVALID_NAME_ERROR=''{0}'' est un nom invalide pour un {1} : Ne peut pas
\u00eatre null, vide ou contenir '/', '.', '\\', '<',
'>', '(', ')', '=' ou '%5c'
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_it.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -178,5 +178,5 @@
org.jboss.portal.object.name.admin.WSRP=WSRP
-INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2
essere null, vuoto o contenere '\\', '<', '>', '(',
')', '=' o '%5c'
+INVALID_NAME_ERROR=''{0}'' non \u00e8 un nome valido di {1} : Non \u00f2
essere null, vuoto o contenere '/', '.', '\\', '<',
'>', '(', ')', '=' o '%5c'
DUPLICATE_ERROR=Un valore {1} con nome ''{0}'' esiste gi\u00e0!
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_pt_BR.properties 2009-05-18
21:21:45 UTC (rev 13390)
@@ -24,31 +24,31 @@
## WSRP GUI localization
# JBoss Portal display information
-org.jboss.portal.object.name.WSRPConfigurationPortlet = Configura\u00E7\u00E3o
WSRP
-org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de
Configura\u00E7\u00E3o WSRP
+org.jboss.portal.object.name.WSRPConfigurationPortlet = Configura\u00e7\u00e3o
WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de
Configura\u00e7\u00e3o WSRP
# Tabs
-nav_tabs_consumers = Configura\u00E7\u00E3o de Consumidores
-nav_tabs_producer_config = Configura\u00E7\u00E3o de Produtores
+nav_tabs_consumers = Configura\u00e7\u00e3o de Consumidores
+nav_tabs_producer_config = Configura\u00e7\u00e3o de Produtores
nav_tabs_producer_management = Gerenciamento de Produtores
# Object path in consumer template
path_consumers_root = Consumidores
-path_consumers_consumer = Configura\u00E7\u00E3o do Consumidor ''{0}''
+path_consumers_consumer = Configura\u00e7\u00e3o do Consumidor ''{0}''
path_consumers_active = ativo
path_consumers_inactive = inativo
-path_consumers_refreshNeeded = (atualiza\u00E7\u00E3o necess\u00E1ria)
+path_consumers_refreshNeeded = (atualiza\u00e7\u00e3o necess\u00e1ria)
# Confirm deletion of a consumer screen
confirm_delete_consumer_title = Excluir o consumidor ''{0}''?
-confirm_delete_consumer_message = Voc\u00EA est\u00E1 prestes a excluir o consumidor
''{0}''\!
+confirm_delete_consumer_message = Voc\u00ea est\u00e1 prestes a excluir o consumidor
''{0}''\!
confirm_detete_consumer_proceed = Tem certeza de que deseja continuar?
confirm_delete_consumer_submit = Excluir consumidor
confirm_delete_consumer_cancel = Cancelar
# Confirm deletion of local registration information screen
confirm_delete_registration_title = Excluir registro local para o consumidor
''{0}''?
-confirm_delete_registration_message = Voc\u00EA est\u00E1 prestes a eliminar o registro
local de informa\u00E7\u00F5es para o consumidor ''{0}'\! \nIsso s\u00F3
\u00E9 necess\u00E1rio se esse consumidor tinha anteriormente se registrado com o produtor
remoto, e esse produtor tiver sido modificado para n\u00E3o mais exigir registro. \nApenas
apague informa\u00E7\u00F5es locais de registro, se esse produtor apresentar erros devido
a essa situa\u00E7\u00E3o particular. Apagar o registro local quando n\u00E3o
obrigat\u00F3rio pode conduzir \u00E0 incapacidade de utilizar esse produtor.
+confirm_delete_registration_message = Voc\u00ea est\u00e1 prestes a eliminar o registro
local de informa\u00e7\u00f5es para o consumidor ''{0}'\! \nIsso s\u00f3
\u00e9 necess\u00e1rio se esse consumidor tinha anteriormente se registrado com o produtor
remoto, e esse produtor tiver sido modificado para n\u00e3o mais exigir registro. \nApenas
apague informa\u00e7\u00f5es locais de registro, se esse produtor apresentar erros devido
a essa situa\u00e7\u00e3o particular. Apagar o registro local quando n\u00e3o
obrigat\u00f3rio pode conduzir \u00e0 incapacidade de utilizar esse produtor.
confirm_delete_registration_proceed = Tem certeza de que deseja continuar?
confirm_delete_registration_submit = Excluir registro local
confirm_delete_registration_cancel = Cancelar
@@ -61,7 +61,7 @@
# Consumers list
consumers_table_column_consumer = Consumidor
consumers_table_column_consumer_status = status:
-consumers_table_column_actions = A\u00E7\u00F5es
+consumers_table_column_actions = A\u00e7\u00f5es
consumers_table_action_configure = Configurar
consumers_table_action_refresh = Atualizar
consumers_table_action_activate = Ativar
@@ -73,55 +73,55 @@
# Consumer editing screen
edit_consumer_producer = Id do produtor\:
-edit_consumer_cache = Expira\u00E7\u00E3o do cache\:
+edit_consumer_cache = Expira\u00e7\u00e3o do cache\:
edit_consumer_cache_seconds = (segundos antes de expirar)
-edit_consumer_endpoint = Configura\u00E7\u00E3o do endpoint\:
+edit_consumer_endpoint = Configura\u00e7\u00e3o do endpoint\:
edit_consumer_endpoint_wsdl = Utilizar WSDL?
edit_consumer_endpoint_sd = URL do Service Description\:
edit_consumer_endpoint_m = URL do Markup\:
edit_consumer_endpoint_r = URL do Registro\:
edit_consumer_endpoint_pm = URL do Portlet de Gerenciamento\:
-edit_consumer_registration = Informa\u00E7\u00F5es do registro\:
-edit_consumer_registration_current = Informa\u00E7\u00F5es do registro atual\:
+edit_consumer_registration = Informa\u00e7\u00f5es do registro\:
+edit_consumer_registration_current = Informa\u00e7\u00f5es do registro atual\:
edit_consumer_prop_name = Nome
-edit_consumer_prop_desc = Descri\u00E7\u00E3o
+edit_consumer_prop_desc = Descri\u00e7\u00e3o
edit_consumer_prop_value = Valor
edit_consumer_registration_update_props = Atualizar propriedades
-edit_consumer_registration_no_props = O registro \u00E9 indicado como obrigat\u00F3rio
sem as propriedades do registro.
+edit_consumer_registration_no_props = O registro \u00e9 indicado como obrigat\u00f3rio
sem as propriedades do registro.
edit_consumer_registration_modify = Modificar registro
edit_consumer_registration_modify_title = Modificar o registro realizado com este
produtor
-edit_consumer_registration_expected = Informa\u00E7\u00F5es de registro esperadas\:
-edit_consumer_no_registration = O produtor n\u00E3o requer registro.
+edit_consumer_registration_expected = Informa\u00e7\u00f5es de registro esperadas\:
+edit_consumer_no_registration = O produtor n\u00e3o requer registro.
edit_consumer_registration_context = Contexto do registro\:
edit_consumer_registration_context_handle = Handle:
edit_consumer_registration_context_erase = Excluir registro local
-edit_consumer_registration_context_erase_title = Excluir informa\u00E7\u00F5es locais de
registro (potencialmente perigoso\!)
+edit_consumer_registration_context_erase_title = Excluir informa\u00e7\u00f5es locais de
registro (potencialmente perigoso\!)
edit_consumer_refresh = Atualizar e Gravar
-edit_consumer_refresh_title = Gravar altera\u00E7\u00F5es e atualizar as
informa\u00E7\u00F5es do produtor
+edit_consumer_refresh_title = Gravar altera\u00e7\u00f5es e atualizar as
informa\u00e7\u00f5es do produtor
edit_consumer_cancel = Cancelar
# Confirm registration property deletion screen
-confirm_delete_reg_property_title = Excluir a descri\u00E7\u00E3o da propriedade de
registro ' '(0)''?
-confirm_delete_reg_property_message = Voc\u00EA est\u00E1 prestes a eliminar a
descri\u00E7\u00E3o da propriedade de registro ''{0}''\!\n Isso
acionar\u00E1 a invalida\u00E7\u00E3o dos registros dos consumidores que ter\u00E3o de
modificar suas informa\u00E7\u00E3o de registro.
+confirm_delete_reg_property_title = Excluir a descri\u00e7\u00e3o da propriedade de
registro ' '(0)''?
+confirm_delete_reg_property_message = Voc\u00ea est\u00e1 prestes a eliminar a
descri\u00e7\u00e3o da propriedade de registro ''{0}''\!\n Isso
acionar\u00e1 a invalida\u00e7\u00e3o dos registros dos consumidores que ter\u00e3o de
modificar suas informa\u00e7\u00e3o de registro.
confirm_delete_reg_property_proceed = Tem certeza de que deseja continuar?
confirm_delete_reg_property_submit = Excluir propriedade
confirm_delete_reg_property_cancel = Cancelar
# Producer configuration screen
-producer_config_title = Configura\u00E7\u00E3o do Produtor
-producer_config_sd_requires_reg = O acesso \u00E0 descri\u00E7\u00E3o completa do
servi\u00E7o exige que os consumidores estejam registrados.
+producer_config_title = Configura\u00e7\u00e3o do Produtor
+producer_config_sd_requires_reg = O acesso \u00e0 descri\u00e7\u00e3o completa do
servi\u00e7o exige que os consumidores estejam registrados.
producer_config_strict = Utilizar compatibilidade estrita ao WSRP.
-producer_config_requires_reg = Registro obrigat\u00F3rio. Modificar essa
informa\u00E7\u00E3o invalidar\u00E1 os registros dos consumidores.
-producer_config_reg_policy = Nome da classe de pol\u00EDtica do registro\:
-producer_config_reg_prop_validator = Nome da classe de valida\u00E7\u00E3o da propriedade
do registro\:
+producer_config_requires_reg = Registro obrigat\u00f3rio. Modificar essa
informa\u00e7\u00e3o invalidar\u00e1 os registros dos consumidores.
+producer_config_reg_policy = Nome da classe de pol\u00edtica do registro\:
+producer_config_reg_prop_validator = Nome da classe de valida\u00e7\u00e3o da propriedade
do registro\:
producer_config_reg_props = Propriedades do registro
producer_config_reg_prop_name = Nome
producer_config_reg_prop_type = Tipo
-producer_config_reg_prop_label = R\u00F3tulo
+producer_config_reg_prop_label = R\u00f3tulo
producer_config_reg_prop_hint = Dica
-producer_config_reg_prop_action = A\u00E7\u00E3o
+producer_config_reg_prop_action = A\u00e7\u00e3o
producer_config_reg_prop_remove = Excluir
-producer_config_no_reg_props = Propriedades obrigat\u00F3rias do registro n\u00E3o
especificadas.
+producer_config_no_reg_props = Propriedades obrigat\u00f3rias do registro n\u00e3o
especificadas.
producer_config_add_reg_prop = Adicionar propriedade
producer_config_save = Gravar
producer_config_cancel = Cancelar
@@ -133,41 +133,41 @@
CONSUMER_TYPE = Consumidor
# ConsumerBean
-bean_consumer_cannot_find_consumer = N\u00E3o foi poss\u00EDvel encontrar o consumidor
''{0}''\!
-bean_consumer_cannot_update_consumer = N\u00E3o foi poss\u00EDvel atualizar o
consumidor\!
-bean_consumer_cannot_refresh_consumer = N\u00E3o foi poss\u00EDvel atualizar o
consumidor\!
+bean_consumer_cannot_find_consumer = N\u00e3o foi poss\u00edvel encontrar o consumidor
''{0}''\!
+bean_consumer_cannot_update_consumer = N\u00e3o foi poss\u00edvel atualizar o
consumidor\!
+bean_consumer_cannot_refresh_consumer = N\u00e3o foi poss\u00edvel atualizar o
consumidor\!
bean_consumer_modify_reg_success = Registro modificado com sucesso\!
-bean_consumer_invalid_modify = Tentativa inv\u00E1lida de modificar um registro que
n\u00E3o foi modificado localmente\!
-bean_consumer_cannot_modify_reg = N\u00E3o foi poss\u00EDvel modificar o registro\!
-bean_consumer_cannot_erase_reg = N\u00E3o foi poss\u00EDvel excluir o registro local\!
-bean_consumer_malformed_url = ''{0}'' n\u00E3o \u00E9 uma URL
v\u00E1lida\: {1}
-bean_consumer_update_success = Atualiza\u00E7\u00E3o do consumidor realizada com
sucesso\!
+bean_consumer_invalid_modify = Tentativa inv\u00e1lida de modificar um registro que
n\u00e3o foi modificado localmente\!
+bean_consumer_cannot_modify_reg = N\u00e3o foi poss\u00edvel modificar o registro\!
+bean_consumer_cannot_erase_reg = N\u00e3o foi poss\u00edvel excluir o registro local\!
+bean_consumer_malformed_url = ''{0}'' n\u00e3o \u00e9 uma URL
v\u00e1lida\: {1}
+bean_consumer_update_success = Atualiza\u00e7\u00e3o do consumidor realizada com
sucesso\!
# ConsumerManagerBean
-bean_consumermanager_invalid_new_consumer_name = Necessita de um nome n\u00E3o nulo,
n\u00E3o vazio para o novo consumidor\!
+bean_consumermanager_invalid_new_consumer_name = Necessita de um nome n\u00e3o nulo,
n\u00e3o vazio para o novo consumidor\!
bean_consumermanager_no_consumer = Nenhum consumidor foi selecionado\!
-bean_consumermanager_refresh_bypassed = N\u00E3o \u00E9 necess\u00E1rio atualizar.
-bean_consumermanager_refresh_success = Atualiza\u00E7\u00E3o bem sucedida.
-bean_consumermanager_refresh_failure = A atualiza\u00E7\u00E3o falhou (provavelmente
porque a informa\u00E7\u00E3o de registro n\u00E3o era v\u00E1lida).
+bean_consumermanager_refresh_bypassed = N\u00e3o \u00e9 necess\u00e1rio atualizar.
+bean_consumermanager_refresh_success = Atualiza\u00e7\u00e3o bem sucedida.
+bean_consumermanager_refresh_failure = A atualiza\u00e7\u00e3o falhou (provavelmente
porque a informa\u00e7\u00e3o de registro n\u00e3o era v\u00e1lida).
bean_consumermanager_refresh_exception = Ocorreu um erro inesperado.
-bean_consumermanager_refresh_modify = Informa\u00E7\u00E3o local ou remota foi alterada.
Voc\u00EA deve modificar o registro com o produtor remoto. \\n Os novos locais de
informa\u00E7\u00E3o ser\u00E3o salvos, mas o seu atual registro de dados ser\u00E1 usado
at\u00E9 que voc\u00EA modifique o registro com o produtor com sucesso.
+bean_consumermanager_refresh_modify = Informa\u00e7\u00e3o local ou remota foi alterada.
Voc\u00ea deve modificar o registro com o produtor remoto. \\n Os novos locais de
informa\u00e7\u00e3o ser\u00e3o salvos, mas o seu atual registro de dados ser\u00e1 usado
at\u00e9 que voc\u00ea modifique o registro com o produtor com sucesso.
# ProducerBean
-bean_producer_regpolicy_unset = RegistrationPolicy n\u00E3o definida
-bean_producer_cannot_save = N\u00E3o foi poss\u00EDvel salvar a configura\u00E7\u00E3o do
produtor. Motivo\: (0)
-bean_producer_cannot_reload = N\u00E3o foi poss\u00EDvel recarregar a
configura\u00E7\u00E3o do produtor. Motivo\: {0}
-bean_producer_save_success = Configura\u00E7\u00E3o do producer gravada com sucesso\!
-bean_producer_cancel_success = Todas as modifica\u00E7\u00F5es feitas na
configura\u00E7\u00E3o do produtor foram canceladas\!
+bean_producer_regpolicy_unset = RegistrationPolicy n\u00e3o definida
+bean_producer_cannot_save = N\u00e3o foi poss\u00edvel salvar a configura\u00e7\u00e3o do
produtor. Motivo\: (0)
+bean_producer_cannot_reload = N\u00e3o foi poss\u00edvel recarregar a
configura\u00e7\u00e3o do produtor. Motivo\: {0}
+bean_producer_save_success = Configura\u00e7\u00e3o do producer gravada com sucesso\!
+bean_producer_cancel_success = Todas as modifica\u00e7\u00f5es feitas na
configura\u00e7\u00e3o do produtor foram canceladas\!
## RegistrationProperty Status localization
registration_property_status_inexistent = Produtor inexistente
-registration_property_status_missing = N\u00E3o est\u00E1 presente
-registration_property_status_missing_value = Valor n\u00E3o est\u00E1 presente
+registration_property_status_missing = N\u00e3o est\u00e1 presente
+registration_property_status_missing_value = Valor n\u00e3o est\u00e1 presente
registration_property_status_unchecked_value = Status indeterminado
-registration_property_status_invalid_value = Valor inv\u00E1lido
-registration_property_status_valid = V\u00E1lido
+registration_property_status_invalid_value = Valor inv\u00e1lido
+registration_property_status_valid = V\u00e1lido
org.jboss.portal.object.name.admin.WSRP=WSRP
-INVALID_NAME_ERROR=''{0}'' \u00E9 um nome inv\u00E1lido para {1}\:
n\u00E3o deve ser nulo, vazio ou conter os caracteres '\\', '<',
'>', '(', ')', '\=' ou '%5c'
-DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00E1 existe\!
\ No newline at end of file
+INVALID_NAME_ERROR=''{0}'' \u00e9 um nome inv\u00e1lido para {1}\:
n\u00e3o deve ser nulo, vazio ou conter os caracteres '/', '.',
'\\', '<', '>', '(', ')', '=' ou
'%5c'
+DUPLICATE_ERROR=Um {1} denominado ''{0}'' j\u00e1 existe\!
\ No newline at end of file
Modified:
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-05-18
20:46:08 UTC (rev 13389)
+++
branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/gui/ManagedBean.java 2009-05-18
21:21:45 UTC (rev 13390)
@@ -47,26 +47,17 @@
String getObjectTypeName();
boolean isAlreadyExisting(String propertyName);
+
+ String doSimpleChecks(String name);
}
- public final PropertyValidator DEFAULT_PROPERTY_VALIDATOR = new PropertyValidator()
+ private PropertyValidator validator = new DefaultPropertyValidator();
+
+ protected void setValidator(PropertyValidator validator)
{
- public boolean checkForDuplicates()
- {
- return true;
- }
+ this.validator = validator;
+ }
- public String getObjectTypeName()
- {
- return ManagedBean.this.getObjectTypeName();
- }
-
- public boolean isAlreadyExisting(String propertyName)
- {
- return ManagedBean.this.isAlreadyExisting(propertyName);
- }
- };
-
public void setBeanContext(BeanContext beanContext)
{
this.beanContext = beanContext;
@@ -74,7 +65,7 @@
public String checkNameValidity(String name, String targetForErrorMessage)
{
- return checkNameValidity(name, targetForErrorMessage, DEFAULT_PROPERTY_VALIDATOR);
+ return checkNameValidity(name, targetForErrorMessage, validator);
}
public String checkNameValidity(String name, String targetForErrorMessage,
PropertyValidator validator)
@@ -89,6 +80,16 @@
}
else
{
+ String original = name;
+ name = validator.doSimpleChecks(name);
+
+ // we got an invalid name after simple checks, fail!
+ if (name == null)
+ {
+ beanContext.createTargetedErrorMessage(targetForErrorMessage, INVALID_NAME,
original, getLocalizedType(objectTypeName));
+ return null;
+ }
+
// Trim name
name = name.trim();
@@ -118,11 +119,6 @@
beanContext.createTargetedErrorMessage(targetForErrorMessage, DUPLICATE, name,
getLocalizedType(objectTypeName));
}
- private String getLocalizedType()
- {
- return getLocalizedType(getObjectTypeName());
- }
-
private String getLocalizedType(String objectTypeName)
{
return beanContext.getMessageFromBundle(objectTypeName);
@@ -193,4 +189,28 @@
return null;
}
}
+
+ protected class DefaultPropertyValidator implements PropertyValidator
+ {
+ public boolean checkForDuplicates()
+ {
+ return true;
+ }
+
+ public String getObjectTypeName()
+ {
+ return ManagedBean.this.getObjectTypeName();
+ }
+
+ public boolean isAlreadyExisting(String propertyName)
+ {
+ return ManagedBean.this.isAlreadyExisting(propertyName);
+ }
+
+ public String doSimpleChecks(String name)
+ {
+ // if name contains . or /, it's invalid for a Portal object
+ return (name.indexOf('.') != -1 || name.indexOf('/') != -1) ?
null : name;
+ }
+ }
}