JBoss Portal SVN: r12710 - branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-29 14:52:00 -0500 (Thu, 29 Jan 2009)
New Revision: 12710
Modified:
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
Log:
- Fixed messed up resources
Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-01-29 19:51:17 UTC (rev 12709)
+++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-01-29 19:52:00 UTC (rev 12710)
@@ -21,8 +21,43 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-delete_registration_cancel = Cancel
+## WSRP GUI localization
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet = WSRP Configuration
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration Portlet
+
+# Tabs
+nav_tabs_consumers = Consumers Configuration
+nav_tabs_producer_config = Producer Configuration
+nav_tabs_producer_management = Producer Management
+
+# Object path in consumer template
+path_consumers_root = Consumers
+path_consumers_consumer = Consumer ''{0}'' configuration
+path_consumers_active = active
+path_consumers_inactive = inactive
+path_consumers_refreshNeeded = (refresh needed)
+
+# Confirm deletion of a consumer screen
+confirm_delete_consumer_title = Delete ''{0}'' consumer?
+confirm_delete_consumer_message = You are about to delete the ''{0}'' consumer!
+confirm_detete_consumer_proceed = Are you sure you want to proceed?
+confirm_delete_consumer_submit = Delete consumer
+confirm_delete_consumer_cancel = Cancel
+
+# Confirm deletion of local registration information screen
+confirm_delete_registration_title = Delete local registration for ''{0}'' consumer?
+confirm_delete_registration_message = You are about to delete the local registration information for the ''{0}'' consumer! \n\
+This is only needed if this consumer had previously registered with the remote producer and this producer \n\
+has been modified to not require registration anymore. \n\
+Only erase local registration information if you experience errors with the producer due to this \n\
+particular situation. Erasing local registration when not required might lead to inability to work with \n\
+this producer anymore.
+confirm_delete_registration_proceed = Are you sure you want to proceed?
+confirm_delete_registration_submit = Erase local registration
+confirm_delete_registration_cancel = Cancel
+
# Consumers screen
consumers_title = Manage Consumers
consumers_create_title = Create a consumer named:
@@ -45,7 +80,7 @@
edit_consumer_producer = Producer id:
edit_consumer_cache = Cache expiration:
edit_consumer_cache_seconds = (seconds before expiration)
-edit_consumer_endpoint = Endpoint configuration:
+edit_consumer_endpoint = Endpoint configuration:
edit_consumer_endpoint_wsdl = Use WSDL?
edit_consumer_endpoint_sd = Service Description URL:
edit_consumer_endpoint_m = Markup URL:
Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-01-29 19:51:17 UTC (rev 12709)
+++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-01-29 19:52:00 UTC (rev 12710)
@@ -20,8 +20,35 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet = Configuration WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configuration pour WSRP
-ommateur
+nav_tabs_consumers = Configuration Consommateurs
+nav_tabs_producer_config = Configuration Producteur
+nav_tabs_producer_management = Gestion Producteur
+
+path_consumers_root = Consommateurs
+path_consumers_consumer = Configuration du consommateur ''{0}''
+path_consumers_active = actif
+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_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_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}''?
+consumers_create_submit=Cr\u00e9er Consommateur
consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
consumers_table_action_activate=Activer
consumers_table_action_configure=Configurer
15 years, 3 months
JBoss Portal SVN: r12709 - branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-29 14:51:17 -0500 (Thu, 29 Jan 2009)
New Revision: 12709
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_fr.properties
Log:
- Fix messed up resources (wondering what happened...)
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-01-29 19:08:04 UTC (rev 12708)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource.properties 2009-01-29 19:51:17 UTC (rev 12709)
@@ -21,8 +21,43 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-delete_registration_cancel = Cancel
+## WSRP GUI localization
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet = WSRP Configuration
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration Portlet
+
+# Tabs
+nav_tabs_consumers = Consumers Configuration
+nav_tabs_producer_config = Producer Configuration
+nav_tabs_producer_management = Producer Management
+
+# Object path in consumer template
+path_consumers_root = Consumers
+path_consumers_consumer = Consumer ''{0}'' configuration
+path_consumers_active = active
+path_consumers_inactive = inactive
+path_consumers_refreshNeeded = (refresh needed)
+
+# Confirm deletion of a consumer screen
+confirm_delete_consumer_title = Delete ''{0}'' consumer?
+confirm_delete_consumer_message = You are about to delete the ''{0}'' consumer!
+confirm_detete_consumer_proceed = Are you sure you want to proceed?
+confirm_delete_consumer_submit = Delete consumer
+confirm_delete_consumer_cancel = Cancel
+
+# Confirm deletion of local registration information screen
+confirm_delete_registration_title = Delete local registration for ''{0}'' consumer?
+confirm_delete_registration_message = You are about to delete the local registration information for the ''{0}'' consumer! \n\
+This is only needed if this consumer had previously registered with the remote producer and this producer \n\
+has been modified to not require registration anymore. \n\
+Only erase local registration information if you experience errors with the producer due to this \n\
+particular situation. Erasing local registration when not required might lead to inability to work with \n\
+this producer anymore.
+confirm_delete_registration_proceed = Are you sure you want to proceed?
+confirm_delete_registration_submit = Erase local registration
+confirm_delete_registration_cancel = Cancel
+
# Consumers screen
consumers_title = Manage Consumers
consumers_create_title = Create a consumer named:
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-01-29 19:08:04 UTC (rev 12708)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/Resource_fr.properties 2009-01-29 19:51:17 UTC (rev 12709)
@@ -20,8 +20,35 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
+# JBoss Portal display information
+org.jboss.portal.object.name.WSRPConfigurationPortlet = Configuration WSRP
+org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configuration pour WSRP
-ommateur
+nav_tabs_consumers = Configuration Consommateurs
+nav_tabs_producer_config = Configuration Producteur
+nav_tabs_producer_management = Gestion Producteur
+
+path_consumers_root = Consommateurs
+path_consumers_consumer = Configuration du consommateur ''{0}''
+path_consumers_active = actif
+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_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_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}''?
+consumers_create_submit=Cr\u00e9er Consommateur
consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9:
consumers_table_action_activate=Activer
consumers_table_action_configure=Configurer
15 years, 3 months
JBoss Portal SVN: r12708 - branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-01-29 14:08:04 -0500 (Thu, 29 Jan 2009)
New Revision: 12708
Modified:
branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
Log:
quote in username is not allowed anymore
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 17:32:33 UTC (rev 12707)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 19:08:04 UTC (rev 12708)
@@ -65,7 +65,7 @@
registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService");
// if (username.length() >= 5 && (Pattern.matches(NICKNAME_VALIDATION, username)))
- if (username.contains("<") || username.contains(">"))
+ if (username.contains("<") || username.contains(">") || username.contains("\"") || username.contains("\'"))
{
throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"),
15 years, 4 months
JBoss Portal SVN: r12707 - in tags/Enterprise_Portal_Platform_4_3_GA: core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-29 12:32:33 -0500 (Thu, 29 Jan 2009)
New Revision: 12707
Modified:
tags/Enterprise_Portal_Platform_4_3_GA/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
tags/Enterprise_Portal_Platform_4_3_GA/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
Encoding stuff
Modified: tags/Enterprise_Portal_Platform_4_3_GA/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-01-29 17:28:21 UTC (rev 12706)
+++ tags/Enterprise_Portal_Platform_4_3_GA/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-01-29 17:32:33 UTC (rev 12707)
@@ -1,4 +1,5 @@
<%@ page import="org.jboss.portal.api.PortalURL" %>
+<%@ page import="org.jboss.portal.common.text.EntityEncoder" %>
<%@ page import="org.jboss.portal.identity.User" %>
<%@page import="java.util.ResourceBundle"%>
<%@ page import="java.security.Principal" %>
@@ -35,10 +36,10 @@
</script>
<noscript>
- <a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a>
+ <a href="<%= loginURL %>"><%= EntityEncoder.FULL.encode(rb.getString("LOGIN")) %></a>
</noscript>
<%}else{%>
-<a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a>
+<a href="<%= loginURL %>"><%= EntityEncoder.FULL.encode(rb.getString("LOGIN")) %></a>
<%}%>
Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-01-29 17:28:21 UTC (rev 12706)
+++ tags/Enterprise_Portal_Platform_4_3_GA/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-01-29 17:32:33 UTC (rev 12707)
@@ -78,7 +78,7 @@
Role role = (Role)iterator.next();
%>
<option value="<%= role.getName() %>" <%if(readRoleSet.contains(role.getName())){%>selected<%}%>>
- <%= role.getDisplayName() %>
+ <%= EntityEncoder.FULL.encode(role.getDisplayName()) %>
</option>
<%
}
@@ -103,7 +103,7 @@
%>
<option value="<%= user.getUserName() %>"
<%if(readUserSet.contains(user.getUserName())){%>selected<%}%>>
- <%= user.getUserName() %>
+ <%= EntityEncoder.FULL.encode(user.getUserName()) %>
</option>
<%
}
@@ -140,7 +140,7 @@
Role role = (Role)iterator.next();
%>
<option value="<%= role.getName() %>" <%if(writeRoleSet.contains(role.getName())){%>selected<%}%>>
- <%= role.getDisplayName() %>
+ <%= EntityEncoder.FULL.encode(role.getDisplayName()) %>
</option>
<%
}
@@ -165,7 +165,7 @@
%>
<option value="<%= user.getUserName() %>"
<%if(writeUserSet.contains(user.getUserName())){%>selected<%}%>>
- <%= user.getUserName() %>
+ <%= EntityEncoder.FULL.encode(user.getUserName()) %>
</option>
<%
}
@@ -202,7 +202,7 @@
Role role = (Role)iterator.next();
%>
<option value="<%= role.getName() %>" <%if(manageRoleSet.contains(role.getName())){%>selected<%}%>>
- <%= role.getDisplayName() %>
+ <%= EntityEncoder.FULL.encode(role.getDisplayName()) %>
</option>
<%
}
@@ -227,7 +227,7 @@
%>
<option value="<%= user.getUserName() %>"
<%if(manageUserSet.contains(user.getUserName())){%>selected<%}%>>
- <%= user.getUserName() %>
+ <%= EntityEncoder.FULL.encode(user.getUserName()) %>
</option>
<%
}
Modified: tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 17:28:21 UTC (rev 12706)
+++ tags/Enterprise_Portal_Platform_4_3_GA/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 17:32:33 UTC (rev 12707)
@@ -65,6 +65,12 @@
registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService");
// if (username.length() >= 5 && (Pattern.matches(NICKNAME_VALIDATION, username)))
+ if (username.contains("<") || username.contains(">"))
+ {
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
+ }
try
{
// checking jBPM context
15 years, 4 months
JBoss Portal SVN: r12706 - in branches/Enterprise_Portal_Platform_4_3: core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-29 12:28:21 -0500 (Thu, 29 Jan 2009)
New Revision: 12706
Modified:
branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
Encode entities, validate username against < and >
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-01-29 17:10:50 UTC (rev 12705)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2009-01-29 17:28:21 UTC (rev 12706)
@@ -1,4 +1,5 @@
<%@ page import="org.jboss.portal.api.PortalURL" %>
+<%@ page import="org.jboss.portal.common.text.EntityEncoder" %>
<%@ page import="org.jboss.portal.identity.User" %>
<%@page import="java.util.ResourceBundle"%>
<%@ page import="java.security.Principal" %>
@@ -35,10 +36,10 @@
</script>
<noscript>
- <a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a>
+ <a href="<%= loginURL %>"><%= EntityEncoder.FULL.encode(rb.getString("LOGIN")) %></a>
</noscript>
<%}else{%>
-<a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a>
+<a href="<%= loginURL %>"><%= EntityEncoder.FULL.encode(rb.getString("LOGIN")) %></a>
<%}%>
Modified: branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-01-29 17:10:50 UTC (rev 12705)
+++ branches/Enterprise_Portal_Platform_4_3/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2009-01-29 17:28:21 UTC (rev 12706)
@@ -78,7 +78,7 @@
Role role = (Role)iterator.next();
%>
<option value="<%= role.getName() %>" <%if(readRoleSet.contains(role.getName())){%>selected<%}%>>
- <%= role.getDisplayName() %>
+ <%= EntityEncoder.FULL.encode(role.getDisplayName()) %>
</option>
<%
}
@@ -103,7 +103,7 @@
%>
<option value="<%= user.getUserName() %>"
<%if(readUserSet.contains(user.getUserName())){%>selected<%}%>>
- <%= user.getUserName() %>
+ <%= EntityEncoder.FULL.encode(user.getUserName()) %>
</option>
<%
}
@@ -140,7 +140,7 @@
Role role = (Role)iterator.next();
%>
<option value="<%= role.getName() %>" <%if(writeRoleSet.contains(role.getName())){%>selected<%}%>>
- <%= role.getDisplayName() %>
+ <%= EntityEncoder.FULL.encode(role.getDisplayName()) %>
</option>
<%
}
@@ -165,7 +165,7 @@
%>
<option value="<%= user.getUserName() %>"
<%if(writeUserSet.contains(user.getUserName())){%>selected<%}%>>
- <%= user.getUserName() %>
+ <%= EntityEncoder.FULL.encode(user.getUserName()) %>
</option>
<%
}
@@ -202,7 +202,7 @@
Role role = (Role)iterator.next();
%>
<option value="<%= role.getName() %>" <%if(manageRoleSet.contains(role.getName())){%>selected<%}%>>
- <%= role.getDisplayName() %>
+ <%= EntityEncoder.FULL.encode(role.getDisplayName()) %>
</option>
<%
}
@@ -227,7 +227,7 @@
%>
<option value="<%= user.getUserName() %>"
<%if(manageUserSet.contains(user.getUserName())){%>selected<%}%>>
- <%= user.getUserName() %>
+ <%= EntityEncoder.FULL.encode(user.getUserName()) %>
</option>
<%
}
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 17:10:50 UTC (rev 12705)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/validators/UsernameValidator.java 2009-01-29 17:28:21 UTC (rev 12706)
@@ -65,6 +65,12 @@
registrationService = (RegistrationService) portletContext.getAttribute("RegistrationService");
// if (username.length() >= 5 && (Pattern.matches(NICKNAME_VALIDATION, username)))
+ if (username.contains("<") || username.contains(">"))
+ {
+ throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR,
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR"),
+ bundle.getString("IDENTITY_VALIDATION_ERROR_USERNAME_ERROR")));
+ }
try
{
// checking jBPM context
15 years, 4 months
JBoss Portal SVN: r12705 - branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-01-29 12:10:50 -0500 (Thu, 29 Jan 2009)
New Revision: 12705
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
Log:
filling file content
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-01-29 16:59:21 UTC (rev 12704)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-01-29 17:10:50 UTC (rev 12705)
@@ -16,6 +16,7 @@
private static final String TBL_CMS_FILEVER = "//div[@id='center']/div/div/table";
public static final String TBL_CMS_FILE = "//div[@id='center']/div/div/div[3]/table";
public static final String TBL_FILE_PENDING = "//div[@id='center']/div/div/table[2]";
+ public static final String EDITOR_CONTENT = "mce_editor_0";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -110,6 +111,9 @@
selenium.type("description", "newFile description");
selenium.type("title", "newFile title");
selenium.select("language", "label=Czech");
+
+ fillInEditor(EDITOR_CONTENT,"now i'm not empty!");
+
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
/*
@@ -148,6 +152,9 @@
selenium.type("description", "file2edit description");
selenium.type("title", "file2edit title");
selenium.select("language", "label=Czech");
+
+ fillInEditor(EDITOR_CONTENT,"edit me, please!");
+
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -190,6 +197,9 @@
selenium.type("description", "existingFile description");
selenium.type("title", "existingFile title");
selenium.select("language", "label=Czech");
+
+ fillInEditor(EDITOR_CONTENT,"i already exist!");
+
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
@@ -217,6 +227,9 @@
selenium.type("description", "fileToMove description");
selenium.type("title", "fileToMove title");
selenium.select("language", "label=Czech");
+
+ fillInEditor(EDITOR_CONTENT,"move on!");
+
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
@@ -261,6 +274,9 @@
selenium.type("description", "file2copy description");
selenium.type("title", "file2copy title");
selenium.select("language", "label=Czech");
+
+ fillInEditor(EDITOR_CONTENT,"want to be a copy?");
+
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -351,6 +367,9 @@
selenium.type("description", name + " description");
selenium.type("title", "existingFile title");
selenium.select("language", "label=Czech");
+
+ fillInEditor(EDITOR_CONTENT,"contemporary content");
+
selenium.click("save");
selenium.waitForPageToLoad(PAGE_LOAD);
Assert.assertEquals("Czech", selenium.getText("link=Czech"));
@@ -383,4 +402,8 @@
selenium.waitForPageToLoad(PAGE_LOAD);
logout();login("admin","admin");
}
+
+ private void fillInEditor(String locator, String content){
+ selenium.getEval("selenium.fillInEditor(\"" + locator + "\",\"" + content + "\")");
+ }
}
15 years, 4 months
JBoss Portal SVN: r12704 - tags/Enterprise_Portal_Platform_4_3_GA/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-29 11:59:21 -0500 (Thu, 29 Jan 2009)
New Revision: 12704
Modified:
tags/Enterprise_Portal_Platform_4_3_GA/build/build-thirdparty.xml
Log:
Using CMS 1.2.4
Modified: tags/Enterprise_Portal_Platform_4_3_GA/build/build-thirdparty.xml
===================================================================
--- tags/Enterprise_Portal_Platform_4_3_GA/build/build-thirdparty.xml 2009-01-29 16:44:33 UTC (rev 12703)
+++ tags/Enterprise_Portal_Platform_4_3_GA/build/build-thirdparty.xml 2009-01-29 16:59:21 UTC (rev 12704)
@@ -46,7 +46,7 @@
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.5"/>
<componentref name="jboss-portal/modules/identity" version="1.0.7"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.3"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.4"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
15 years, 4 months
JBoss Portal SVN: r12703 - docs/enterprise/trunk/Read_Me/en-US.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-29 11:44:33 -0500 (Thu, 29 Jan 2009)
New Revision: 12703
Modified:
docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml
Log:
CMS 1.2.4
Modified: docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml
===================================================================
--- docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml 2009-01-29 16:41:22 UTC (rev 12702)
+++ docs/enterprise/trunk/Read_Me/en-US/Release_Notes_GA.xml 2009-01-29 16:44:33 UTC (rev 12703)
@@ -34,7 +34,7 @@
<section id="New_Features">
<title>New Features in JBoss Enterprise Portal Platform 4.3</title>
<section id="JSR-286">
- <title>Portlet 2.0 -JSR 286</title>
+ <title>Portlet 2.0 - JSR 286</title>
<para>
The main improvement of the Enterprise Portal Platform is the support of Portlet 2.0 specification which enables Inter Portlet Communication by sharing parameters and event support.
</para>
@@ -66,8 +66,13 @@
Web Module 1.2.3
</para>
</listitem>
+ </listitem>
<listitem>
<para>
+ CMS Module 1.2.4
+ </para>
+ </listitem> <listitem>
+ <para>
JBoss Portlet Bridge 1.0.B6
</para>
</listitem>
15 years, 4 months
JBoss Portal SVN: r12702 - branches/Enterprise_Portal_Platform_4_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-29 11:41:22 -0500 (Thu, 29 Jan 2009)
New Revision: 12702
Modified:
branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
Log:
Using CMS 1.2.4
Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-01-29 16:30:52 UTC (rev 12701)
+++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-01-29 16:41:22 UTC (rev 12702)
@@ -46,7 +46,7 @@
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.5"/>
<componentref name="jboss-portal/modules/identity" version="1.0.7"/>
- <componentref name="jboss-portal/modules/cms" version="1.2.3"/>
+ <componentref name="jboss-portal/modules/cms" version="1.2.4"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
<componentref name="jackrabbit" version="1.4"/>
15 years, 4 months
JBoss Portal SVN: r12701 - modules/cms/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-29 11:30:52 -0500 (Thu, 29 Jan 2009)
New Revision: 12701
Modified:
modules/cms/trunk/build/pom.xml
Log:
oups
Modified: modules/cms/trunk/build/pom.xml
===================================================================
--- modules/cms/trunk/build/pom.xml 2009-01-29 16:30:25 UTC (rev 12700)
+++ modules/cms/trunk/build/pom.xml 2009-01-29 16:30:52 UTC (rev 12701)
@@ -29,7 +29,7 @@
<version.log4j>1.2.14</version.log4j>
<version.slf4j>1.3.0</version.slf4j>
<version.jboss.cache>1.4.1.SP3</version.jboss.cache>
- <version.jgroups>>2.4.4.GA-brew</version.jgroups>
+ <version.jgroups>2.4.4.GA-brew</version.jgroups>
<version.jboss.hibernate>3.2.4.SP1</version.jboss.hibernate>
<version.jbpm>3.2.2</version.jbpm>
<version.jboss.jbossas>4.2.2.GA</version.jboss.jbossas>
15 years, 4 months