May 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r10833 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/layouts/3columns and 15 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-29 05:32:44 -0400 (Thu, 29 May 2008) New Revision: 10833 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/ 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_it.properties Removed: 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_it.properties Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp Log: - i18n based on Luca's work Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -51,7 +53,7 @@ </div>  -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -58,7 +60,7 @@ </div>  -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -46,7 +48,7 @@ </div> </div> -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -38,7 +40,7 @@ <p:region regionName='maximized' regionID='regionMaximized'/> <hr class="cleaner"/> - <div id="footer-container" class="portal-copyright">Powered by + <div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> <span id="ThemeBy"></span> </div> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/login/error.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,6 +1,7 @@ +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <html> <head></head> <body> -bad login +${n:i18n("BAD_LOGIN")} </body> </html> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/nodesk/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -21,6 +21,7 @@ %> <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page import="java.util.Iterator, java.io.Writer, @@ -261,8 +262,8 @@ <% } %> <tr> - <td class="portal-copyright" height="10" colspan="<%= nbCol %>" align="center" valign="top">Powered by <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> - Theme by <a class="portal-copyright" href="http://www.nodesk.org">Nodesk</a> + <td class="portal-copyright" height="10" colspan="<%= nbCol %>" align="center" valign="top">${n:i18n("POWERED_BY")} <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> + ${n:i18n("THEME_BY")} <a class="portal-copyright" href="http://www.nodesk.org">Nodesk</a> </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/phalanx/index.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,4 +1,5 @@ <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page import="org.jboss.portal.server.PortalConstants" %> <%@ page import="java.util.ResourceBundle"%> @@ -125,7 +126,7 @@ <tr> <td align="left"><div class="portlet-font-dim" style="font-size:10px"> Copyright 2005, JBoss Inc.<br> - Powered by <a href="http://www.jboss.com/products/jbossportal" target="_blank">JBoss Portal</a> + ${n:i18n("POWERED_BY")} <a href="http://www.jboss.com/products/jbossportal" target="_blank">JBoss Portal</a> </div></td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -29,4 +29,4 @@ LOGIN_USERNAME=Username LOGIN_PASSWORD=Password LOGIN_CANCEL=Cancel -LOGIN_SUBMIT=Submit \ No newline at end of file +LOGIN_SUBMIT=Submit Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -29,4 +29,4 @@ LOGIN_USERNAME=Nome utente LOGIN_PASSWORD=Password LOGIN_CANCEL=Annulla -LOGIN_SUBMIT=Invia \ No newline at end of file +LOGIN_SUBMIT=Invia Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -321,4 +321,17 @@ PERMISSION_DOMAIN_MOD=Modify Domain PERMISSION_DEFINEDROLES=Defined roles PERMISSION_IMPLIEDROLES=Implied roles - \ No newline at end of file + +POWERED_BY=Powered by +BAD_LOGIN=bad login +THEME_BY=Theme by +PORTLET_INSTANCE_ASSOCIATED=Portlet instance associated to this window +PORTLET_NAME=Portlet name +PORTLET_DESCRIPTION=Portlet description +DASHBOARD=Dashboard +CONFIGURE_DASHBOARD=Configure dashboard +COPY_TO_DASHBOARD=Copy to my dashboard +PORTAL=Portal +ADMIN=Admin +MEMBERS=Members +LOGGED=Logged in as \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -130,7 +130,7 @@ Delete=Cancella Edit=Modifica Ok=Ok -Cancel=Cancella +Cancel=Annulla AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente? UserDeleted=Utente cancellato con successo ReturnToMemberList=Ritorna alla lista dei membri @@ -245,7 +245,7 @@ REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti -MENU_LOGOUT=Logout +MENU_LOGOUT=Uscita MENU_EDITPROFILE=Modifica il tuo profilo MENU_LISTUSERS=Lista di tutti gli utenti @@ -321,4 +321,17 @@ PERMISSION_DOMAIN_MOD=Modifica Dominio PERMISSION_DEFINEDROLES=Ruoli definiti PERMISSION_IMPLIEDROLES=Ruoli impliciti - \ No newline at end of file + +POWERED_BY=Sviluppato da +BAD_LOGIN=login sbagliato +THEME_BY=Tema di +PORTLET_INSTANCE_ASSOCIATED=Istanza di Portlet associata a questa finestra +PORTLET_NAME=Nome della Portlet +PORTLET_DESCRIPTION=Descrizione della Portlet +DASHBOARD=Dashboard +CONFIGURE_DASHBOARD=Configura la dashboard +COPY_TO_DASHBOARD=Copia nella mia dashboard +PORTAL=Portale +ADMIN=Amministrazione +MEMBERS=Membri +LOGGED=Benvenuto \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -17,6 +17,7 @@ <%@page import="org.jboss.portal.portlet.info.PortletInfo" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Locale" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <portlet:defineObjects/> <script type='text/javascript' src='/portal-admin/js/domLib.js'></script> <script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script> @@ -62,7 +63,7 @@ <table style="width:500px;"> <tr> - <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td> + <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td> </tr> <% Locale locale = renderRequest.getLocale(); @@ -94,14 +95,13 @@ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/> <span><%= displayName %></span> - <div> - <span class="portlet-form-field-label">Portlet name:</span><%= displayName %> - </div> - <div> - <span class="portlet-form-field-label">Portlet description:</span> - <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> - </div> - + <div> + <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %> + </div> + <div> + <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span> + <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> + </div> </td> </tr> <% @@ -151,7 +151,6 @@ </div> </div> </div> - <tr class="<%= rowClass %>"> <td> <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/> @@ -199,4 +198,4 @@ return value; } -%> \ No newline at end of file +%> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,7 +1,9 @@ <%@ page import="org.jboss.portal.api.PortalURL" %> <%@ page import="org.jboss.portal.identity.User" %> +<%@page import="java.util.ResourceBundle"%> <% + ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); User user = (User)request.getAttribute("org.jboss.portal.header.USER"); PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL"); PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL"); @@ -32,10 +34,10 @@ </script> <noscript> - <a href="<%= loginURL %>">Login</a> + <a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a> </noscript> <%}else{%> -<a href="<%= loginURL %>">Login</a> +<a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a> <%}%> @@ -50,34 +52,34 @@ document.getElementById('loginIframe').src = ''; /* ]]> */ </script> -Logged in as: <%= user.getUserName() %><br/><br/> +<%= rb.getString("LOGGED") %>: <%= user.getUserName() %><br/><br/> <% if (dashboardURL != null) { -%>  <a href="<%= dashboardURL %>">Dashboard</a>  |<% +%>  <a href="<%= dashboardURL %>"><%= rb.getString("DASHBOARD") %></a>  |<% } if (defaultPortalURL != null) { -%>  <a href="<%= defaultPortalURL %>">Portal</a>  |<% +%>  <a href="<%= defaultPortalURL %>"><%= rb.getString("PORTAL") %></a>  |<% } if (adminPortalURL != null) { -%>  <a href="<%= adminPortalURL %>">Admin</a>  |<% +%>  <a href="<%= adminPortalURL %>"><%= rb.getString("ADMIN") %></a>  |<% } if (editDashboardURL != null) { -%>  <a href="<%= editDashboardURL %>">Configure dashboard</a>  |<% +%>  <a href="<%= editDashboardURL %>"><%= rb.getString("CONFIGURE_DASHBOARD") %></a>  |<% } if (copyToDashboardURL != null) { -%>  <a href="<%= copyToDashboardURL %>">Copy to my dashboard</a>  |<% +%>  <a href="<%= copyToDashboardURL %>"><%= rb.getString("COPY_TO_DASHBOARD") %></a>  |<% } -%>  <a href="<%= signOutURL %>">Logout</a> +%>  <a href="<%= signOutURL %>"><%= rb.getString("MENU_LOGOUT") %></a> <% } %> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-29 09:32:44 UTC (rev 10833) @@ -21,6 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> <%@ page pageEncoding="utf-8" %> +<%@page import="java.util.ResourceBundle"%> + +<% + ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale()); +%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%@page import="org.jboss.portal.identity.UserStatus"%> @@ -63,7 +68,7 @@ <div class="login-header"> - <h2><%= rb.getString("LOGIN_TITLE") %></h2> + <h2><%= rb.getString("LOGIN_TITLE") %></h2> </div> <div class="login-content"> @@ -88,11 +93,11 @@ <form method="post" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm" target="_parent"> <div class="form-field"> - <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>:</label> + <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %></label> <input type="text" name="j_username" id="j_username" value=""/> </div> <div class="form-field bottom-field"> - <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>:</label> + <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %></label> <input type="password" name="j_password" id="j_password" value=""/> </div> <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes (from rev 10830, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes) Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-28 23:07:49 UTC (rev 10830) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,201 +0,0 @@ -################################################################################ -# JBoss, a division of Red Hat # -# Copyright 2006, 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. # -################################################################################ - -PORTLET_INSTANCES=Portlet Instances -INSTANCE_DELETE=instance Delete -PORTLET_CAUSING_REFERENCING_NOT_ABLE=portlet instance causing windows referencing it to not be able to display their content anymore -ARE_YOU_SURE_DELETE=Are you sure you want to delete this portlet instance -DASHBOARD_THEME_PROPERTIES=Dashboard theme properties -CONFIGURE_DASHBOARD_SETTINGS=Configure dashboards settings -DASHBOARDS=Dashboards -ADD_DISPLAY_NAMES=Add Display Names -CURRENT_DISPLAY_NAMES=Current Display Names -MANAGE=Manage -PORTALS=portals -PORTAL=portal -SUB_PORTALS=sub-portals -PAGES_WITHIN=pages within -CREATE_PORTAL_NAMED=Create a portal named -PAGE_LAYOUT=Page layout -SECURITY=Security -THEME=Theme -RENAME=Rename -DISPLAY_NAMES=Display Names -MANAGE_SUB_PAGES_WITHIN=Manage sub-pages within -CREATE_PAGE_NAMED=Create a page named -SET_PAGE_PERMISSIONS=Please set the page permissions -PAGE_THEME_PROPERTIES=Page theme properties -SET_PORTAL_PERMISSIONS=Please set the portal permissions -PORTAL_THEME_PROPERTIES=Portal theme properties -SETTINGS_ARE_INHERITED_BY_ALL_PAGES=These settings are inherited by all the pages and windows of this portal. You may override these settings by selecting the appropriate value on the respective Theme settings pages -EVENT_LISTENER_BINDING=Event Listener Binding -CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this -SET_PERMISSIONS_FOR=Please set the permissions for the -WINDOW=window -WINDOW_THEME_PROPERTIES=Window theme properties -INSTANCE_ID=Instance id -INSTANCE_NAME=Instance name -ACTIONS=Actions -PREFERENCES=Preferences -PORTLET_DETAILS=portlet details -ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available -PREFERENCES=preferences -SECURITY_SETTINGS=security settings -MAKE_DEFAULT=Make Default -MANAGE_WINDOWS_WITHIN=Manage windows within -PORTAL_OBJECTS=Portal Objects -PORTALS=Portals -PORTLET_NAME=Portlet name -DESCRIPTION=Description -REMOTE=Remote -REMOTABLE=Remotable -ACTIONS=Actions -CREATE_INSTANCE=Create instance -PORTLET_DEFINITIONS=Portlet Definitions -DETAILS=details -INSTANCE_CREATION=instance creation -CREATE_INSTANCE_NAMED=Create an instance named -RENAME_THE=Rename the -TO=to -THIS_MINIMIZED_STATE=This window is set to a minimized state -THIS_NORMAL_STATE=This window defaults to a normal state -THIS_MAXIMIZED_STATE=This window is set to a maximized state -THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=This window defaults to a minimized state because one window within this page is set to maximized -SWITCH_TO_WIZARD_MODE=Switch to wizard mode -CREATE_PORTAL=Create portal -CREATE_PAGE=Create page -DEFAULT=Default -WINDOW=Window -VIEW_PORTLETS_PROVIDED_BY=View portlets provided by the portlet provider named -VIEW_PORTLETS=View portlets - -COMMON_INCONSISTENT_STATE=Inconsistent state -COMMON_DELETE=Delete -COMMON_DELETING=WARNING! You are about to delete the -COMMON_FROM=from the -COMMON_SURE_DELETE=Are you sure you want to delete this -COMMON_ERROR_HANDLING=Page Error Handling -COMMON_CONFIGURE_ERRORS=Configure how the system handles errors on page level -COMMON_CASE=Case -COMMON_INHERITANCE=Inheritance -COMMON_ACTION=Action -COMMON_INHERIT_ACTION=inherit action from parent -COMMON_CONTENT_DEFINITION=Content Definition -COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) -COMMON_WINDOW_NAME=Window Name -COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page -COMMON_CONTENT_TYPE=Content Type -COMMON_SELECT_CONTENT=Select content that will be added to the page -COMMON_PAGE_LAYOUT=Page Layout -COMMON_REGION=Region -COMMON_UNASSIGNED_WINDOW=Unassigned windows -COMMON_PORTAL_ERROR_HANDLING=Portal Error Handling -COMMON_PORTAL_CONFIGURE_ERRORS=Configure how the system handles errors on portal level -COMMON_KEY=Key -COMMON_NAME=Name -COMMON_READONLY=ReadOnly -COMMON_VALUE=Value -COMMON_NO_DEFINED_PREFERENCES=No defined preferences for this portlet -COMMON_EDIT_EXISTING_VALUES=Edit existing values -COMMON_APPEND_VALUE=Append a value -COMMON_PROPERTIES=Properties -COMMON_ADD_PROPERTY=Add a property -COMMON_SELECT_PREDEFINED_PROPERTY=Select predefined property -COMMON_OR=or -COMMON_ENTER_PROPERTY_NAME=Enter property name -COMMON_MANAGE_PROPERTIES=Manage currently defined properties -COMMON_DESCRIPTION=Description -COMMON_INHERITED=Inherited -COMMON_YES=Yes -COMMON_NO=No -COMMON_ROLES=Roles -COMMON_PERMISSIONS=Permissions -COMMON_ROLE=Role -COMMON_SETTING=Setting -COMMON_LAYOUT=Layout -COMMON_NAME_LAYOUT_IMPLEMENTATION=Name of the layout implementation used to arrange portlet windows in pages -COMMON_THEME=Theme -COMMON_NAME_LOOK_AND_FEEL=Name of the look and feel to use -COMMON_RENDERSET=RenderSet -COMMON_NAME_RENDER_ENGINE_PAGES=Name of the render engine to use to render pages -COMMON_WINDOW_RENDERER=Window Renderer -COMMON_NAME_RENDER_ENGINE_WINDOWS=Name of the render engine to use to render windows -COMMON_DECORATION_RENDERER=Decoration Renderer -COMMON_NAME_RENDER_ENGINE_DECORATIONS=Name of the render engine to use to render window decorations -COMMON_PORTLET_RENDERER=Portlet Renderer -COMMON_NAME_RENDER_ENGINE_PORTLETS=Name of the render engine to use to render portlets -COMMON_PORTLET_INSTANCE_INFORMATION=Portlet Instance Information -COMMON_PORTLET_NAME=Portlet name -COMMON_PORTLET_DESCRIPTION=Portlet description -COMMON_PORTLET_TITLE=Portlet title -COMMON_PORTLET_KEYWORDS=Portlet keywords -COMMON_PORTLET_LOCALES=Portlet locales -COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Portlet Instance Display Names -COMMON_ADD_INSTANCE_DISPLAY_NAMES=Add Instance Display Names -COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Current Instance Display Names -COMMON_CANCEL=Cancel -COMMON_UPDATE=Update -COMMON_ADD=Add -COMMON_ADD_PROPERTY=Add Property -COMMON_UP=Up -COMMON_DOWN=Down -COMMON_NEW_VALUE=New value -COMMON_APPEND=Append -COMMON_LOCALE=Locale -COMMON_DISPLAY_NAME=Display Name - -DASHBOARD_PERSONAL_EDITOR=Personal Dashboard Editor -DASHBOARD_CREATE_NEW_PAGE=Create a New Page -DASHBOARD_CREATE_PAGE=Page name -DASHBOARD_RENAME_THIS_PAGE=Rename this Page -DASHBOARD_NEW_PAGE_NAME=New page name -DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Use this page to manage the content and appearance of your dashboard pages -DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=You can control the page titles, column layouts, page themes,and add,order, or remove portlets -DASHBOARD_CURRENTLY_EDITING_PAGE=Currently editing page -DASHBOARD_THEME_AND_LAYOUT=Theme and Layout -DASHBOARD_APPLY_THEME=Apply a theme to your dashboard, or select the number of columns for the layout -DASHBOARD_CHOOSE_LAYOUT=Choose a layout -DASHBOARD_CHOOSE_THEME=Choose a theme -DASHBOARD_CANNOT_UNDO_ACTION=You cannot undo this action -DASHBOARD_DELETE_THIS_PAGE=Delete this Page -DASHBOARD_SAVE=Save -DASHBOARD_SELECT=Select - -WIZARD_ADDING_NEW_PORTLET=Adding a new Portlet -WIZARD_STEP=Step -WIZARD_SELECT_PORTLET=Select Portlet -WIZARD_SELECT_PORTAL=Select Portal -WIZARD_SELECT_PAGE=Select Page -WIZARD_SELECT_REGION=Select Region -WIZARD_CONFIRM=Confirm -WIZARD_CONTENT=Content -WIZARD_SWITCH_ADVANCED_MODE=Switch to advanced mode -WIZARD_PORTLET=Portlet -WIZARD_PORTAL=Portal -WIZARD_PAGE=Page -WIZARD_REGION=Region -WIZARD_PREVIOUS=Previous -WIZARD_NEXT=Next -WIZARD_SUB_PAGES=Sub-Pages -WIZARD_PORTLET_PROVIDER=Portlet provider -WIZARD_CHANGE=Change \ No newline at end of file Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties (from rev 10830, branches/JBoss_Portal_Branch_2_6/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 (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -0,0 +1,208 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +PORTLET_INSTANCES=Portlet Instances +INSTANCE_DELETE=instance Delete +PORTLET_CAUSING_REFERENCING_NOT_ABLE=portlet instance causing windows referencing it to not be able to display their content anymore +ARE_YOU_SURE_DELETE=Are you sure you want to delete this portlet instance +DASHBOARD_THEME_PROPERTIES=Dashboard theme properties +CONFIGURE_DASHBOARD_SETTINGS=Configure dashboards settings +DASHBOARDS=Dashboards +ADD_DISPLAY_NAMES=Add Display Names +CURRENT_DISPLAY_NAMES=Current Display Names +MANAGE=Manage +PORTALS=portals +PORTAL=portal +SUB_PORTALS=sub-portals +PAGES_WITHIN=pages within +CREATE_PORTAL_NAMED=Create a portal named +PAGE_LAYOUT=Page layout +SECURITY=Security +THEME=Theme +RENAME=Rename +DISPLAY_NAMES=Display Names +MANAGE_SUB_PAGES_WITHIN=Manage sub-pages within +CREATE_PAGE_NAMED=Create a page named +SET_PAGE_PERMISSIONS=Please set the page permissions +PAGE_THEME_PROPERTIES=Page theme properties +SET_PORTAL_PERMISSIONS=Please set the portal permissions +PORTAL_THEME_PROPERTIES=Portal theme properties +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=These settings are inherited by all the pages and windows of this portal. You may override these settings by selecting the appropriate value on the respective Theme settings pages +EVENT_LISTENER_BINDING=Event Listener Binding +CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this +SET_PERMISSIONS_FOR=Please set the permissions for the +WINDOW=window +WINDOW_THEME_PROPERTIES=Window theme properties +INSTANCE_ID=Instance id +INSTANCE_NAME=Instance name +ACTIONS=Actions +PREFERENCES=Preferences +PORTLET_DETAILS=portlet details +ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available +PREFERENCES=preferences +SECURITY_SETTINGS=security settings +MAKE_DEFAULT=Make Default +MANAGE_WINDOWS_WITHIN=Manage windows within +PORTAL_OBJECTS=Portal Objects +PORTALS=Portals +PORTLET_NAME=Portlet name +DESCRIPTION=Description +REMOTE=Remote +REMOTABLE=Remotable +ACTIONS=Actions +CREATE_INSTANCE=Create instance +PORTLET_DEFINITIONS=Portlet Definitions +DETAILS=details +INSTANCE_CREATION=instance creation +CREATE_INSTANCE_NAMED=Create an instance named +RENAME_THE=Rename the +TO=to +THIS_MINIMIZED_STATE=This window is set to a minimized state +THIS_NORMAL_STATE=This window defaults to a normal state +THIS_MAXIMIZED_STATE=This window is set to a maximized state +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=This window defaults to a minimized state because one window within this page is set to maximized +SWITCH_TO_WIZARD_MODE=Switch to wizard mode +CREATE_PORTAL=Create portal +CREATE_PAGE=Create page +DEFAULT=Default +WINDOW=Window +VIEW_PORTLETS_PROVIDED_BY=View portlets provided by the portlet provider named +VIEW_PORTLETS=View portlets + +COMMON_INCONSISTENT_STATE=Inconsistent state +COMMON_DELETE=Delete +COMMON_DELETING=WARNING! You are about to delete the +COMMON_FROM=from the +COMMON_SURE_DELETE=Are you sure you want to delete this +COMMON_ERROR_HANDLING=Page Error Handling +COMMON_CONFIGURE_ERRORS=Configure how the system handles errors on page level +COMMON_CASE=Case +COMMON_INHERITANCE=Inheritance +COMMON_ACTION=Action +COMMON_INHERIT_ACTION=inherit action from parent +COMMON_CONTENT_DEFINITION=Content Definition +COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) +COMMON_WINDOW_NAME=Window Name +COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page +COMMON_CONTENT_TYPE=Content Type +COMMON_SELECT_CONTENT=Select content that will be added to the page +COMMON_PAGE_LAYOUT=Page Layout +COMMON_REGION=Region +COMMON_UNASSIGNED_WINDOW=Unassigned windows +COMMON_PORTAL_ERROR_HANDLING=Portal Error Handling +COMMON_PORTAL_CONFIGURE_ERRORS=Configure how the system handles errors on portal level +COMMON_KEY=Key +COMMON_NAME=Name +COMMON_READONLY=ReadOnly +COMMON_VALUE=Value +COMMON_NO_DEFINED_PREFERENCES=No defined preferences for this portlet +COMMON_EDIT_EXISTING_VALUES=Edit existing values +COMMON_APPEND_VALUE=Append a value +COMMON_PROPERTIES=Properties +COMMON_ADD_PROPERTY=Add a property +COMMON_SELECT_PREDEFINED_PROPERTY=Select predefined property +COMMON_OR=or +COMMON_ENTER_PROPERTY_NAME=Enter property name +COMMON_MANAGE_PROPERTIES=Manage currently defined properties +COMMON_DESCRIPTION=Description +COMMON_INHERITED=Inherited +COMMON_YES=Yes +COMMON_NO=No +COMMON_ROLES=Roles +COMMON_PERMISSIONS=Permissions +COMMON_ROLE=Role +COMMON_SETTING=Setting +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Name of the layout implementation used to arrange portlet windows in pages +COMMON_THEME=Theme +COMMON_NAME_LOOK_AND_FEEL=Name of the look and feel to use +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Name of the render engine to use to render pages +COMMON_WINDOW_RENDERER=Window Renderer +COMMON_NAME_RENDER_ENGINE_WINDOWS=Name of the render engine to use to render windows +COMMON_DECORATION_RENDERER=Decoration Renderer +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Name of the render engine to use to render window decorations +COMMON_PORTLET_RENDERER=Portlet Renderer +COMMON_NAME_RENDER_ENGINE_PORTLETS=Name of the render engine to use to render portlets +COMMON_PORTLET_INSTANCE_INFORMATION=Portlet Instance Information +COMMON_PORTLET_NAME=Portlet name +COMMON_PORTLET_DESCRIPTION=Portlet description +COMMON_PORTLET_TITLE=Portlet title +COMMON_PORTLET_KEYWORDS=Portlet keywords +COMMON_PORTLET_LOCALES=Portlet locales +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Portlet Instance Display Names +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Add Instance Display Names +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Current Instance Display Names +COMMON_CANCEL=Cancel +COMMON_UPDATE=Update +COMMON_ADD=Add +COMMON_ADD_PROPERTY=Add Property +COMMON_UP=Up +COMMON_DOWN=Down +COMMON_NEW_VALUE=New value +COMMON_APPEND=Append +COMMON_LOCALE=Locale +COMMON_DISPLAY_NAME=Display Name +COMMON_MEDIA_TYPES=Media Types +COMMON_WINDOW_STATES=Window States +COMMON_PORTLET_MODES=Portlet Modes +COMMON_PREFERENCES=Preferences +COMMON_PUBLIC_RENDER_PARAMETERS=Public Render Parameters +COMMON_ID=Id + + +DASHBOARD_PERSONAL_EDITOR=Personal Dashboard Editor +DASHBOARD_CREATE_NEW_PAGE=Create a New Page +DASHBOARD_CREATE_PAGE=Page name +DASHBOARD_RENAME_THIS_PAGE=Rename this Page +DASHBOARD_NEW_PAGE_NAME=New page name +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Use this page to manage the content and appearance of your dashboard pages +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=You can control the page titles, column layouts, page themes,and add,order, or remove portlets +DASHBOARD_CURRENTLY_EDITING_PAGE=Currently editing page +DASHBOARD_THEME_AND_LAYOUT=Theme and Layout +DASHBOARD_APPLY_THEME=Apply a theme to your dashboard, or select the number of columns for the layout +DASHBOARD_CHOOSE_LAYOUT=Choose a layout +DASHBOARD_CHOOSE_THEME=Choose a theme +DASHBOARD_CANNOT_UNDO_ACTION=You cannot undo this action +DASHBOARD_DELETE_THIS_PAGE=Delete this Page +DASHBOARD_SAVE=Save +DASHBOARD_SELECT=Select + +WIZARD_ADDING_NEW_PORTLET=Adding a new Portlet +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=Select Portlet +WIZARD_SELECT_PORTAL=Select Portal +WIZARD_SELECT_PAGE=Select Page +WIZARD_SELECT_REGION=Select Region +WIZARD_CONFIRM=Confirm +WIZARD_CONTENT=Content +WIZARD_SWITCH_ADVANCED_MODE=Switch to advanced mode +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portal +WIZARD_PAGE=Page +WIZARD_REGION=Region +WIZARD_PREVIOUS=Previous +WIZARD_NEXT=Next +WIZARD_SUB_PAGES=Sub-Pages +WIZARD_PORTLET_PROVIDER=Portlet provider +WIZARD_CHANGE=Change \ No newline at end of file Deleted: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-28 23:07:49 UTC (rev 10830) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,199 +0,0 @@ -################################################################################ -# JBoss, a division of Red Hat # -# Copyright 2006, 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. # -################################################################################ - -PORTLET_INSTANCES=Istanze di Portlet -INSTANCE_DELETE=Cancella Istanza -PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto -ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet -DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard -CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard -DASHBOARDS=Dashboard -ADD_DISPLAY_NAMES=Aggiungi i nomi da visualizzare -CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati -MANAGE=Gestisci -PORTALS=portali -PORTAL=portale -SUB_PORTALS=sotto-portali -PAGES_WITHIN=pagine dentro -CREATE_PORTAL_NAMED=Crea un portale chiamato -PAGE_LAYOUT=Layout della pagina -SECURITY=Sicurezza -THEME=Tema -RENAME=Rinomina -DISPLAY_NAMES=Nomi visualizzati -DELETE=Cancella -MANAGE_SUB_PAGES_WITHIN=Gestisci le sotto-pagine dentro -CREATE_PAGE_NAMED=Crea una pagina chiamata -SET_PAGE_PERMISSIONS=Configura i permessi per la pagina -PAGE_THEME_PROPERTIES=Propriet\u00e0 del tema della Pagina -SET_PORTAL_PERMISSIONS=Configura i permessi per il portale -PORTAL_THEME_PROPERTIES=Propriet\u00e0 del tema del Portale -SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Queste configurazioni saranno ereditate da tutte le pagine e finestre del portale. Puoi sovrascrivere queste configurazioni selezionando il valore appropriato nella configurazione del tema delle pagine -EVENT_LISTENER_BINDING=Ascoltatore di eventi -CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo -SET_PERMISSIONS_FOR=Configura i permessi per -WINDOW=finestra -WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra -INSTANCE_ID=Id di Istanza -INSTANCE_NAME=Nome Istanza -ACTIONS=Azioni -PREFERENCES_MAX=Preferenze -PORTLET_DETAILS=dettagli della portlet -ASSOCIATED_PORTLET_NOT_AVAILABLE=La portlet associata non \u00e8 disponibile -PREFERENCES_MIN=preferenze -SECURITY_SETTINGS=configurazione della sicurezza -MAKE_DEFAULT=Rendi Default -MANAGE_WINDOWS_WITHIN=Gestisci le finestre dentro -PORTAL_OBJECTS=Oggetti del Portale -PORTALS=Portali -PORTLET_NAME=Nome della portlet -DESCRIPTION=Descrizione -REMOTE=Remoto -REMOTABLE=Remotabile -CREATE_INSTANCE=Crea istanza -PORTLET_DEFINITIONS=Definizioni di Portlet -DETAILS=dettagli -INSTANCE_CREATION=creazione dell\'istanza -CREATE_INSTANCE_NAMED=Crea un\'istanza chiamata -RENAME_THE=Rinomina il -TO=a -THIS_MINIMIZED_STATE=Questa finestra ha uno stato minimizzato -THIS_NORMAL_STATE=Questa finestra ha uno stato normale -THIS_MAXIMIZED_STATE=Questa finestra ha uno stato massimizzato -THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Questa finestra ha uno stato minimizzato perch\u00e8 una finestra in questa pagina ha uno stato massimizzato -SWITCH_TO_WIZARD_MODE=Vai alla modalit\u00e0 wizard -CREATE_PORTAL=Crea portale -CREATE_PAGE=Crea pagina -DEFAULT=Default -WINDOW=Finestra -VIEW_PORTLETS_PROVIDED_BY=Visualizza le portlet fornite dal provider chiamato -VIEW_PORTLETS=Visualizza le portlet - -COMMON_INCONSISTENT_STATE=Stato non consistente -COMMON_DELETE=Cancella -COMMON_DELETING=ATTENZIONE! Stai per cancellare il -COMMON_FROM=dal -COMMON_SURE_DELETE=Sei sicuro di volerlo cancellare -COMMON_ERROR_HANDLING=Gestione degli errori della Pagina -COMMON_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di pagina -COMMON_CASE=Caso -COMMON_INHERITANCE=Ereditariet\u00e0 -COMMON_ACTION=Azione -COMMON_INHERIT_ACTION=eredita l\'azione dal genitore -COMMON_CONTENT_DEFINITION=Definizione del Contenuto -COMMON_DEFINE_NAME_WINDOW=Dai un nome alla finestra dei contenuti (opzionale) -COMMON_WINDOW_NAME=Nome Finestra -COMMON_SELECT_TYPE_CONTENT=Seleziona il tipo di contenuto che sar\u00e0 aggiunto alla pagina -COMMON_CONTENT_TYPE=Tipo del Contenuto -COMMON_SELECT_CONTENT=Seleziona il contenuto che sar\u00e0 aggiunto alla pagina -COMMON_PAGE_LAYOUT=Layout della Pagina -COMMON_REGION=Regione -COMMON_UNASSIGNED_WINDOW=Finestre non assegnate -COMMON_PORTAL_ERROR_HANDLING=Gestione degli errori del Portale -COMMON_PORTAL_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di portale -COMMON_KEY=Chiave -COMMON_NAME=Nome -COMMON_READONLY=Sola lettura -COMMON_VALUE=Valore -COMMON_NO_DEFINED_PREFERENCES=Non ci sono preferenze per questa portlet -COMMON_EDIT_EXISTING_VALUES=Modifica i valori esistenti -COMMON_APPEND_VALUE=Appendi un valore -COMMON_PROPERTIES=Propriet\u00e0 -COMMON_ADD_PROPERTY=Aggiungi una propriet\u00e0 -COMMON_SELECT_PREDEFINED_PROPERTY=Seleziona la propriet\u00e0 predefinita -COMMON_OR=o -COMMON_ENTER_PROPERTY_NAME=Inserisci il nome della propriet\u00e0 -COMMON_MANAGE_PROPERTIES=Gestisci le propriet\u00e0 attualmente definite -COMMON_INHERITED=Ereditato -COMMON_YES=Si -COMMON_NO=No -COMMON_ROLES=Ruoli -COMMON_PERMISSIONS=Permessi -COMMON_ROLE=Ruolo -COMMON_SETTING=Configurazione -COMMON_LAYOUT=Layout -COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome dell\'implementazione del layout usato per le finestre della portlet nelle pagine -COMMON_NAME_LOOK_AND_FEEL=Nome del look and feel da usare -COMMON_RENDERSET=RenderSet -COMMON_NAME_RENDER_ENGINE_PAGES=Nome del motore di Render da usare per creare le pagine -COMMON_WINDOW_RENDERER=Renderer della Finestra -COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome del motore di Render da usare per creare le finestre -COMMON_DECORATION_RENDERER=Renderer della Decorazione -COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome del motore di Render da usare per creare le decorazioni delle finestre -COMMON_PORTLET_RENDERER=Renderer della Portlet -COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome del motore di Render da usare per creare le portlet -COMMON_PORTLET_INSTANCE_INFORMATION=Informazione sull\'Istanza della Portlet -COMMON_PORTLET_NAME=Nome Portlet -COMMON_PORTLET_DESCRIPTION=Descrizione della Portlet -COMMON_PORTLET_TITLE=Titolo della Portlet -COMMON_PORTLET_KEYWORDS=Parole chiave della Portlet -COMMON_PORTLET_LOCALES=Localizzazione della Portlet -COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Elenco dei nomi delle istanze di Portlet -COMMON_ADD_INSTANCE_DISPLAY_NAMES=Aggiungi i nomi delle istanze di Portlet -COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nomi attuali delle istanze di Portlet -COMMON_CANCEL=Annulla -COMMON_UPDATE=Aggiorna -COMMON_ADD=Aggiungi -COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0 -COMMON_UP=Su -COMMON_DOWN=Giu -COMMON_NEW_VALUE=Nuovo valore -COMMON_APPEND=Aggiungi -COMMON_LOCALE=Nazionalit\u00e0 -COMMON_DISPLAY_NAME=Visualizza Nome - -DASHBOARD_PERSONAL_EDITOR=Editor personale della Dashboard -DASHBOARD_CREATE_NEW_PAGE=Crea una nuova pagina -DASHBOARD_CREATE_PAGE=Nome pagina -DASHBOARD_RENAME_THIS_PAGE=Rinomina la pagina -DASHBOARD_NEW_PAGE_NAME=Nuovo nome per la pagina -DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Usa questa pagina per gestire i contenuti e la grafica delle pagine della tua Dashboard -DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Puoi controllare i titoli delle pagine, i layout di colonna, i temi della pagina,e aggiungere,ordinare, o rimuovere portlet -DASHBOARD_CURRENTLY_EDITING_PAGE=Pagina attualmente da editare -DASHBOARD_THEME_AND_LAYOUT=Tema e Layout -DASHBOARD_APPLY_THEME=Applica un tema alla tua dashboard, o seleziona il numero di colonne per il layout -DASHBOARD_CHOOSE_LAYOUT=Scegli un layout -DASHBOARD_CHOOSE_THEME=Scegli un tema -DASHBOARD_CANNOT_UNDO_ACTION=Non puoi annullare l\'azione -DASHBOARD_DELETE_THIS_PAGE=Cancella questa Pagina -DASHBOARD_SAVE=Salva -DASHBOARD_SELECT=Seleziona - -WIZARD_ADDING_NEW_PORTLET=Aggiungere una nuova portlet -WIZARD_STEP=Step -WIZARD_SELECT_PORTLET=Seleziona la Portlet -WIZARD_SELECT_PORTAL=Seleziona il Portale -WIZARD_SELECT_PAGE=Seleziona la Pagina -WIZARD_SELECT_REGION=Seleziona la Regione -WIZARD_CONFIRM=Conferma -WIZARD_CONTENT=Contenuto -WIZARD_SWITCH_ADVANCED_MODE=Vai alla modalit\u00e0 avanzata -WIZARD_PORTLET=Portlet -WIZARD_PORTAL=Portale -WIZARD_PAGE=Pagina -WIZARD_REGION=Regione -WIZARD_PREVIOUS=Indietro -WIZARD_NEXT=Avanti -WIZARD_SUB_PAGES=Sotto-Pagine -WIZARD_PORTLET_PROVIDER=Fornitore di Portlet -WIZARD_CHANGE=Cambia \ No newline at end of file Copied: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties (from rev 10830, branches/JBoss_Portal_Branch_2_6/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 (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 09:32:44 UTC (rev 10833) @@ -0,0 +1,199 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +PORTLET_INSTANCES=Istanze di Portlet +INSTANCE_DELETE=Cancella Istanza +PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto +ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet +DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard +CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard +DASHBOARDS=Dashboard +ADD_DISPLAY_NAMES=Aggiungi i nomi da visualizzare +CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati +MANAGE=Gestisci +PORTALS=portali +PORTAL=portale +SUB_PORTALS=sotto-portali +PAGES_WITHIN=pagine dentro +CREATE_PORTAL_NAMED=Crea un portale chiamato +PAGE_LAYOUT=Layout della pagina +SECURITY=Sicurezza +THEME=Tema +RENAME=Rinomina +DISPLAY_NAMES=Nomi visualizzati +DELETE=Cancella +MANAGE_SUB_PAGES_WITHIN=Gestisci le sotto-pagine dentro +CREATE_PAGE_NAMED=Crea una pagina chiamata +SET_PAGE_PERMISSIONS=Configura i permessi per la pagina +PAGE_THEME_PROPERTIES=Propriet\u00e0 del tema della Pagina +SET_PORTAL_PERMISSIONS=Configura i permessi per il portale +PORTAL_THEME_PROPERTIES=Propriet\u00e0 del tema del Portale +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Queste configurazioni saranno ereditate da tutte le pagine e finestre del portale. Puoi sovrascrivere queste configurazioni selezionando il valore appropriato nella configurazione del tema delle pagine +EVENT_LISTENER_BINDING=Ascoltatore di eventi +CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo +SET_PERMISSIONS_FOR=Configura i permessi per +WINDOW=finestra +WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra +INSTANCE_ID=Id di Istanza +INSTANCE_NAME=Nome Istanza +ACTIONS=Azioni +PREFERENCES_MAX=Preferenze +PORTLET_DETAILS=dettagli della portlet +ASSOCIATED_PORTLET_NOT_AVAILABLE=La portlet associata non \u00e8 disponibile +PREFERENCES_MIN=preferenze +SECURITY_SETTINGS=configurazione della sicurezza +MAKE_DEFAULT=Rendi Default +MANAGE_WINDOWS_WITHIN=Gestisci le finestre dentro +PORTAL_OBJECTS=Oggetti del Portale +PORTALS=Portali +PORTLET_NAME=Nome della portlet +DESCRIPTION=Descrizione +REMOTE=Remoto +REMOTABLE=Remotabile +CREATE_INSTANCE=Crea istanza +PORTLET_DEFINITIONS=Definizioni di Portlet +DETAILS=dettagli +INSTANCE_CREATION=creazione dell\'istanza +CREATE_INSTANCE_NAMED=Crea un\'istanza chiamata +RENAME_THE=Rinomina il +TO=a +THIS_MINIMIZED_STATE=Questa finestra ha uno stato minimizzato +THIS_NORMAL_STATE=Questa finestra ha uno stato normale +THIS_MAXIMIZED_STATE=Questa finestra ha uno stato massimizzato +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Questa finestra ha uno stato minimizzato perch\u00e8 una finestra in questa pagina ha uno stato massimizzato +SWITCH_TO_WIZARD_MODE=Vai alla modalit\u00e0 wizard +CREATE_PORTAL=Crea portale +CREATE_PAGE=Crea pagina +DEFAULT=Default +WINDOW=Finestra +VIEW_PORTLETS_PROVIDED_BY=Visualizza le portlet fornite dal provider chiamato +VIEW_PORTLETS=Visualizza le portlet + +COMMON_INCONSISTENT_STATE=Stato non consistente +COMMON_DELETE=Cancella +COMMON_DELETING=ATTENZIONE! Stai per cancellare il +COMMON_FROM=dal +COMMON_SURE_DELETE=Sei sicuro di volerlo cancellare +COMMON_ERROR_HANDLING=Gestione degli errori della Pagina +COMMON_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di pagina +COMMON_CASE=Caso +COMMON_INHERITANCE=Ereditariet\u00e0 +COMMON_ACTION=Azione +COMMON_INHERIT_ACTION=eredita l\'azione dal genitore +COMMON_CONTENT_DEFINITION=Definizione del Contenuto +COMMON_DEFINE_NAME_WINDOW=Dai un nome alla finestra dei contenuti (opzionale) +COMMON_WINDOW_NAME=Nome Finestra +COMMON_SELECT_TYPE_CONTENT=Seleziona il tipo di contenuto che sar\u00e0 aggiunto alla pagina +COMMON_CONTENT_TYPE=Tipo del Contenuto +COMMON_SELECT_CONTENT=Seleziona il contenuto che sar\u00e0 aggiunto alla pagina +COMMON_PAGE_LAYOUT=Layout della Pagina +COMMON_REGION=Regione +COMMON_UNASSIGNED_WINDOW=Finestre non assegnate +COMMON_PORTAL_ERROR_HANDLING=Gestione degli errori del Portale +COMMON_PORTAL_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di portale +COMMON_KEY=Chiave +COMMON_NAME=Nome +COMMON_READONLY=Sola lettura +COMMON_VALUE=Valore +COMMON_NO_DEFINED_PREFERENCES=Non ci sono preferenze per questa portlet +COMMON_EDIT_EXISTING_VALUES=Modifica i valori esistenti +COMMON_APPEND_VALUE=Appendi un valore +COMMON_PROPERTIES=Propriet\u00e0 +COMMON_ADD_PROPERTY=Aggiungi una propriet\u00e0 +COMMON_SELECT_PREDEFINED_PROPERTY=Seleziona la propriet\u00e0 predefinita +COMMON_OR=o +COMMON_ENTER_PROPERTY_NAME=Inserisci il nome della propriet\u00e0 +COMMON_MANAGE_PROPERTIES=Gestisci le propriet\u00e0 attualmente definite +COMMON_INHERITED=Ereditato +COMMON_YES=Si +COMMON_NO=No +COMMON_ROLES=Ruoli +COMMON_PERMISSIONS=Permessi +COMMON_ROLE=Ruolo +COMMON_SETTING=Configurazione +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome dell\'implementazione del layout usato per le finestre della portlet nelle pagine +COMMON_NAME_LOOK_AND_FEEL=Nome del look and feel da usare +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Nome del motore di Render da usare per creare le pagine +COMMON_WINDOW_RENDERER=Renderer della Finestra +COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome del motore di Render da usare per creare le finestre +COMMON_DECORATION_RENDERER=Renderer della Decorazione +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome del motore di Render da usare per creare le decorazioni delle finestre +COMMON_PORTLET_RENDERER=Renderer della Portlet +COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome del motore di Render da usare per creare le portlet +COMMON_PORTLET_INSTANCE_INFORMATION=Informazione sull\'Istanza della Portlet +COMMON_PORTLET_NAME=Nome Portlet +COMMON_PORTLET_DESCRIPTION=Descrizione della Portlet +COMMON_PORTLET_TITLE=Titolo della Portlet +COMMON_PORTLET_KEYWORDS=Parole chiave della Portlet +COMMON_PORTLET_LOCALES=Localizzazione della Portlet +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Elenco dei nomi delle istanze di Portlet +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Aggiungi i nomi delle istanze di Portlet +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nomi attuali delle istanze di Portlet +COMMON_CANCEL=Annulla +COMMON_UPDATE=Aggiorna +COMMON_ADD=Aggiungi +COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0 +COMMON_UP=Su +COMMON_DOWN=Giu +COMMON_NEW_VALUE=Nuovo valore +COMMON_APPEND=Aggiungi +COMMON_LOCALE=Nazionalit\u00e0 +COMMON_DISPLAY_NAME=Visualizza Nome + +DASHBOARD_PERSONAL_EDITOR=Editor personale della Dashboard +DASHBOARD_CREATE_NEW_PAGE=Crea una nuova pagina +DASHBOARD_CREATE_PAGE=Nome pagina +DASHBOARD_RENAME_THIS_PAGE=Rinomina la pagina +DASHBOARD_NEW_PAGE_NAME=Nuovo nome per la pagina +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Usa questa pagina per gestire i contenuti e la grafica delle pagine della tua Dashboard +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Puoi controllare i titoli delle pagine, i layout di colonna, i temi della pagina,e aggiungere,ordinare, o rimuovere portlet +DASHBOARD_CURRENTLY_EDITING_PAGE=Pagina attualmente da editare +DASHBOARD_THEME_AND_LAYOUT=Tema e Layout +DASHBOARD_APPLY_THEME=Applica un tema alla tua dashboard, o seleziona il numero di colonne per il layout +DASHBOARD_CHOOSE_LAYOUT=Scegli un layout +DASHBOARD_CHOOSE_THEME=Scegli un tema +DASHBOARD_CANNOT_UNDO_ACTION=Non puoi annullare l\'azione +DASHBOARD_DELETE_THIS_PAGE=Cancella questa Pagina +DASHBOARD_SAVE=Salva +DASHBOARD_SELECT=Seleziona + +WIZARD_ADDING_NEW_PORTLET=Aggiungere una nuova portlet +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=Seleziona la Portlet +WIZARD_SELECT_PORTAL=Seleziona il Portale +WIZARD_SELECT_PAGE=Seleziona la Pagina +WIZARD_SELECT_REGION=Seleziona la Regione +WIZARD_CONFIRM=Conferma +WIZARD_CONTENT=Contenuto +WIZARD_SWITCH_ADVANCED_MODE=Vai alla modalit\u00e0 avanzata +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portale +WIZARD_PAGE=Pagina +WIZARD_REGION=Regione +WIZARD_PREVIOUS=Indietro +WIZARD_NEXT=Avanti +WIZARD_SUB_PAGES=Sotto-Pagine +WIZARD_PORTLET_PROVIDER=Fornitore di Portlet +WIZARD_CHANGE=Cambia \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-05-29 09:32:44 UTC (rev 10833) @@ -31,6 +31,7 @@ <view-handler> org.jboss.portletbridge.application.PortletViewHandler </view-handler> + <message-bundle>Resource</message-bundle> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> </application> <factory> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/confirm.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,13 +7,14 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="../objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Delete"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_DELETE}"/> <ui:define name="content"> <f:subview rendered="#{empty portalobjectmgr.selectedDeletingObject}"> - <p class="portlet-msg-error">Inconsistent state</p> + <p class="portlet-msg-error">#{bundle.COMMON_INCONSISTENT_STATE}</p> </f:subview> <f:subview rendered="#{not empty portalobjectmgr.selectedDeletingObject}"> @@ -22,26 +23,26 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>#{bundle.COMMON_DELETE} <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> <p class="portlet-msg-alert"> - WARNING! You are about to delete the + #{bundle.COMMON_DELETING} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{portalobjectmgr.selectedObject.typeName} from the + #{portalobjectmgr.selectedObject.typeName} #{bundle.COMMON_FROM} <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}"> <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span> </c:if> #{portalobjectmgr.selectedObjectParent.typeName}! </p> - <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p> + <p class="portlet-class">#{bundle.COMMON_SURE_DELETE} #{portalobjectmgr.selectedObjectType}?</p> <h:form> - <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" + <h:commandButton value="#{bundle.COMMON_DELETE}" action="objects" actionListener="#{portalobjectmgr.destroyObject}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="objectId" value="#{portalobjectmgr.selectedDeletingObject.id}"/> </h:commandButton> - <h:commandButton value="Cancel" action="objects" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="objects" actionListener="#{portalobjectmgr.selectParentObject}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageErrorHandling.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,13 +4,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<p class="portlet-area-header">Page Error Handling</p> +<f:loadBundle basename="Resource" var="bundle" /> +<p class="portlet-area-header">#{bundle.COMMON_ERROR_HANDLING}</p> <div class="portlet-area-body">  <table cellpadding="0" cellspacing="0" width="100%"> <tr> - <th class="portlet-section-title">Configure how the system handles errors on page level.</th> + <th class="portlet-section-title">#{bundle.COMMON_CONFIGURE_ERRORS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> @@ -20,9 +21,9 @@ <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> + <th>#{bundle.COMMON_CASE}</th> + <th>#{bundle.COMMON_INHERITANCE}</th> + <th>#{bundle.COMMON_ACTION}</th> </tr> </thead> <tbody> @@ -34,8 +35,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlAccessDenied.inherit}" - value="#{properties.pageControlAccessDenied.inherited}"/>inherit action - from parent + value="#{properties.pageControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}" @@ -52,8 +52,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlUnavailable.inherit}" - value="#{properties.pageControlUnavailable.inherited}"/>inherit action - from parent + value="#{properties.pageControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlUnavailable.value}" @@ -70,8 +69,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlError.inherit}" - value="#{properties.pageControlError.inherited}"/>inherit action from - parent + value="#{properties.pageControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlError.value}" @@ -88,8 +86,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlInternalError.inherit}" - value="#{properties.pageControlInternalError.inherited}"/>inherit action - from parent + value="#{properties.pageControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlInternalError.value}" @@ -106,8 +103,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlNotFound.inherit}" - value="#{properties.pageControlNotFound.inherited}"/>inherit action from - parent + value="#{properties.pageControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlNotFound.value}" @@ -124,8 +120,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlResourceURI.inherit}" - value="#{properties.pageControlResourceURI.inherited}"/>inherit action - from parent + value="#{properties.pageControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:inputText value="#{properties.pageControlResourceURI.value}" size="60" @@ -134,7 +129,7 @@ </tr> </tbody> </table> -<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,24 +5,25 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <br/> <table width="100%"> <tr> <td valign="top" width="50%"> - <p class="portlet-area-header">Content Definition</p> + <p class="portlet-area-header">#{bundle.COMMON_CONTENT_DEFINITION}</p> <div class="portlet-area-body"> <table> <tr> - <td colspan="2">Define a name for the window of content (optional): + <td colspan="2">#{bundle.COMMON_DEFINE_NAME_WINDOW}: </td> </tr> <tr> <td colspan="2"> <h:form id="windowForm"> <label for="windowName"> - <span class="portlet-form-field-label admin-label">Window Name:</span> + <span class="portlet-form-field-label admin-label">#{bundle.COMMON_WINDOW_NAME}:</span> <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field id-window-name"/> </label> @@ -33,14 +34,14 @@ <tr> <td colspan="2"> <hr/> - Select the type of content that will be added to the page: + #{bundle.COMMON_SELECT_TYPE_CONTENT}: </td> </tr> <tr> <td> <h:form id="contentTypesForm"> <label for="instanceId" class="portlet-form-field-label-container"> - <span class="portlet-form-field-label admin-label">Content Type:</span> + <span class="portlet-form-field-label admin-label">#{bundle.COMMON_CONTENT_TYPE}:</span> <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> <h:selectOneMenu id="instanceId" @@ -58,7 +59,7 @@ <tr> <td colspan="2"> <hr/> - Select content that will be added to the page: + #{bundle.COMMON_SELECT_CONTENT}: </td> </tr> <tr> @@ -83,7 +84,7 @@ </td> <td valign="top" width="50%"> - <p class="portlet-area-header">Page Layout</p> + <p class="portlet-area-header">#{bundle.COMMON_PAGE_LAYOUT}</p> <div class="portlet-area-body"> @@ -96,14 +97,14 @@ <tr> <td colspan="3" class="portlet-form-field-label"> <hr/> - #{regionName} Region + #{regionName} #{bundle.COMMON_REGION} </td> </tr> <tr> <td valign="top"> <h:commandButton onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}:windowForm:windowName').value" - value="Add" id="a_#{regionName}" + value="#{bundle.COMMON_ADD}" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> </td> @@ -117,16 +118,16 @@ </td> <td valign="top" width="250"> <h:commandButton - value="Up" id="u_#{regionName}" + value="#{bundle.COMMON_UP}" id="u_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/><br/> <h:commandButton - value="Down" id="d_#{regionName}" + value="#{bundle.COMMON_DOWN}" id="d_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> <hr/> <h:commandButton - value="Delete" id="l_#{regionName}" + value="#{bundle.COMMON_DELETE}" id="l_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> </td> @@ -137,14 +138,13 @@ <tbody> <tr> <td colspan="2" class="portlet-form-field-label" - style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned - windows + style="border-width:0px;border-top:1px dashed #d5d5d5">#{bundle.COMMON_UNASSIGNED_WINDOW} </td> </tr> <tr> <td> <div style="margin-top: 1em"> - <h:commandButton value="Delete" + <h:commandButton value="#{bundle.COMMON_DELETE}" id="l_unknown" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button"/> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPortalErrorHandling.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,14 +5,15 @@ xmlns:c="http://java.sun.com/jstl/core"> -<p class="portlet-area-header">Portal Error Handling</p> +<f:loadBundle basename="Resource" var="bundle" /> +<p class="portlet-area-header">#{bundle.COMMON_PORTAL_ERROR_HANDLING}</p> <div class="portlet-area-body">  <table class="full-width"> <tr> - <th class="portlet-section-title">Configure how the system handles errors on portal level.</th> + <th class="portlet-section-title">#{bundle.COMMON_PORTAL_CONFIGURE_ERRORS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> @@ -21,9 +22,9 @@ <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> + <th>#{bundle.COMMON_CASE}</th> + <th>#{bundle.COMMON_INHERITANCE}</th> + <th>#{bundle.COMMON_ACTION}</th> </tr> </thead> <tbody> @@ -35,8 +36,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlAccessDenied.inherit}" - value="#{properties.portalControlAccessDenied.inherited}"/>inherit - action from parent + value="#{properties.portalControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}" @@ -54,8 +54,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlUnavailable.inherit}" - value="#{properties.portalControlUnavailable.inherited}"/>inherit - action from parent + value="#{properties.portalControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlUnavailable.value}" @@ -73,8 +72,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlError.inherit}" - value="#{properties.portalControlError.inherited}"/>inherit action from - parent + value="#{properties.portalControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlError.value}" @@ -91,8 +89,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlInternalError.inherit}" - value="#{properties.portalControlInternalError.inherited}"/>inherit - action from parent + value="#{properties.portalControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlInternalError.value}" @@ -110,8 +107,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlNotFound.inherit}" - value="#{properties.portalControlNotFound.inherited}"/>inherit action - from parent + value="#{properties.portalControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlNotFound.value}" @@ -128,8 +124,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlResourceURI.inherit}" - value="#{properties.portalControlResourceURI.inherited}"/>inherit - action from parent + value="#{properties.portalControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:inputText value="#{properties.portalControlResourceURI.value}" size="60" @@ -138,7 +133,7 @@ </tr> </tbody> </table> -<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPreferences.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,17 +5,18 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{not empty prefs.entries}"> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header" style="text-align:left;"> <tr> - <th>Key</th> - <th>Name</th> - <th>ReadOnly</th> + <th>#{bundle.COMMON_KEY}</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_READONLY}</th> <c:if test="#{prefs.mutable}"> - <th>Value</th> + <th>#{bundle.COMMON_VALUE}</th> </c:if> </tr> </thead> @@ -50,21 +51,21 @@ </h:form> </c:when> <c:otherwise> - <p>No defined preferences for this portlet.</p> + <p>#{bundle.COMMON_NO_DEFINED_PREFERENCES}.</p> </c:otherwise> </c:choose> <c:if test="#{prefs.selectedEntry != null}"> <h:form style="padding: 1em 0 1em 0"> <fieldset style="border: 1px solid;"> - <legend>Edit existing values</legend> + <legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend> <table> <tbody> <c:forEach items="#{prefs.selectedEntry.indices}" var="index" varStatus="status"> <tr> <td> <h:outputLabel for="row_#{status.index}"> - <h:outputText value="Value #{status.index}: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_VALUE} #{status.index}: " styleClass="portlet-form-field-label"/> </h:outputLabel> </td> <td> @@ -74,14 +75,14 @@ <h:commandButton id="row_#{status.index}" actionListener="#{prefs.selectedEntry.deleteLine}" - value="Delete" + value="#{bundle.COMMON_DELETE}" styleClass="portlet-form-button"/> </td> </tr> </c:forEach> <tr> <td colspan="3"> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </td> </tr> </tbody> @@ -91,12 +92,12 @@ <h:form> <fieldset style="border: 1px solid;"> - <legend>Append a value</legend> + <legend>#{bundle.COMMON_APPEND_VALUE}</legend> <h:outputLabel for="new_value"> - <h:outputText value="New value: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_NEW_VALUE}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/> - <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="Append" + <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="#{bundle.COMMON_APPEND}" styleClass="portlet-form-button"/> </fieldset> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,7 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<div class="portlet-area-header">Properties</div> +<f:loadBundle basename="Resource" var="bundle" /> +<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div> <div class="portlet-area-body">  @@ -15,7 +16,7 @@  <table class="full-width"> <tr> - <th class="portlet-section-title">Add a property.</th> + <th class="portlet-section-title">#{bundle.COMMON_ADD_PROPERTY}.</th> </tr> <tr> <td class="dotted-blue-vert-rt"> @@ -27,8 +28,7 @@ <f:subview id="predefined-properties" rendered="#{not empty properties.propertyItems}"> <tr> <td class="portlet-form-field-label"> - <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select - predefined property:</h:outputLabel> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel> </td> </tr> <tr> @@ -39,13 +39,13 @@ </td> </tr> <tr> - <td align="center">or</td> + <td align="center">#{bundle.COMMON_OR}</td> </tr> </f:subview> <tr> <td class="portlet-form-field-label"> - <h:outputLabel for="property" styleClass="portlet-form-field-label">Enter property - name:</h:outputLabel> + <h:outputLabel for="property" styleClass="portlet-form-field-label"> + #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel> </td> </tr> <tr> @@ -57,7 +57,7 @@ </tbody> </table>  - <h:commandButton value="Add Property" styleClass="portlet-form-button portlet-section-buttonrow" + <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}" styleClass="portlet-form-button portlet-section-buttonrow" action="#{properties.action.updateProperty}"/></h:form> </td> @@ -73,7 +73,7 @@ <c:if test="#{properties.size != 0}"> <table class="full-width"> <tr> - <th class="portlet-section-title">Manage currently defined properties.</th> + <th class="portlet-section-title">#{bundle.COMMON_MANAGE_PROPERTIES}.</th> </tr> <tr> <td class="portlet-section-body" valign="top"> @@ -83,19 +83,19 @@ <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> - <f:facet name="header">Name</f:facet> + <f:facet name="header">#{bundle.COMMON_NAME}</f:facet> <h:outputText title="#{prop.type}" value="#{prop.displayName}"/> </h:column> <h:column> - <f:facet name="header">Description</f:facet> + <f:facet name="header">#{bundle.COMMON_DESCRIPTION}</f:facet> <h:outputText>#{prop.description}</h:outputText> </h:column> <h:column> - <f:facet name="header">Inherited</f:facet> - <h:outputText>#{prop.inherited ? 'Yes' : 'No'}</h:outputText> + <f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet> + <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText> </h:column> <h:column> - <f:facet name="header">Value</f:facet> + <f:facet name="header">#{bundle.COMMON_VALUE}</f:facet> <h:selectBooleanCheckbox value="#{prop.value}" readonly="#{prop.readOnly}" rendered="#{prop.type == 'java.lang.Boolean'}"/> @@ -122,17 +122,17 @@ </h:column> <h:column> - <f:facet name="header">Delete</f:facet> + <f:facet name="header">#{bundle.COMMON_DELETE}</f:facet> <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="name" value="#{prop.name}"/> </h:commandLink> </h:column> </h:dataTable>  - <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,12 +5,13 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Roles</th> - <th>Permissions</th> + <th>#{bundle.COMMON_ROLES}</th> + <th>#{bundle.COMMON_PERMISSIONS}</th> </tr> </thead> <tbody> @@ -18,7 +19,7 @@ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <td> <h:outputLabel for="cars_#{status.index}"> - Role + #{bundle.COMMON_ROLE} #{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}: </h:outputLabel> </td> @@ -36,8 +37,8 @@ </table> <br /> <div> - <h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="#{auth.submit}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> </div> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,19 +1,20 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> </tr> </thead> <tbody> <tr class="portlet-section-body"> - <td>Layout</td> - <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td>#{bundle.COMMON_LAYOUT}</td> + <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> <td> <h:selectOneMenu id="layout" value="#{theme.layoutName}"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> @@ -21,8 +22,8 @@ </td> </tr> <tr class="portlet-section-alternate"> - <td>Theme</td> - <td>Name of the look and feel to use</td> + <td>#{bundle.COMMON_THEME}</td> + <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> <td> <h:selectOneMenu id="theme" value="#{theme.themeName}"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> @@ -30,8 +31,8 @@ </td> </tr> <tr class="portlet-section-body"> - <td>RenderSet</td> - <td>Name of the render engine to use to render pages</td> + <td>#{bundle.COMMON_RENDERSET}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> <td> <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editWindowTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,19 +4,20 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> </tr> </thead> <tbody> <tr class="portlet-section-body"> - <td>Window Renderer</td> - <td>Name of the render engine to use to render windows</td> + <td>#{bundle.COMMON_WINDOW_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_WINDOWS}</td> <td> <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> @@ -24,8 +25,8 @@ </td> </tr> <tr class="portlet-section-alternate"> - <td>Decoration Renderer</td> - <td>Name of the render engine to use to render window decorations</td> + <td>#{bundle.COMMON_DECORATION_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_DECORATIONS}</td> <td> <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> @@ -33,8 +34,8 @@ </td> </tr> <tr> - <td>Portlet Renderer</td> - <td>Name of the render engine to use to render portlets</td> + <td>#{bundle.COMMON_PORTLET_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PORTLETS}</td> <td> <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -12,6 +12,8 @@ <br/> <img src="#{portlet.smallIconLocation}" alt="" style="margin: 0 5px 0 5px;" class="float-left"/> + <f:loadBundle basename="Resource" var="bundle" /> + <h:commandLink action="#{portletmgr.selectPortlet}"> <f:param name="id" value="#{portlet.context.id}"/> @@ -53,21 +55,20 @@ <div class="half-width float-left details-left-col"> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Media Types</h3> + <h3>#{bundle.COMMON_MEDIA_TYPES}</h3> <dl> <c:forEach var="mediaType" items="#{portlet.info.capabilities.mediaTypes}"> <dt> #{mediaType.value} </dt> <dd> - <span><label>Name: </label>#{mediaType.type.name}</span> + <span><label>#{bundle.COMMON_NAME}: </label>#{mediaType.type.name}</span> </dd> </c:forEach> </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - - <h3>Modes</h3> + <h3>#{bundle.COMMON_PORTLET_MODES}</h3> <dl> <c:forEach var="mode" items="#{portlet.info.capabilities.allModes}"> <dt> @@ -80,7 +81,7 @@ </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Window States</h3> + <h3>#{bundle.COMMON_WINDOW_STATES}</h3> <dl> <c:forEach var="windowState" items="#{portlet.info.capabilities.allWindowStates}"> <dt> @@ -93,35 +94,33 @@ </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Preferences</h3> + <h3>#{bundle.COMMON_WINDOW_STATES}</h3> <dl> <c:forEach var="preferenceKey" items="#{portlet.info.preferences.keys}"> <dt> #{preferenceKey} </dt> <dd> - <span><label>Value: </label></span> + <span><label>#{bundle.COMMON_VALUE}: </label></span> </dd> </c:forEach> </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Public Navigation Parameters</h3> + <h3>#{bundle.COMMON_PUBLIC_RENDER_PARAMETERS}</h3> <dl> <c:forEach var="publicParam" items="#{portlet.info.navigation.publicParameters}"> <dt> #{publicParam.name} </dt> <dd> - <span><label>Id: </label>#{publicParam.id}</span> <span><label>Description: </label>#{publicParam.description}</span> + <span><label>#{bundle.COMMON_ID}: </label>#{publicParam.id}</span> <span><label>#{bundle.COMMON_DESCRIPTION}: </label>#{publicParam.description}</span> </dd> </c:forEach> </dl> </portal:box> <br class="clear"/> - - </div> <div class="half-width float-right details-right-col"> @@ -134,7 +133,7 @@ <div class="displayNames"> <div> <h:form style="background-color:transparent;"> - <h3 style="background-color:transparent;">Add Instance Display Names</h3> + <h3 style="background-color:transparent;">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> <div style="background-color:transparent;"> <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> @@ -150,7 +149,7 @@ <br/> <div> <h:form > - <h3>Current Instance Display Names</h3> + <h3>#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> <div > @@ -208,7 +207,7 @@ <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Produced Events</h3> + <h3>#{bundle.COMMON_PRODUCED_EVENTS}</h3> <dl> <c:forEach var="producedEvent" items="#{portlet.info.eventing.producedEvents}"> <dt> @@ -221,7 +220,7 @@ </dl> </portal:box> <portal:box class="whiteWithLtGreyHeader meta-box"> - <h3>Consumed Events</h3> + <h3>#{bundle.COMMON_CONSUMEED_EVENTS}</h3> <dl> <c:forEach var="consumedEvent" items="#{portlet.info.eventing.consumedEvents}"> <dt> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,17 +7,18 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="instances">Portlet Instances</h:commandLink> + <h:commandLink action="instances">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.INSTANCE_DELETE} </li> </ul> </h:form> @@ -29,19 +30,18 @@ <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3> <p class="portlet-msg-alert"> - WARNING! You are about to delete the - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows - referencing it to not be able to display their content anymore. + #{bundle.COMMON_DELETING} + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_CAUSING_REFERENCING_NOT_ABLE}. </p> - <p class="portlet-class">Are you sure you want to delete this portlet instance?</p> + <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}?</p> <h:form> - <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" + <h:commandButton value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> </h:commandButton> - <h:commandButton value="Cancel" action="instances" actionListener="objects" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="instances" actionListener="objects" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboard/dashboard.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,13 +6,14 @@ xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <div align="center"> <h:message id="error" for="error" errorClass="portlet-msg-error"/> </div> <table class="full-width datatable"> <tr> - <th class="portlet-section-header" align="center">Personal Dashboard Editor</th> + <th class="portlet-section-header" align="center">#{bundle.DASHBOARD_PERSONAL_EDITOR}</th> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -21,11 +22,11 @@ <td width="250"> <table class="bottombuttonbar"> <tr> - <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:  + <td align="left" valign="top"><b>#{bundle.DASHBOARD_CREATE_NEW_PAGE}:</b><br/>#{bundle.DASHBOARD_CREATE_PAGE}:  <h:form style="padding:0;margin:0"> <h:inputText id="pageName" value="#{addDashboardPageAction.pageName}" styleClass="portlet-form-input-field"/> - <h:commandButton value="Save" + <h:commandButton value="#{bundle.SAVE}" action="#{addDashboardPageAction.execute}" styleClass="portlet-form-button"/> </h:form> @@ -33,12 +34,12 @@ </tr> <c:if test="#{dashboard.selectedPage.name != 'default'}"> <tr> - <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:  + <td align="left" valign="top"><b>#{bundle.DASHBOARD_RENAME_THIS_PAGE}:</b><br/>#{bundle.DASHBOARD_NEW_PAGE_NAME}:  <h:form id="renameForm" style="padding:0;margin:0"> <h:message for="newName"/> <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" styleClass="portlet-form-input-field"/> - <h:commandButton value="Rename" + <h:commandButton value="#{bundle.RENAME}" action="#{renameDashboardPageAction.execute}" styleClass="portlet-form-button"/> </h:form> @@ -48,17 +49,15 @@ </table> </td> <td align="left" valign="top"> - Use this page to manage the content and appearance of your dashboard pages. <br/> - You can control the page titles, column layouts, page themes, - and add, - order, or remove portlets. + #{bundle.DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE}. <br/> + #{bundle.DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES}. </td> </tr> </table> </td> </tr> <tr> - <td class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</td> + <td class="portlet-section-header" align="center">#{bundle.DASHBOARD_CURRENTLY_EDITING_PAGE} #{dashboard.selectedPage.name}</td> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -83,23 +82,23 @@ <table class="bottombuttonbar"> <tr> <td valign="top"> - <b>Theme and Layout</b> + <b>#{bundle.DASHBOARD_THEME_AND_LAYOUT}</b> <br/> - Apply a theme to your dashboard, or select the number of columns for the layout. + #{bundle.DASHBOARD_APPLY_THEME}. <hr/> </td> </tr> <tr> <td> <h:form> - Choose a layout:<br/> + #{bundle.DASHBOARD_CHOOSE_LAYOUT}:<br/> <h:selectOneMenu id="layoutSelector" value="#{dashboard.selectedPageLayout}" styleClass="portlet-form-field"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/> </h:form> </td> @@ -110,14 +109,14 @@ <tr> <td> <h:form> - Choose a theme:<br/> + #{bundle.DASHBOARD_CHOOSE_THEME}:<br/> <h:selectOneMenu id="themeSelector" value="#{dashboard.selectedPageTheme}" styleClass="portlet-form-field"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/> </h:form> </td> @@ -151,10 +150,10 @@ <tr> <td align="left"> <h:form style="padding:0;margin:0"> - <h:commandButton value="Delete this Page" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_DELETE_THIS_PAGE}" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/> <br/> - <font color="red">You cannot undo this action!</font> + <font color="red">#{bundle.DASHBOARD_CANNOT_UNDO_ACTION}!</font> </h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboards.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,7 +5,7 @@ xmlns:c="http://java.sun.com/jstl/core" template="dashboardsTemplate.xhtml"> - + <f:loadBundle basename="Resource" var="bundle" /> <ui:define name="content">  @@ -35,19 +35,19 @@ <br/> <div class="property-container"> - <p class="portlet-area-header">Dashboard theme properties</p> + <p class="portlet-area-header">#{bundle.DASHBOARD_THEME_PROPERTIES}</p> <div class="portlet-area-body"> <table cellpadding="0" cellspacing="0" width="100%"> <tr> - <th class="portlet-section-title">Configure dashboards settings.</th> + <th class="portlet-section-title">#{bundle.CONFIGURE_DASHBOARD_SETTINGS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{dashboardmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" actionListener="#{dashboardmgr.theme.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/dashboardsTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,19 +7,20 @@ class="admin-ui">  + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> - <li id="currentTab">Dashboards</li> + <li id="currentTab">#{bundle.DASHBOARDS}</li> </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> @@ -29,7 +30,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/displayNameObject.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,14 +4,15 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Display Names"/> + <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> <br/><br/> <div class="float-left third-width-pad5"> <h:form id="displayNameForm"> - <h3 class="sectionTitle zero">Add Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> @@ -26,7 +27,7 @@ <div class="float-left two-third-width-pad5"> <h:form> - <h3 class="sectionTitle zero">Current Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> @@ -36,34 +37,34 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Locale"/> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> </f:facet> #{value.localeDisplayName} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Display Name"/> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> </f:facet> #{value.text} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Delete"/> + <h:outputText value="#{bundle.COMMON_DELETE}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="delete"/> </h:commandLink></div> </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="Rename"/> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="rename"/> </h:commandLink></div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editContext.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,39 +5,40 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> <h3 class="sectionTitle tenpx-top-bottom"> - Manage   + #{bundle.MANAGE}   <c:choose> - <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> - <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{bundle.PORTAL}</c:otherwise> </c:choose> </h3> <h:form> <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionProperties"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> </h:form> <h3 class="sectionTitle"> - Manage   + #{bundle.MANAGE}   <c:choose> - <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">sub-portals</c:when> - <c:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - portal</c:otherwise> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.SUB_PORTALS}</c:when> + <c:otherwise>#{bundle.PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.PORTAL}</c:otherwise> </c:choose> </h3>  <div class="tenpx-top-bottom"> <h:form> - <span class="portlet-font">Create a portal named: </span> + <span class="portlet-font">#{bundle.CREATE_PORTAL_NAMED}: </span> <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{portalAction.addPortal}" value="Create portal" styleClass="portlet-form-button"/> + <h:commandButton action="#{portalAction.addPortal}" value="#{bundle.CREATE_PORTAL}" styleClass="portlet-form-button"/> <h:message for="name" errorClass="portlet-msg-error"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPage.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,10 +5,11 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> - <h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.MANAGE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> @@ -17,52 +18,52 @@ <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Page layout + #{bundle.PAGE_LAYOUT} </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Theme + #{bundle.THEME} </h:commandLink><h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Rename + #{bundle.RENAME} </h:commandLink></h:panelGroup> <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> - Display Names + #{bundle.DISPLAY_NAMES} </h:commandLink></h:panelGroup> <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> | <h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:panelGroup> </h:form> - <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle">#{bundle.MANAGE_SUB_PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3>  <div class="tenpx-top-bottom"> <h:form> - <span class="portlet-font">Create a page named: </span> + <span class="portlet-font">#{bundle.CREATE_PAGE_NAMED}: </span> <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Create page" styleClass="portlet-form-button"/> + <h:commandButton action="#{addPageAction.execute}" value="#{bundle.CREATE_PAGE}" styleClass="portlet-form-button"/> <h:message for="pageName" errorClass="portlet-msg-error"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageLayout.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,8 +6,9 @@ xmlns:ct="http://www.julien.com" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Layout"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_LAYOUT}"/> <ui:define name="content"> <ui:include src="common/editPageLayout.xhtml"> <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,10 +3,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the page permissions</h3> + <h3>#{bundle.SET_PAGE_PERMISSIONS}</h3> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPageTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,16 +3,17 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Page theme properties</h3> + <h3>#{bundle.PAGE_THEME_PROPERTIES}</h3> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,10 +3,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the portal permissions</h3> + <h3>#{bundle.SET_PORTAL_PERMISSIONS}</h3> <ui:decorate template="/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editPortalTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,20 +3,20 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Portal theme properties</h3> + <h3>#{bundle.PORTAL_THEME_PROPERTIES}</h3> - <p>These settings are inherited by all the pages and windows of this portal. You may override these settings by - selecting the appropriate value on the respective Theme settings pages.</p> + <p>#{bundle.SETTINGS_ARE_INHERITED_BY_ALL_PAGES}.</p> <br/> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editProperties.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,24 +5,25 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Properties"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_PROPERTIES}"/> <ui:define name="content"> <br/> <div class="tenpx-top-bottom"> - <p class="portlet-area-header">Event Listener Binding</p> + <p class="portlet-area-header">#{bundle.EVENT_LISTENER_BINDING}</p> <div class="portlet-area-body tenpx-top-bottom"> <h:form> <h:outputLabel for="listener" styleClass="portlet-form-field-label"> - Choose the id of the PortalEventListener to bind to this #{portalobjectmgr.selectedObjectType}: + #{bundle.CHOOSE_ID_PORTALEVENTLISTENER} #{portalobjectmgr.selectedObjectType}: </h:outputLabel> <h:selectOneMenu id="listener" value="#{portalobjectmgr.selectedObject.listener}"> <f:selectItems value="#{portalobjectmgr.listenerIds}"/> </h:selectOneMenu> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowSecurity.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,12 +1,14 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - window</h3> + <h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.WINDOW}</h3> <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editWindowTheme.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -3,16 +3,17 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Window theme properties</h3> + <h3>#{bundle.WINDOW_THEME_PROPERTIES}</h3> <ui:decorate template="common/editWindowTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button portlet-section-buttonrow"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,6 +6,7 @@ xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> @@ -28,9 +29,9 @@ <table id="instancesTable2" class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> - <th>Instance id</th> - <th>Instance name</th> - <th>Actions</th> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> </tr> </thead> <tbody> @@ -51,18 +52,18 @@ <td><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="security"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:panelGroup rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="preferences"/> - Preferences + #{bundle.PREFERENCES} </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" styleClass="actionDelete" actionListener="#{instancemgr.selectInstance}"> <f:param name="id" value="#{instance.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </td> </tr> @@ -98,12 +99,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> -  - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} </li> </ul> </h:form> @@ -117,7 +117,7 @@ </ui:include> </c:when> <c:otherwise> - The associated portlet is not available. + #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. </c:otherwise> </c:choose> </c:if> @@ -127,25 +127,25 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES} </li> </ul> </h:form> <br/> <div class="property-container"> - <ui:include src="common/editPreferences.xhtml"> - <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> - </ui:include> - <br/> - <h:form> - <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> - </h:form> + <ui:include src="common/editPreferences.xhtml"> + <ui:param name="prefs" value="#{instancemgr.selectedPrefs}"/> + </ui:include> + <br /> + <h:form> + <h:commandButton value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> + </h:form> </div> </c:if> @@ -154,11 +154,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} </li> </ul> </h:form> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instancesTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,22 +1,24 @@ <div xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" class="admin-ui"> - + + <f:loadBundle basename="Resource" var="bundle" />  <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> - <li id="currentTab">Portlet Instances</li> + <li id="currentTab"><h:outputText value="#{bundle.PORTLET_INSTANCES}" /></li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -27,7 +29,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -7,6 +7,8 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> + +<f:loadBundle basename="Resource" var="bundle" /> <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> @@ -16,7 +18,7 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Portal"/> + <h:outputText value="#{bundle.WIZARD_PORTAL}"/> </f:facet> <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> @@ -24,26 +26,26 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionSecurity"> <f:param name="id" value="#{object.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:panelGroup> @@ -52,17 +54,17 @@ | <h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> - Make Default + #{bundle.MAKE_DEFAULT} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" - value="Default"/></h:panelGroup> + value="#{bundle.DEFAULT}"/></h:panelGroup> </h:column> </h:dataTable> </c:if> @@ -74,7 +76,7 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Page"/> + <h:outputText value="#{bundle.WIZARD_PAGE}"/> </f:facet> <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> @@ -82,51 +84,51 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> <f:param name="id" value="#{object.id}"/> - Page layout + #{bundle.PAGE_LAYOUT} </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Rename + #{bundle.RENAME} </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Display Names + #{bundle.DISPLAY_NAMES} </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> - Make Default + #{bundle.MAKE_DEFAULT} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" - value="Default"/></h:panelGroup> + value="#{bundle.DEFAULT}"/></h:panelGroup> </h:column> </h:dataTable> </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> - <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle">#{bundle.Manage windows within} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> @@ -137,18 +139,18 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Window"/> + <h:outputText value="#{bundle.WINDOW}"/> </f:facet> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_NORMAL_STATE}.'}" rendered="#{!maximizedStateExists}" value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" styleClass="windowStateIcon" alt=""/> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}" rendered="#{maximizedStateExists}" value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" styleClass="windowStateIcon" @@ -169,25 +171,25 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionTheme"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Rename + #{bundle.RENAME} </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}" styleClass="actionDelete"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:column> </h:dataTable> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -8,17 +8,18 @@ class="admin-ui">  + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> - <li id="currentTab">Portal Objects</li> + <li id="currentTab">#{bundle.PORTAL_OBJECTS}</li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -43,7 +44,7 @@ <h:commandLink action="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{node.id}"/> <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> </c:choose> </h:commandLink> @@ -62,7 +63,7 @@  <div class="property-container"> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </div> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objects.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,9 +1,12 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + + <f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}"> <ui:include src="editContext.xhtml"/> @@ -21,8 +24,7 @@ </c:choose> <h:form> - <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard - mode</h:commandLink></p> + <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">#{bundle.SWITCH_TO_WIZARD_MODE}</h:commandLink></p> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -8,6 +8,7 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:portlet="http://java.sun.com/portlet"> +<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="portletsTemplate.xhtml"> <ui:define name="content"> @@ -43,11 +44,11 @@ <table class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> - <th>Portlet name</th> - <th>Description</th> - <th>Remote</th> - <th>Remotable</th> - <th>Actions</th> + <th>#{bundle.PORTLET_NAME}</th> + <th>#{bundle.DESCRIPTION}</th> + <th>#{bundle.REMOTE}</th> + <th>#{bundle.REMOTABLE}</th> + <th>#{bundle.ACTIONS}</th> </tr> </thead> <tbody> @@ -72,12 +73,12 @@ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionPreferences"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="preferences"/> - Preferences + #{bundle.PREFERENCES} </h:commandLink> | </h:panelGroup> <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="createInstance"/> - Create instance + #{bundle.CREATE_INSTANCE} </h:commandLink> </td> </tr> @@ -114,11 +115,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> details + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.DETAILS} </li> </ul> </h:form> @@ -134,11 +135,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> preferences + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES} </li> </ul> </h:form> @@ -156,11 +157,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> instance creation + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.INSTANCE_CREATION} </li> </ul> </h:form> @@ -168,7 +169,7 @@ <div class="property-container"> <h:form id="add_instance_form" styleClass="createObjectForm"> - <span class="portlet-font">Create an instance named: </span> + <span class="portlet-font">#{bundle.CREATE_INSTANCE_NAMED}: </span> <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/> <br/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portletsTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -1,22 +1,24 @@ <div xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" class="admin-ui">  + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> - <li id="currentTab">Portlet Definitions</li> + <li id="currentTab">#{bundle.PORTLET_DEFINITIONS}</li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -27,7 +29,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/renameObject.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,17 +4,18 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> + <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> <h:message for="newName"/> - <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{portalobjectmgr.selectedObjectType} to: + <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} #{bundle.TO}: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowTpl.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -6,20 +6,21 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> +<f:loadBundle basename="Resource" var="bundle" /> <link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="wizard-tab-container"> <ul class="objectpath"> - <li class="selected">Adding a new Portlet</li> + <li class="selected">#{bundle.WIZARD_ADDING_NEW_PORTLET}</li> </ul> <div class="property-container"> <c:choose> <c:when test="#{newWindowWizard.currentStep == 0}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </c:when> <c:otherwise> @@ -29,17 +30,17 @@ <f:param name="step" value="0"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </c:otherwise> </c:choose> @@ -49,9 +50,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 1}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </c:when> <c:otherwise> @@ -61,17 +62,17 @@ <f:param name="step" value="1"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </c:otherwise> </c:choose> @@ -81,9 +82,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 2}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </c:when> <c:otherwise> @@ -93,17 +94,17 @@ <f:param name="step" value="2"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </c:otherwise> </c:choose> @@ -113,9 +114,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 3}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </c:when> <c:otherwise> @@ -125,17 +126,17 @@ <f:param name="step" value="3"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </c:otherwise> </c:choose> @@ -145,9 +146,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 4}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </c:when> <c:otherwise> @@ -157,17 +158,17 @@ <f:param name="step" value="4"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </c:otherwise> </c:choose> @@ -181,21 +182,21 @@  <div class="wizardContent"> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </div> <div class="wizardButtonBox"> <h:form> - <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous" + <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="#{bundle.WIZARD_PREVIOUS}" action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/> <h:commandButton rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}" - value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> + value="#{bundle.WIZARD_NEXT}" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> </h:form> </div> <h:form> - <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p> + <p style="text-align: right;"><h:commandLink action="advancedMode">#{bundle.WIZARD_SWITCH_ADVANCED_MODE}</h:commandLink></p> </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/newWindowWizardConfirm.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,31 +5,32 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table> <tr> - <td><b>Portlet:</b></td> + <td><b>#{bundle.WIZARD_PORTLET}:</b></td> <td>#{newWindowWizard.selectedPortlet.name}</td> </tr> <tr> - <td><b>Portal:</b></td> + <td><b>#{bundle.WIZARD_PORTAL}:</b></td> <td>#{newWindowWizard.selectedPortal.name}</td> </tr> <tr> - <td><b>Page:</b></td> + <td><b>#{bundle.WIZARD_PAGE}:</b></td> <td>#{newWindowWizard.selectedPage.name}</td> </tr> <tr> - <td><b>Region:</b></td> + <td><b>#{bundle.WIZARD_REGION}:</b></td> <td>#{newWindowWizard.selectedRegionId}</td> </tr> </table> <h:form> - <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.WIZARD_CONFIRM}" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPage.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,13 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table class="datatable full-width"> <tbody class="portlet-section-header"> <tr> - <th>Page</th> + <th>#{bundle.WIZARD_PAGE}</th> <th></th> </tr> </tbody> @@ -19,7 +20,7 @@ <h:form> <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}"> - <h:outputText value="Up"/> + <h:outputText value="#{bundle.COMMON_UP}"/> <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> </h:commandLink> <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status"> @@ -34,7 +35,7 @@ <td> <c:if test="#{not empty object.pages}"> <h:commandLink id="cl2_#{status.index}" action="#{newWindowWizard.selectParentPage}"> - <h:outputText id="ot2_#{status.index}" value="Sub-Pages"/> + <h:outputText id="ot2_#{status.index}" value="#{bundle.WIZARD_SUB_PAGES}"/> <f:param id="f2_#{status.index}" name="id" value="#{object.id}"/> </h:commandLink> </c:if> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortal.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,13 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table class="full-width datatable"> <tbody class="portlet-section-header"> <tr> - <th>Portal</th> + <th>#{bundle.WIZARD_PORTAL}</th> </tr> </tbody> <tbody> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -4,16 +4,17 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <h:form> <h:outputLabel for="menu"> - <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.WIZARD_PORTLET_PROVIDER}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}"> <f:selectItems value="#{portletmgr.portletInvokerItems}"/> </h:selectOneMenu> - <h:commandButton value="Change" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.WIZARD_CHANGE}" styleClass="portlet-form-button"/> </h:form> <h:form> @@ -31,7 +32,7 @@ <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> + <th>#{bundle.COMMON_NAME}</th> </tr> </thead> <tbody> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml 2008-05-29 08:15:24 UTC (rev 10832) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectRegion.xhtml 2008-05-29 09:32:44 UTC (rev 10833) @@ -5,6 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> @@ -12,7 +13,7 @@ <tbody class="portlet-section-header"> <tr> - <th>Portal</th> + <th>#{bundle.WIZARD_PORTAL}</th> </tr> </tbody> <tbody>

18 years

1
0
0 / 0

JBoss Portal SVN: r10832 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-29 04:15:24 -0400 (Thu, 29 May 2008) New Revision: 10832 Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java Log: - Adding userStatus to the request for i18n purpose Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-29 07:46:30 UTC (rev 10831) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-29 08:15:24 UTC (rev 10832) @@ -183,6 +183,9 @@ { UserStatus userStatus = getUserStatus(inputPassword); + + // Set the user Status in the request so that the login page can show an error message accordingly + request.setAttribute("org.jboss.portal.userStatus", userStatus); if (userStatus == UserStatus.DISABLE) { @@ -207,8 +210,7 @@ { log.error("Unexpected error while logging in"); return false; - } - } + } } catch (Exception e) { log.error("Error when validating password", e);

18 years

1
0
0 / 0

JBoss Portal SVN: r10831 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-29 03:46:30 -0400 (Thu, 29 May 2008) New Revision: 10831 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: removing incorrect pipeline policy sentence Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-28 23:07:49 UTC (rev 10830) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-29 07:46:30 UTC (rev 10831) @@ -45,11 +45,8 @@ </sect1> <sect1> <title>Control Policies</title> - <para>If an error occurs, the request control-flow changes according to the configuration. This configuration is known as the <emphasis>control policy</emphasis>, which is a pipeline of policies, and looks as follows: + <para>If an error occurs, the request control-flow changes according to the configuration. This configuration is known as the <emphasis>control policy</emphasis>. </para> - <para> - <emphasis>Default Control Policy</emphasis> -> <emphasis>Portal Control Policy</emphasis> -> <emphasis>Page Control Policy</emphasis>. - </para> <sect2> <title>Policy Delegation and Cascading</title> <para>

18 years

1
0
0 / 0

JBoss Portal SVN: r10830 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF: classes and 4 other directories.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-28 19:07:49 -0400 (Wed, 28 May 2008) New Revision: 10830 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml Log: added internationalization updates Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-28 23:07:49 UTC (rev 10830) @@ -0,0 +1,201 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +PORTLET_INSTANCES=Portlet Instances +INSTANCE_DELETE=instance Delete +PORTLET_CAUSING_REFERENCING_NOT_ABLE=portlet instance causing windows referencing it to not be able to display their content anymore +ARE_YOU_SURE_DELETE=Are you sure you want to delete this portlet instance +DASHBOARD_THEME_PROPERTIES=Dashboard theme properties +CONFIGURE_DASHBOARD_SETTINGS=Configure dashboards settings +DASHBOARDS=Dashboards +ADD_DISPLAY_NAMES=Add Display Names +CURRENT_DISPLAY_NAMES=Current Display Names +MANAGE=Manage +PORTALS=portals +PORTAL=portal +SUB_PORTALS=sub-portals +PAGES_WITHIN=pages within +CREATE_PORTAL_NAMED=Create a portal named +PAGE_LAYOUT=Page layout +SECURITY=Security +THEME=Theme +RENAME=Rename +DISPLAY_NAMES=Display Names +MANAGE_SUB_PAGES_WITHIN=Manage sub-pages within +CREATE_PAGE_NAMED=Create a page named +SET_PAGE_PERMISSIONS=Please set the page permissions +PAGE_THEME_PROPERTIES=Page theme properties +SET_PORTAL_PERMISSIONS=Please set the portal permissions +PORTAL_THEME_PROPERTIES=Portal theme properties +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=These settings are inherited by all the pages and windows of this portal. You may override these settings by selecting the appropriate value on the respective Theme settings pages +EVENT_LISTENER_BINDING=Event Listener Binding +CHOOSE_ID_PORTALEVENTLISTENER=Choose the id of the PortalEventListener to bind to this +SET_PERMISSIONS_FOR=Please set the permissions for the +WINDOW=window +WINDOW_THEME_PROPERTIES=Window theme properties +INSTANCE_ID=Instance id +INSTANCE_NAME=Instance name +ACTIONS=Actions +PREFERENCES=Preferences +PORTLET_DETAILS=portlet details +ASSOCIATED_PORTLET_NOT_AVAILABLE=The associated portlet is not available +PREFERENCES=preferences +SECURITY_SETTINGS=security settings +MAKE_DEFAULT=Make Default +MANAGE_WINDOWS_WITHIN=Manage windows within +PORTAL_OBJECTS=Portal Objects +PORTALS=Portals +PORTLET_NAME=Portlet name +DESCRIPTION=Description +REMOTE=Remote +REMOTABLE=Remotable +ACTIONS=Actions +CREATE_INSTANCE=Create instance +PORTLET_DEFINITIONS=Portlet Definitions +DETAILS=details +INSTANCE_CREATION=instance creation +CREATE_INSTANCE_NAMED=Create an instance named +RENAME_THE=Rename the +TO=to +THIS_MINIMIZED_STATE=This window is set to a minimized state +THIS_NORMAL_STATE=This window defaults to a normal state +THIS_MAXIMIZED_STATE=This window is set to a maximized state +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=This window defaults to a minimized state because one window within this page is set to maximized +SWITCH_TO_WIZARD_MODE=Switch to wizard mode +CREATE_PORTAL=Create portal +CREATE_PAGE=Create page +DEFAULT=Default +WINDOW=Window +VIEW_PORTLETS_PROVIDED_BY=View portlets provided by the portlet provider named +VIEW_PORTLETS=View portlets + +COMMON_INCONSISTENT_STATE=Inconsistent state +COMMON_DELETE=Delete +COMMON_DELETING=WARNING! You are about to delete the +COMMON_FROM=from the +COMMON_SURE_DELETE=Are you sure you want to delete this +COMMON_ERROR_HANDLING=Page Error Handling +COMMON_CONFIGURE_ERRORS=Configure how the system handles errors on page level +COMMON_CASE=Case +COMMON_INHERITANCE=Inheritance +COMMON_ACTION=Action +COMMON_INHERIT_ACTION=inherit action from parent +COMMON_CONTENT_DEFINITION=Content Definition +COMMON_DEFINE_NAME_WINDOW=Define a name for the window of content (optional) +COMMON_WINDOW_NAME=Window Name +COMMON_SELECT_TYPE_CONTENT=Select the type of content that will be added to the page +COMMON_CONTENT_TYPE=Content Type +COMMON_SELECT_CONTENT=Select content that will be added to the page +COMMON_PAGE_LAYOUT=Page Layout +COMMON_REGION=Region +COMMON_UNASSIGNED_WINDOW=Unassigned windows +COMMON_PORTAL_ERROR_HANDLING=Portal Error Handling +COMMON_PORTAL_CONFIGURE_ERRORS=Configure how the system handles errors on portal level +COMMON_KEY=Key +COMMON_NAME=Name +COMMON_READONLY=ReadOnly +COMMON_VALUE=Value +COMMON_NO_DEFINED_PREFERENCES=No defined preferences for this portlet +COMMON_EDIT_EXISTING_VALUES=Edit existing values +COMMON_APPEND_VALUE=Append a value +COMMON_PROPERTIES=Properties +COMMON_ADD_PROPERTY=Add a property +COMMON_SELECT_PREDEFINED_PROPERTY=Select predefined property +COMMON_OR=or +COMMON_ENTER_PROPERTY_NAME=Enter property name +COMMON_MANAGE_PROPERTIES=Manage currently defined properties +COMMON_DESCRIPTION=Description +COMMON_INHERITED=Inherited +COMMON_YES=Yes +COMMON_NO=No +COMMON_ROLES=Roles +COMMON_PERMISSIONS=Permissions +COMMON_ROLE=Role +COMMON_SETTING=Setting +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Name of the layout implementation used to arrange portlet windows in pages +COMMON_THEME=Theme +COMMON_NAME_LOOK_AND_FEEL=Name of the look and feel to use +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Name of the render engine to use to render pages +COMMON_WINDOW_RENDERER=Window Renderer +COMMON_NAME_RENDER_ENGINE_WINDOWS=Name of the render engine to use to render windows +COMMON_DECORATION_RENDERER=Decoration Renderer +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Name of the render engine to use to render window decorations +COMMON_PORTLET_RENDERER=Portlet Renderer +COMMON_NAME_RENDER_ENGINE_PORTLETS=Name of the render engine to use to render portlets +COMMON_PORTLET_INSTANCE_INFORMATION=Portlet Instance Information +COMMON_PORTLET_NAME=Portlet name +COMMON_PORTLET_DESCRIPTION=Portlet description +COMMON_PORTLET_TITLE=Portlet title +COMMON_PORTLET_KEYWORDS=Portlet keywords +COMMON_PORTLET_LOCALES=Portlet locales +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Portlet Instance Display Names +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Add Instance Display Names +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Current Instance Display Names +COMMON_CANCEL=Cancel +COMMON_UPDATE=Update +COMMON_ADD=Add +COMMON_ADD_PROPERTY=Add Property +COMMON_UP=Up +COMMON_DOWN=Down +COMMON_NEW_VALUE=New value +COMMON_APPEND=Append +COMMON_LOCALE=Locale +COMMON_DISPLAY_NAME=Display Name + +DASHBOARD_PERSONAL_EDITOR=Personal Dashboard Editor +DASHBOARD_CREATE_NEW_PAGE=Create a New Page +DASHBOARD_CREATE_PAGE=Page name +DASHBOARD_RENAME_THIS_PAGE=Rename this Page +DASHBOARD_NEW_PAGE_NAME=New page name +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Use this page to manage the content and appearance of your dashboard pages +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=You can control the page titles, column layouts, page themes,and add,order, or remove portlets +DASHBOARD_CURRENTLY_EDITING_PAGE=Currently editing page +DASHBOARD_THEME_AND_LAYOUT=Theme and Layout +DASHBOARD_APPLY_THEME=Apply a theme to your dashboard, or select the number of columns for the layout +DASHBOARD_CHOOSE_LAYOUT=Choose a layout +DASHBOARD_CHOOSE_THEME=Choose a theme +DASHBOARD_CANNOT_UNDO_ACTION=You cannot undo this action +DASHBOARD_DELETE_THIS_PAGE=Delete this Page +DASHBOARD_SAVE=Save +DASHBOARD_SELECT=Select + +WIZARD_ADDING_NEW_PORTLET=Adding a new Portlet +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=Select Portlet +WIZARD_SELECT_PORTAL=Select Portal +WIZARD_SELECT_PAGE=Select Page +WIZARD_SELECT_REGION=Select Region +WIZARD_CONFIRM=Confirm +WIZARD_CONTENT=Content +WIZARD_SWITCH_ADVANCED_MODE=Switch to advanced mode +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portal +WIZARD_PAGE=Page +WIZARD_REGION=Region +WIZARD_PREVIOUS=Previous +WIZARD_NEXT=Next +WIZARD_SUB_PAGES=Sub-Pages +WIZARD_PORTLET_PROVIDER=Portlet provider +WIZARD_CHANGE=Change \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-28 23:07:49 UTC (rev 10830) @@ -0,0 +1,199 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +PORTLET_INSTANCES=Istanze di Portlet +INSTANCE_DELETE=Cancella Istanza +PORTLET_CAUSING_REFERENCING_NOT_ABLE=L'istanza di Portlet fa in modo che le finistre che la referenziano non siano pi\u00F9 abilitate a visualizzarne il contenuto +ARE_YOU_SURE_DELETE=Sei sicuro di voler cancellare quest\'istanza di Portlet +DASHBOARD_THEME_PROPERTIES=Propriet\u00e0 del tema della Dashboard +CONFIGURE_DASHBOARD_SETTINGS=Configurazione della Dashboard +DASHBOARDS=Dashboard +ADD_DISPLAY_NAMES=Aggiungi i nomi da visualizzare +CURRENT_DISPLAY_NAMES=Nomi attualmente visualizzati +MANAGE=Gestisci +PORTALS=portali +PORTAL=portale +SUB_PORTALS=sotto-portali +PAGES_WITHIN=pagine dentro +CREATE_PORTAL_NAMED=Crea un portale chiamato +PAGE_LAYOUT=Layout della pagina +SECURITY=Sicurezza +THEME=Tema +RENAME=Rinomina +DISPLAY_NAMES=Nomi visualizzati +DELETE=Cancella +MANAGE_SUB_PAGES_WITHIN=Gestisci le sotto-pagine dentro +CREATE_PAGE_NAMED=Crea una pagina chiamata +SET_PAGE_PERMISSIONS=Configura i permessi per la pagina +PAGE_THEME_PROPERTIES=Propriet\u00e0 del tema della Pagina +SET_PORTAL_PERMISSIONS=Configura i permessi per il portale +PORTAL_THEME_PROPERTIES=Propriet\u00e0 del tema del Portale +SETTINGS_ARE_INHERITED_BY_ALL_PAGES=Queste configurazioni saranno ereditate da tutte le pagine e finestre del portale. Puoi sovrascrivere queste configurazioni selezionando il valore appropriato nella configurazione del tema delle pagine +EVENT_LISTENER_BINDING=Ascoltatore di eventi +CHOOSE_ID_PORTALEVENTLISTENER=Scegli l\'id del PortalEventListener per agganciarti a questo +SET_PERMISSIONS_FOR=Configura i permessi per +WINDOW=finestra +WINDOW_THEME_PROPERTIES=Propriet\u00e0 del tema della Finestra +INSTANCE_ID=Id di Istanza +INSTANCE_NAME=Nome Istanza +ACTIONS=Azioni +PREFERENCES_MAX=Preferenze +PORTLET_DETAILS=dettagli della portlet +ASSOCIATED_PORTLET_NOT_AVAILABLE=La portlet associata non \u00e8 disponibile +PREFERENCES_MIN=preferenze +SECURITY_SETTINGS=configurazione della sicurezza +MAKE_DEFAULT=Rendi Default +MANAGE_WINDOWS_WITHIN=Gestisci le finestre dentro +PORTAL_OBJECTS=Oggetti del Portale +PORTALS=Portali +PORTLET_NAME=Nome della portlet +DESCRIPTION=Descrizione +REMOTE=Remoto +REMOTABLE=Remotabile +CREATE_INSTANCE=Crea istanza +PORTLET_DEFINITIONS=Definizioni di Portlet +DETAILS=dettagli +INSTANCE_CREATION=creazione dell\'istanza +CREATE_INSTANCE_NAMED=Crea un\'istanza chiamata +RENAME_THE=Rinomina il +TO=a +THIS_MINIMIZED_STATE=Questa finestra ha uno stato minimizzato +THIS_NORMAL_STATE=Questa finestra ha uno stato normale +THIS_MAXIMIZED_STATE=Questa finestra ha uno stato massimizzato +THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED=Questa finestra ha uno stato minimizzato perch\u00e8 una finestra in questa pagina ha uno stato massimizzato +SWITCH_TO_WIZARD_MODE=Vai alla modalit\u00e0 wizard +CREATE_PORTAL=Crea portale +CREATE_PAGE=Crea pagina +DEFAULT=Default +WINDOW=Finestra +VIEW_PORTLETS_PROVIDED_BY=Visualizza le portlet fornite dal provider chiamato +VIEW_PORTLETS=Visualizza le portlet + +COMMON_INCONSISTENT_STATE=Stato non consistente +COMMON_DELETE=Cancella +COMMON_DELETING=ATTENZIONE! Stai per cancellare il +COMMON_FROM=dal +COMMON_SURE_DELETE=Sei sicuro di volerlo cancellare +COMMON_ERROR_HANDLING=Gestione degli errori della Pagina +COMMON_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di pagina +COMMON_CASE=Caso +COMMON_INHERITANCE=Ereditariet\u00e0 +COMMON_ACTION=Azione +COMMON_INHERIT_ACTION=eredita l\'azione dal genitore +COMMON_CONTENT_DEFINITION=Definizione del Contenuto +COMMON_DEFINE_NAME_WINDOW=Dai un nome alla finestra dei contenuti (opzionale) +COMMON_WINDOW_NAME=Nome Finestra +COMMON_SELECT_TYPE_CONTENT=Seleziona il tipo di contenuto che sar\u00e0 aggiunto alla pagina +COMMON_CONTENT_TYPE=Tipo del Contenuto +COMMON_SELECT_CONTENT=Seleziona il contenuto che sar\u00e0 aggiunto alla pagina +COMMON_PAGE_LAYOUT=Layout della Pagina +COMMON_REGION=Regione +COMMON_UNASSIGNED_WINDOW=Finestre non assegnate +COMMON_PORTAL_ERROR_HANDLING=Gestione degli errori del Portale +COMMON_PORTAL_CONFIGURE_ERRORS=Configura la gestione degli errori a livello di portale +COMMON_KEY=Chiave +COMMON_NAME=Nome +COMMON_READONLY=Sola lettura +COMMON_VALUE=Valore +COMMON_NO_DEFINED_PREFERENCES=Non ci sono preferenze per questa portlet +COMMON_EDIT_EXISTING_VALUES=Modifica i valori esistenti +COMMON_APPEND_VALUE=Appendi un valore +COMMON_PROPERTIES=Propriet\u00e0 +COMMON_ADD_PROPERTY=Aggiungi una propriet\u00e0 +COMMON_SELECT_PREDEFINED_PROPERTY=Seleziona la propriet\u00e0 predefinita +COMMON_OR=o +COMMON_ENTER_PROPERTY_NAME=Inserisci il nome della propriet\u00e0 +COMMON_MANAGE_PROPERTIES=Gestisci le propriet\u00e0 attualmente definite +COMMON_INHERITED=Ereditato +COMMON_YES=Si +COMMON_NO=No +COMMON_ROLES=Ruoli +COMMON_PERMISSIONS=Permessi +COMMON_ROLE=Ruolo +COMMON_SETTING=Configurazione +COMMON_LAYOUT=Layout +COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome dell\'implementazione del layout usato per le finestre della portlet nelle pagine +COMMON_NAME_LOOK_AND_FEEL=Nome del look and feel da usare +COMMON_RENDERSET=RenderSet +COMMON_NAME_RENDER_ENGINE_PAGES=Nome del motore di Render da usare per creare le pagine +COMMON_WINDOW_RENDERER=Renderer della Finestra +COMMON_NAME_RENDER_ENGINE_WINDOWS=Nome del motore di Render da usare per creare le finestre +COMMON_DECORATION_RENDERER=Renderer della Decorazione +COMMON_NAME_RENDER_ENGINE_DECORATIONS=Nome del motore di Render da usare per creare le decorazioni delle finestre +COMMON_PORTLET_RENDERER=Renderer della Portlet +COMMON_NAME_RENDER_ENGINE_PORTLETS=Nome del motore di Render da usare per creare le portlet +COMMON_PORTLET_INSTANCE_INFORMATION=Informazione sull\'Istanza della Portlet +COMMON_PORTLET_NAME=Nome Portlet +COMMON_PORTLET_DESCRIPTION=Descrizione della Portlet +COMMON_PORTLET_TITLE=Titolo della Portlet +COMMON_PORTLET_KEYWORDS=Parole chiave della Portlet +COMMON_PORTLET_LOCALES=Localizzazione della Portlet +COMMON_PORTLET_INSTANCE_DISPLAY_NAMES=Elenco dei nomi delle istanze di Portlet +COMMON_ADD_INSTANCE_DISPLAY_NAMES=Aggiungi i nomi delle istanze di Portlet +COMMON_CURRENT_INSTANCE_DISPLAY_NAMES=Nomi attuali delle istanze di Portlet +COMMON_CANCEL=Annulla +COMMON_UPDATE=Aggiorna +COMMON_ADD=Aggiungi +COMMON_ADD_PROPERTY=Aggiungi Propriet\u00e0 +COMMON_UP=Su +COMMON_DOWN=Giu +COMMON_NEW_VALUE=Nuovo valore +COMMON_APPEND=Aggiungi +COMMON_LOCALE=Nazionalit\u00e0 +COMMON_DISPLAY_NAME=Visualizza Nome + +DASHBOARD_PERSONAL_EDITOR=Editor personale della Dashboard +DASHBOARD_CREATE_NEW_PAGE=Crea una nuova pagina +DASHBOARD_CREATE_PAGE=Nome pagina +DASHBOARD_RENAME_THIS_PAGE=Rinomina la pagina +DASHBOARD_NEW_PAGE_NAME=Nuovo nome per la pagina +DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE=Usa questa pagina per gestire i contenuti e la grafica delle pagine della tua Dashboard +DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES=Puoi controllare i titoli delle pagine, i layout di colonna, i temi della pagina,e aggiungere,ordinare, o rimuovere portlet +DASHBOARD_CURRENTLY_EDITING_PAGE=Pagina attualmente da editare +DASHBOARD_THEME_AND_LAYOUT=Tema e Layout +DASHBOARD_APPLY_THEME=Applica un tema alla tua dashboard, o seleziona il numero di colonne per il layout +DASHBOARD_CHOOSE_LAYOUT=Scegli un layout +DASHBOARD_CHOOSE_THEME=Scegli un tema +DASHBOARD_CANNOT_UNDO_ACTION=Non puoi annullare l\'azione +DASHBOARD_DELETE_THIS_PAGE=Cancella questa Pagina +DASHBOARD_SAVE=Salva +DASHBOARD_SELECT=Seleziona + +WIZARD_ADDING_NEW_PORTLET=Aggiungere una nuova portlet +WIZARD_STEP=Step +WIZARD_SELECT_PORTLET=Seleziona la Portlet +WIZARD_SELECT_PORTAL=Seleziona il Portale +WIZARD_SELECT_PAGE=Seleziona la Pagina +WIZARD_SELECT_REGION=Seleziona la Regione +WIZARD_CONFIRM=Conferma +WIZARD_CONTENT=Contenuto +WIZARD_SWITCH_ADVANCED_MODE=Vai alla modalit\u00e0 avanzata +WIZARD_PORTLET=Portlet +WIZARD_PORTAL=Portale +WIZARD_PAGE=Pagina +WIZARD_REGION=Regione +WIZARD_PREVIOUS=Indietro +WIZARD_NEXT=Avanti +WIZARD_SUB_PAGES=Sotto-Pagine +WIZARD_PORTLET_PROVIDER=Fornitore di Portlet +WIZARD_CHANGE=Cambia \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-05-28 23:07:49 UTC (rev 10830) @@ -28,6 +28,7 @@ <faces-config> <application> + <message-bundle>Resource</message-bundle> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> </application> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/confirm.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -7,13 +7,14 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="../objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Delete"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_DELETE}"/> <ui:define name="content"> <f:subview rendered="#{empty portalobjectmgr.selectedDeletingObject}"> - <p class="portlet-msg-error">Inconsistent state</p> + <p class="portlet-msg-error">#{bundle.COMMON_INCONSISTENT_STATE}</p> </f:subview> <f:subview rendered="#{not empty portalobjectmgr.selectedDeletingObject}"> @@ -22,26 +23,26 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>Delete <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> + <h3>#{bundle.COMMON_DELETE} <h:outputText value="#{portalobjectmgr.selectedObjectType}"/></h3> <p class="portlet-msg-alert"> - WARNING! You are about to delete the + #{bundle.COMMON_DELETING} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{portalobjectmgr.selectedObject.typeName} from the + #{portalobjectmgr.selectedObject.typeName} #{bundle.COMMON_FROM} <c:if test="#{not empty portalobjectmgr.selectedObjectParent.name}"> <span class="objectName">#{portalobjectmgr.selectedObjectParent.name}</span> </c:if> #{portalobjectmgr.selectedObjectParent.typeName}! </p> - <p class="portlet-class">Are you sure you want to delete this #{portalobjectmgr.selectedObjectType}?</p> + <p class="portlet-class">#{bundle.COMMON_SURE_DELETE} #{portalobjectmgr.selectedObjectType}?</p> <h:form> - <h:commandButton value="Delete" action="objects" actionListener="#{portalobjectmgr.destroyObject}" + <h:commandButton value="#{bundle.COMMON_DELETE}" action="objects" actionListener="#{portalobjectmgr.destroyObject}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="objectId" value="#{portalobjectmgr.selectedDeletingObject.id}"/> </h:commandButton> - <h:commandButton value="Cancel" action="objects" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="objects" actionListener="#{portalobjectmgr.selectParentObject}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -4,13 +4,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<p class="portlet-area-header">Page Error Handling</p> +<f:loadBundle basename="Resource" var="bundle" /> +<p class="portlet-area-header">#{bundle.COMMON_ERROR_HANDLING}</p> <div class="portlet-area-body">  <table cellpadding="0" cellspacing="0" width="100%"> <tr> - <th class="portlet-section-title">Configure how the system handles errors on page level.</th> + <th class="portlet-section-title">#{bundle.COMMON_CONFIGURE_ERRORS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> @@ -20,9 +21,9 @@ <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> + <th>#{bundle.COMMON_CASE}</th> + <th>#{bundle.COMMON_INHERITANCE}</th> + <th>#{bundle.COMMON_ACTION}</th> </tr> </thead> <tbody> @@ -34,8 +35,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlAccessDenied.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlAccessDenied.inherit}" - value="#{properties.pageControlAccessDenied.inherited}"/>inherit action - from parent + value="#{properties.pageControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlAccessDenied.value}" @@ -52,8 +52,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlUnavailable.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlUnavailable.inherit}" - value="#{properties.pageControlUnavailable.inherited}"/>inherit action - from parent + value="#{properties.pageControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlUnavailable.value}" @@ -70,8 +69,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlError.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlError.inherit}" - value="#{properties.pageControlError.inherited}"/>inherit action from - parent + value="#{properties.pageControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlError.value}" @@ -88,8 +86,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlInternalError.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlInternalError.inherit}" - value="#{properties.pageControlInternalError.inherited}"/>inherit action - from parent + value="#{properties.pageControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlInternalError.value}" @@ -106,8 +103,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlNotFound.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlNotFound.inherit}" - value="#{properties.pageControlNotFound.inherited}"/>inherit action from - parent + value="#{properties.pageControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.pageControlNotFound.value}" @@ -124,8 +120,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.pageControlResourceURI.inheritable}" onclick="submit();" valueChangeListener="#{properties.pageControlResourceURI.inherit}" - value="#{properties.pageControlResourceURI.inherited}"/>inherit action - from parent + value="#{properties.pageControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:inputText value="#{properties.pageControlResourceURI.value}" size="60" @@ -134,7 +129,7 @@ </tr> </tbody> </table> -<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,24 +5,25 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <br/> <table width="100%"> <tr> <td valign="top" width="50%"> - <p class="portlet-area-header">Content Definition</p> + <p class="portlet-area-header">#{bundle.COMMON_CONTENT_DEFINITION}</p> <div class="portlet-area-body"> <table> <tr> - <td colspan="2">Define a name for the window of content (optional): + <td colspan="2">#{bundle.COMMON_DEFINE_NAME_WINDOW}: </td> </tr> <tr> <td colspan="2"> <h:form id="windowForm"> <label for="windowName"> - <span class="portlet-form-field-label admin-label">Window Name:</span> + <span class="portlet-form-field-label admin-label">#{bundle.COMMON_WINDOW_NAME}:</span> <h:inputText id="windowName" value="#{pageManager.windowName}" styleClass="portlet-form-input-field"/> </label> @@ -33,14 +34,14 @@ <tr> <td colspan="2"> <hr/> - Select the type of content that will be added to the page: + #{bundle.COMMON_SELECT_TYPE_CONTENT}: </td> </tr> <tr> <td> <h:form id="abc"> <label for="instanceId" class="portlet-form-field-label-container"> - <span class="portlet-form-field-label admin-label">Content Type:</span> + <span class="portlet-form-field-label admin-label">#{bundle.COMMON_CONTENT_TYPE}:</span> <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> <h:selectOneMenu id="instanceId" @@ -58,7 +59,7 @@ <tr> <td colspan="2"> <hr/> - Select content that will be added to the page: + #{bundle.COMMON_SELECT_CONTENT}: </td> </tr> <tr> @@ -82,7 +83,7 @@ </td> <td valign="top" width="50%"> - <p class="portlet-area-header">Page Layout</p> + <p class="portlet-area-header">#{bundle.COMMON_PAGE_LAYOUT}</p> <div class="portlet-area-body"> @@ -95,14 +96,14 @@ <tr> <td colspan="3" class="portlet-form-field-label"> <hr/> - #{regionName} Region + #{regionName} #{bundle.COMMON_REGION} </td> </tr> <tr> <td valign="top"> <h:commandButton onclick="document.getElementById('blah').value=document.getElementById('windowForm:windowName').value" - value="Add" id="a_#{regionName}" + value="#{bundle.COMMON_ADD}" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> </td> @@ -116,16 +117,16 @@ </td> <td valign="top" width="250"> <h:commandButton - value="Up" id="u_#{regionName}" + value="#{bundle.COMMON_UP}" id="u_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/><br/> <h:commandButton - value="Down" id="d_#{regionName}" + value="#{bundle.COMMON_DOWN}" id="d_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> <hr/> <h:commandButton - value="Delete" id="l_#{regionName}" + value="#{bundle.COMMON_DELETE}" id="l_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/> </td> @@ -136,14 +137,13 @@ <tbody> <tr> <td colspan="2" class="portlet-form-field-label" - style="border-width:0px;border-top:1px dashed #d5d5d5">Unassigned - windows + style="border-width:0px;border-top:1px dashed #d5d5d5">#{bundle.COMMON_UNASSIGNED_WINDOW} </td> </tr> <tr> <td> <div style="margin-top: 1em"> - <h:commandButton value="Delete" + <h:commandButton value="#{bundle.COMMON_DELETE}" id="l_unknown" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button"/> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,14 +5,15 @@ xmlns:c="http://java.sun.com/jstl/core"> -<p class="portlet-area-header">Portal Error Handling</p> +<f:loadBundle basename="Resource" var="bundle" /> +<p class="portlet-area-header">#{bundle.COMMON_PORTAL_ERROR_HANDLING}</p> <div class="portlet-area-body">  <table class="full-width"> <tr> - <th class="portlet-section-title">Configure how the system handles errors on portal level.</th> + <th class="portlet-section-title">#{bundle.COMMON_PORTAL_CONFIGURE_ERRORS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> @@ -21,9 +22,9 @@ <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Case</th> - <th>Inheritance</th> - <th>Action</th> + <th>#{bundle.COMMON_CASE}</th> + <th>#{bundle.COMMON_INHERITANCE}</th> + <th>#{bundle.COMMON_ACTION}</th> </tr> </thead> <tbody> @@ -35,8 +36,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlAccessDenied.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlAccessDenied.inherit}" - value="#{properties.portalControlAccessDenied.inherited}"/>inherit - action from parent + value="#{properties.portalControlAccessDenied.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlAccessDenied.value}" @@ -54,8 +54,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlUnavailable.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlUnavailable.inherit}" - value="#{properties.portalControlUnavailable.inherited}"/>inherit - action from parent + value="#{properties.portalControlUnavailable.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlUnavailable.value}" @@ -73,8 +72,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlError.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlError.inherit}" - value="#{properties.portalControlError.inherited}"/>inherit action from - parent + value="#{properties.portalControlError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlError.value}" @@ -91,8 +89,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlInternalError.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlInternalError.inherit}" - value="#{properties.portalControlInternalError.inherited}"/>inherit - action from parent + value="#{properties.portalControlInternalError.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlInternalError.value}" @@ -110,8 +107,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlNotFound.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlNotFound.inherit}" - value="#{properties.portalControlNotFound.inherited}"/>inherit action - from parent + value="#{properties.portalControlNotFound.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:selectOneMenu value="#{properties.portalControlNotFound.value}" @@ -128,8 +124,7 @@ <h:selectBooleanCheckbox disabled="#{!properties.portalControlResourceURI.inheritable}" onclick="submit();" valueChangeListener="#{properties.portalControlResourceURI.inherit}" - value="#{properties.portalControlResourceURI.inherited}"/>inherit - action from parent + value="#{properties.portalControlResourceURI.inherited}"/>#{bundle.COMMON_INHERIT_ACTION} </td> <td> <h:inputText value="#{properties.portalControlResourceURI.value}" size="60" @@ -138,7 +133,7 @@ </tr> </tbody> </table> -<h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/> +<h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPreferences.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,17 +5,18 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{not empty prefs.entries}"> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header" style="text-align:left;"> <tr> - <th>Key</th> - <th>Name</th> - <th>ReadOnly</th> + <th>#{bundle.COMMON_KEY}</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_READONLY}</th> <c:if test="#{prefs.mutable}"> - <th>Value</th> + <th>#{bundle.COMMON_VALUE}</th> </c:if> </tr> </thead> @@ -50,21 +51,21 @@ </h:form> </c:when> <c:otherwise> - <p>No defined preferences for this portlet.</p> + <p>#{bundle.COMMON_NO_DEFINED_PREFERENCES}.</p> </c:otherwise> </c:choose> <c:if test="#{prefs.selectedEntry != null}"> <h:form style="padding: 1em 0 1em 0"> <fieldset style="border: 1px solid;"> - <legend>Edit existing values</legend> + <legend>#{bundle.COMMON_EDIT_EXISTING_VALUES}</legend> <table> <tbody> <c:forEach items="#{prefs.selectedEntry.indices}" var="index" varStatus="status"> <tr> <td> <h:outputLabel for="row_#{status.index}"> - <h:outputText value="Value #{status.index}: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_VALUE} #{status.index}: " styleClass="portlet-form-field-label"/> </h:outputLabel> </td> <td> @@ -74,14 +75,14 @@ <h:commandButton id="row_#{status.index}" actionListener="#{prefs.selectedEntry.deleteLine}" - value="Delete" + value="#{bundle.COMMON_DELETE}" styleClass="portlet-form-button"/> </td> </tr> </c:forEach> <tr> <td colspan="3"> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </td> </tr> </tbody> @@ -91,12 +92,12 @@ <h:form> <fieldset style="border: 1px solid;"> - <legend>Append a value</legend> + <legend>#{bundle.COMMON_APPEND_VALUE}</legend> <h:outputLabel for="new_value"> - <h:outputText value="New value: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.COMMON_NEW_VALUE}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:inputText id="new_value" value="#{prefs.selectedEntry.line}" styleClass="portlet-form-input-field"/> - <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="Append" + <h:commandButton action="#{prefs.selectedEntry.appendLine}" value="#{bundle.COMMON_APPEND}" styleClass="portlet-form-button"/> </fieldset> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -4,7 +4,8 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> -<div class="portlet-area-header">Properties</div> +<f:loadBundle basename="Resource" var="bundle" /> +<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div> <div class="portlet-area-body">  @@ -15,7 +16,7 @@  <table class="full-width"> <tr> - <th class="portlet-section-title">Add a property.</th> + <th class="portlet-section-title">#{bundle.COMMON_ADD_PROPERTY}.</th> </tr> <tr> <td class="dotted-blue-vert-rt"> @@ -27,8 +28,7 @@ <f:subview id="predefined-properties" rendered="#{not empty properties.propertyItems}"> <tr> <td class="portlet-form-field-label"> - <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">Select - predefined property:</h:outputLabel> + <h:outputLabel for="predefinedProperty" styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel> </td> </tr> <tr> @@ -39,13 +39,13 @@ </td> </tr> <tr> - <td align="center">or</td> + <td align="center">#{bundle.COMMON_OR}</td> </tr> </f:subview> <tr> <td class="portlet-form-field-label"> - <h:outputLabel for="property" styleClass="portlet-form-field-label">Enter property - name:</h:outputLabel> + <h:outputLabel for="property" styleClass="portlet-form-field-label"> + #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel> </td> </tr> <tr> @@ -57,7 +57,7 @@ </tbody> </table>  - <h:commandButton value="Add Property" styleClass="portlet-form-button portlet-section-buttonrow" + <h:commandButton value="#{bundle.COMMON_ADD_PROPERTY}" styleClass="portlet-form-button portlet-section-buttonrow" action="#{properties.action.updateProperty}"/></h:form> </td> @@ -73,7 +73,7 @@ <c:if test="#{properties.size != 0}"> <table class="full-width"> <tr> - <th class="portlet-section-title">Manage currently defined properties.</th> + <th class="portlet-section-title">#{bundle.COMMON_MANAGE_PROPERTIES}.</th> </tr> <tr> <td class="portlet-section-body" valign="top"> @@ -83,19 +83,19 @@ <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> - <f:facet name="header">Name</f:facet> + <f:facet name="header">#{bundle.COMMON_NAME}</f:facet> <h:outputText title="#{prop.type}" value="#{prop.displayName}"/> </h:column> <h:column> - <f:facet name="header">Description</f:facet> + <f:facet name="header">#{bundle.COMMON_DESCRIPTION}</f:facet> <h:outputText>#{prop.description}</h:outputText> </h:column> <h:column> - <f:facet name="header">Inherited</f:facet> - <h:outputText>#{prop.inherited ? 'Yes' : 'No'}</h:outputText> + <f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet> + <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText> </h:column> <h:column> - <f:facet name="header">Value</f:facet> + <f:facet name="header">#{bundle.COMMON_VALUE}</f:facet> <h:selectBooleanCheckbox value="#{prop.value}" readonly="#{prop.readOnly}" rendered="#{prop.type == 'java.lang.Boolean'}"/> @@ -122,17 +122,17 @@ </h:column> <h:column> - <f:facet name="header">Delete</f:facet> + <f:facet name="header">#{bundle.COMMON_DELETE}</f:facet> <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="name" value="#{prop.name}"/> </h:commandLink> </h:column> </h:dataTable>  - <h:commandButton value="Update" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button portlet-section-buttonrow"/></h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editSecurity.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,12 +5,13 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="datatable full-width"> <thead class="portlet-section-header"> <tr> - <th>Roles</th> - <th>Permissions</th> + <th>#{bundle.COMMON_ROLES}</th> + <th>#{bundle.COMMON_PERMISSIONS}</th> </tr> </thead> <tbody> @@ -18,7 +19,7 @@ <tr class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <td> <h:outputLabel for="cars_#{status.index}"> - Role + #{bundle.COMMON_ROLE} #{role == '__unchecked__' ? 'Unchecked' : (auth.roleDisplayNameMap[role] != null ? auth.roleDisplayNameMap[role] : role)}: </h:outputLabel> </td> @@ -36,8 +37,8 @@ </table> <br /> <div> - <h:commandButton value="Update" action="#{auth.submit}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="#{auth.submit}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{auth.cancel}" styleClass="portlet-form-button" immediate="true"/> </div> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -1,19 +1,20 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> </tr> </thead> <tbody> <tr class="portlet-section-body"> - <td>Layout</td> - <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td>#{bundle.COMMON_LAYOUT}</td> + <td>#{bundle.COMMON_NAME_LAYOUT_IMPLEMENTATION}</td> <td> <h:selectOneMenu id="layout" value="#{theme.layoutName}"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> @@ -21,8 +22,8 @@ </td> </tr> <tr class="portlet-section-alternate"> - <td>Theme</td> - <td>Name of the look and feel to use</td> + <td>#{bundle.COMMON_THEME}</td> + <td>#{bundle.COMMON_NAME_LOOK_AND_FEEL}</td> <td> <h:selectOneMenu id="theme" value="#{theme.themeName}"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> @@ -30,8 +31,8 @@ </td> </tr> <tr class="portlet-section-body"> - <td>RenderSet</td> - <td>Name of the render engine to use to render pages</td> + <td>#{bundle.COMMON_RENDERSET}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PAGES}</td> <td> <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -4,19 +4,20 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> + <th>#{bundle.COMMON_NAME}</th> + <th>#{bundle.COMMON_DESCRIPTION}</th> + <th>#{bundle.COMMON_SETTING}</th> </tr> </thead> <tbody> <tr class="portlet-section-body"> - <td>Window Renderer</td> - <td>Name of the render engine to use to render windows</td> + <td>#{bundle.COMMON_WINDOW_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_WINDOWS}</td> <td> <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> @@ -24,8 +25,8 @@ </td> </tr> <tr class="portlet-section-alternate"> - <td>Decoration Renderer</td> - <td>Name of the render engine to use to render window decorations</td> + <td>#{bundle.COMMON_DECORATION_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_DECORATIONS}</td> <td> <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> @@ -33,8 +34,8 @@ </td> </tr> <tr> - <td>Portlet Renderer</td> - <td>Name of the render engine to use to render portlets</td> + <td>#{bundle.COMMON_PORTLET_RENDERER}</td> + <td>#{bundle.COMMON_NAME_RENDER_ENGINE_PORTLETS}</td> <td> <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/showPortletDetails.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,12 +5,13 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <h:form> - <p class="portlet-area-header">Portlet Instance Information</p> + <p class="portlet-area-header">#{bundle.COMMON_PORTLET_INSTANCE_INFORMATION}</p> <h:panelGrid columns="3" styleClass="panelGrid-basic"> <f:subview id="field1"> <dl> - <dt class="portlet-form-field-label">Portlet name:</dt> + <dt class="portlet-form-field-label">#{bundle.COMMON_PORTLET_NAME}:</dt> <dd><h:commandLink action="#{portletmgr.selectPortlet}"> <f:param name="id" value="#{portlet.context.id}"/> @@ -21,25 +22,25 @@ </f:subview> <f:subview id="field2"> <dl> - <dt class="portlet-form-field-label">Portlet description:</dt> + <dt class="portlet-form-field-label">#{bundle.COMMON_PORTLET_DESCRIPTION}:</dt> <dd>#{portlet.description.value}</dd> </dl> </f:subview> <f:subview id="field3"> <dl> - <dt class="portlet-form-field-label">Portlet title:</dt> + <dt class="portlet-form-field-label">#{bundle.COMMON_PORTLET_TITLE}:</dt> <dd>#{portlet.title.value}</dd> </dl> </f:subview> <f:subview id="field4"> <dl> - <dt class="portlet-form-field-label">Portlet keywords:</dt> + <dt class="portlet-form-field-label">#{bundle.COMMON_PORTLET_KEYWORDS}:</dt> <dd>#{portlet.keywords.value}</dd> </dl> </f:subview> <f:subview id="field5" rendered="#{not empty portlet.locales}"> <dl> - <dt class="portlet-form-field-label">Portlet locales:</dt> + <dt class="portlet-form-field-label">#{bundle.COMMON_PORTLET_LOCALES}:</dt> <dd><c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach></dd> </dl> </f:subview> @@ -48,10 +49,10 @@ </h:form> <f:subview id="displaynamecontainer" rendered="#{showDisplayNameEditor}"> - <p class="portlet-area-header">Portlet Instance Display Names</p> + <p class="portlet-area-header">#{bundle.COMMON_PORTLET_INSTANCE_DISPLAY_NAMES}</p> <div class="float-left third-width-pad5"> <h:form id="displayNameForm"> - <h3 class="sectionTitle zero">Add Instance Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.COMMON_ADD_INSTANCE_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> <h:inputText id="newName" value="#{instanceDisplayNameAction.newText}" required="true"/> @@ -66,7 +67,7 @@ <div class="float-left two-third-width-pad5"> <h:form> - <h3 class="sectionTitle zero">Current Instance Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.COMMON_CURRENT_INSTANCE_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> @@ -76,34 +77,34 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Locale"/> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> </f:facet> #{value.localeDisplayName} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Display Name"/> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> </f:facet> #{value.text} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Delete"/> + <h:outputText value="#{bundle.COMMON_DELETE}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="delete"/> </h:commandLink></div> </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{instanceDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="Rename"/> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="rename"/> </h:commandLink></div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -7,17 +7,18 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="instances">Portlet Instances</h:commandLink> + <h:commandLink action="instances">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.INSTANCE_DELETE} </li> </ul> </h:form> @@ -29,19 +30,18 @@ <h3>Delete <span class="objectName">#{instancemgr.selectedInstance.id}</span></h3> <p class="portlet-msg-alert"> - WARNING! You are about to delete the - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet instance causing windows - referencing it to not be able to display their content anymore. + #{bundle.COMMON_DELETING} + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_CAUSING_REFERENCING_NOT_ABLE}. </p> - <p class="portlet-class">Are you sure you want to delete this portlet instance?</p> + <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}?</p> <h:form> - <h:commandButton value="Delete" action="instances" actionListener="#{instancemgr.deleteInstance}" + <h:commandButton value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:attribute name="instanceId" value="#{instancemgr.selectedInstance.id}"/> </h:commandButton> - <h:commandButton value="Cancel" action="instances" actionListener="objects" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="instances" actionListener="objects" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboard/dashboard.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -6,13 +6,14 @@ xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <div align="center"> <h:message id="error" for="error" errorClass="portlet-msg-error"/> </div> <table class="full-width datatable"> <tr> - <th class="portlet-section-header" align="center">Personal Dashboard Editor</th> + <th class="portlet-section-header" align="center">#{bundle.DASHBOARD_PERSONAL_EDITOR}</th> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -21,11 +22,11 @@ <td width="250"> <table class="bottombuttonbar"> <tr> - <td align="left" valign="top"><b>Create a New Page:</b><br/>Page name:  + <td align="left" valign="top"><b>#{bundle.DASHBOARD_CREATE_NEW_PAGE}:</b><br/>#{bundle.DASHBOARD_CREATE_PAGE}:  <h:form style="padding:0;margin:0"> <h:inputText id="pageName" value="#{addDashboardPageAction.pageName}" styleClass="portlet-form-input-field"/> - <h:commandButton value="Save" + <h:commandButton value="#{bundle.SAVE}" action="#{addDashboardPageAction.execute}" styleClass="portlet-form-button"/> </h:form> @@ -33,12 +34,12 @@ </tr> <c:if test="#{dashboard.selectedPage.name != 'default'}"> <tr> - <td align="left" valign="top"><b>Rename this Page:</b><br/>New page name:  + <td align="left" valign="top"><b>#{bundle.DASHBOARD_RENAME_THIS_PAGE}:</b><br/>#{bundle.DASHBOARD_NEW_PAGE_NAME}:  <h:form id="renameForm" style="padding:0;margin:0"> <h:message for="newName"/> <h:inputText id="newName" value="#{renameDashboardPageAction.newName}" styleClass="portlet-form-input-field"/> - <h:commandButton value="Rename" + <h:commandButton value="#{bundle.RENAME}" action="#{renameDashboardPageAction.execute}" styleClass="portlet-form-button"/> </h:form> @@ -48,17 +49,15 @@ </table> </td> <td align="left" valign="top"> - Use this page to manage the content and appearance of your dashboard pages. <br/> - You can control the page titles, column layouts, page themes, - and add, - order, or remove portlets. + #{bundle.DASHBOARD_USE_PAGE_MANAGE_CONTENT_APPEARANCE}. <br/> + #{bundle.DASHBOARD_YOU_CAN_CONTROL_TITLES_COLUMN_THEMES}. </td> </tr> </table> </td> </tr> <tr> - <td class="portlet-section-header" align="center">Currently editing page #{dashboard.selectedPage.name}</td> + <td class="portlet-section-header" align="center">#{bundle.DASHBOARD_CURRENTLY_EDITING_PAGE} #{dashboard.selectedPage.name}</td> </tr> <tr> <td class="portlet-section-body" align="center"> @@ -83,23 +82,23 @@ <table class="bottombuttonbar"> <tr> <td valign="top"> - <b>Theme and Layout</b> + <b>#{bundle.DASHBOARD_THEME_AND_LAYOUT}</b> <br/> - Apply a theme to your dashboard, or select the number of columns for the layout. + #{bundle.DASHBOARD_APPLY_THEME}. <hr/> </td> </tr> <tr> <td> <h:form> - Choose a layout:<br/> + #{bundle.DASHBOARD_CHOOSE_LAYOUT}:<br/> <h:selectOneMenu id="layoutSelector" value="#{dashboard.selectedPageLayout}" styleClass="portlet-form-field"> <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button" action="#{dashboard.updateLayout}"/> </h:form> </td> @@ -110,14 +109,14 @@ <tr> <td> <h:form> - Choose a theme:<br/> + #{bundle.DASHBOARD_CHOOSE_THEME}:<br/> <h:selectOneMenu id="themeSelector" value="#{dashboard.selectedPageTheme}" styleClass="portlet-form-field"> <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> </h:selectOneMenu> - <h:commandButton value="Select" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_SELECT}" styleClass="portlet-form-button" action="#{dashboard.updateTheme}"/> </h:form> </td> @@ -151,10 +150,10 @@ <tr> <td align="left"> <h:form style="padding:0;margin:0"> - <h:commandButton value="Delete this Page" styleClass="portlet-form-button" + <h:commandButton value="#{bundle.DASHBOARD_DELETE_THIS_PAGE}" styleClass="portlet-form-button" action="#{dashboard.destroyPage}"/> <br/> - <font color="red">You cannot undo this action!</font> + <font color="red">#{bundle.DASHBOARD_CANNOT_UNDO_ACTION}!</font> </h:form> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,7 +5,7 @@ xmlns:c="http://java.sun.com/jstl/core" template="dashboardsTemplate.xhtml"> - + <f:loadBundle basename="Resource" var="bundle" /> <ui:define name="content">  @@ -35,19 +35,19 @@ <br/> <div class="property-container"> - <p class="portlet-area-header">Dashboard theme properties</p> + <p class="portlet-area-header">#{bundle.DASHBOARD_THEME_PROPERTIES}</p> <div class="portlet-area-body"> <table cellpadding="0" cellspacing="0" width="100%"> <tr> - <th class="portlet-section-title">Configure dashboards settings.</th> + <th class="portlet-section-title">#{bundle.CONFIGURE_DASHBOARD_SETTINGS}.</th> </tr> <tr> <td valign="top" class="portlet-section-body"> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{dashboardmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" actionListener="#{dashboardmgr.theme.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboardsTemplate.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -7,19 +7,20 @@ class="admin-ui">  + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> - <li id="currentTab">Dashboards</li> + <li id="currentTab">#{bundle.DASHBOARDS}</li> </ul> </h:form> <ui:decorate template="common/tabContainer.xhtml"> @@ -29,7 +30,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/displayNameObject.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -4,14 +4,15 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Display Names"/> + <ui:param name="portalObjectScreen" value="#{bundle.DISPLAY_NAMES}"/> <ui:define name="content"> <br/><br/> <div class="float-left third-width-pad5"> <h:form id="displayNameForm"> - <h3 class="sectionTitle zero">Add Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.ADD_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> <h:inputText id="newName" value="#{addDisplayNameAction.newText}" required="true"/> @@ -26,7 +27,7 @@ <div class="float-left two-third-width-pad5"> <h:form> - <h3 class="sectionTitle zero">Current Display Names</h3> + <h3 class="sectionTitle zero">#{bundle.CURRENT_DISPLAY_NAMES}</h3> <div class="portlet-area-body"> @@ -36,34 +37,34 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Locale"/> + <h:outputText value="#{bundle.COMMON_LOCALE}"/> </f:facet> #{value.localeDisplayName} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Display Name"/> + <h:outputText value="#{bundle.COMMON_DISPLAY_NAME}"/> </f:facet> #{value.text} </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Delete"/> + <h:outputText value="#{bundle.COMMON_DELETE}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionDelete" value="Delete"/> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="delete"/> </h:commandLink></div> </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> </f:facet> <div style="width:150px"><h:commandLink action="#{addDisplayNameAction.editDisplayName}"> - <h:outputText styleClass="actionRename" value="Rename"/> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="locale" value="#{value.locale}"/> <f:param name="editAction" value="rename"/> </h:commandLink></div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editContext.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,39 +5,40 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> <h3 class="sectionTitle tenpx-top-bottom"> - Manage   + #{bundle.MANAGE}   <c:choose> - <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">portals</c:when> - <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> portal</c:otherwise> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> + <c:otherwise><span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{bundle.PORTAL}</c:otherwise> </c:choose> </h3> <h:form> <h:commandLink action="editProperties" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionProperties"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> </h:form> <h3 class="sectionTitle"> - Manage   + #{bundle.MANAGE}   <c:choose> - <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">sub-portals</c:when> - <c:otherwise>pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - portal</c:otherwise> + <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}">#{bundle.SUB_PORTALS}</c:when> + <c:otherwise>#{bundle.PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.PORTAL}</c:otherwise> </c:choose> </h3>  <div class="tenpx-top-bottom"> <h:form> - <span class="portlet-font">Create a portal named: </span> + <span class="portlet-font">#{bundle.CREATE_PORTAL_NAMED}: </span> <h:inputText id="name" value="#{portalAction.portalName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{portalAction.addPortal}" value="Create portal" styleClass="portlet-form-button"/> + <h:commandButton action="#{portalAction.addPortal}" value="#{bundle.CREATE_PORTAL}" styleClass="portlet-form-button"/> <h:message for="name" errorClass="portlet-msg-error"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPage.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,10 +5,11 @@ xmlns:c="http://java.sun.com/jstl/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> <ui:define name="content"> - <h3 class="sectionTitle tenpx-top-bottom">Manage <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.MANAGE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> @@ -17,52 +18,52 @@ <h:panelGroup rendered="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_PAGE}"><h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Page layout + #{bundle.PAGE_LAYOUT} </h:commandLink> | </h:panelGroup><h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Theme + #{bundle.THEME} </h:commandLink><h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Rename + #{bundle.RENAME} </h:commandLink></h:panelGroup> <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}" /> - Display Names + #{bundle.DISPLAY_NAMES} </h:commandLink></h:panelGroup> <h:panelGroup rendered="#{!((portalobjectmgr.selectedObject.type == PortalObject.TYPE_PORTAL) and ((portalobjectmgr.selectedObject.name == 'admin') or (portalobjectmgr.selectedObject.name == 'template') or (portalobjectmgr.selectedObject.name == 'default')))}"> | <h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{portalobjectmgr.selectedObject.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:panelGroup> </h:form> - <h3 class="sectionTitle">Manage sub-pages within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle">#{bundle.MANAGE_SUB_PAGES_WITHIN} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3>  <div class="tenpx-top-bottom"> <h:form> - <span class="portlet-font">Create a page named: </span> + <span class="portlet-font">#{bundle.CREATE_PAGE_NAMED}: </span> <h:inputText id="pageName" value="#{addPageAction.pageName}" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{addPageAction.execute}" value="Create page" styleClass="portlet-form-button"/> + <h:commandButton action="#{addPageAction.execute}" value="#{bundle.CREATE_PAGE}" styleClass="portlet-form-button"/> <h:message for="pageName" errorClass="portlet-msg-error"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageLayout.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -6,8 +6,9 @@ xmlns:ct="http://www.julien.com" xmlns:jbp="http://www.jboss.org/portal" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Layout"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_LAYOUT}"/> <ui:define name="content"> <ui:include src="common/editPageLayout.xhtml"> <ui:param name="pageManager" value="#{portalobjectmgr.pageManager}"/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageSecurity.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -3,10 +3,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the page permissions</h3> + <h3>#{bundle.SET_PAGE_PERMISSIONS}</h3> <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPageTheme.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -3,16 +3,17 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Page theme properties</h3> + <h3>#{bundle.PAGE_THEME_PROPERTIES}</h3> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalSecurity.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -3,10 +3,11 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the portal permissions</h3> + <h3>#{bundle.SET_PORTAL_PERMISSIONS}</h3> <ui:decorate template="/WEB-INF/jsf/common/editSecurity.xhtml"> <ui:param name="auth" value="#{portalobjectmgr.auth}"/> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editPortalTheme.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -3,20 +3,20 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Portal theme properties</h3> + <h3>#{bundle.PORTAL_THEME_PROPERTIES}</h3> - <p>These settings are inherited by all the pages and windows of this portal. You may override these settings by - selecting the appropriate value on the respective Theme settings pages.</p> + <p>#{bundle.SETTINGS_ARE_INHERITED_BY_ALL_PAGES}.</p> <br/> <ui:decorate template="common/editTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editProperties.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,24 +5,25 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Properties"/> + <ui:param name="portalObjectScreen" value="#{bundle.COMMON_PROPERTIES}"/> <ui:define name="content"> <br/> <div class="tenpx-top-bottom"> - <p class="portlet-area-header">Event Listener Binding</p> + <p class="portlet-area-header">#{bundle.EVENT_LISTENER_BINDING}</p> <div class="portlet-area-body tenpx-top-bottom"> <h:form> <h:outputLabel for="listener" styleClass="portlet-form-field-label"> - Choose the id of the PortalEventListener to bind to this #{portalobjectmgr.selectedObjectType}: + #{bundle.CHOOSE_ID_PORTALEVENTLISTENER} #{portalobjectmgr.selectedObjectType}: </h:outputLabel> <h:selectOneMenu id="listener" value="#{portalobjectmgr.selectedObject.listener}"> <f:selectItems value="#{portalobjectmgr.listenerIds}"/> </h:selectOneMenu> - <h:commandButton value="Update" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_UPDATE}" styleClass="portlet-form-button"/> </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowSecurity.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -1,12 +1,14 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Security"/> + <ui:param name="portalObjectScreen" value="#{bundle.SECURITY}"/> <ui:define name="content"> - <h3>Please set the permissions for the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - window</h3> + <h3>#{bundle.SET_PERMISSIONS_FOR} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{bundle.WINDOW}</h3> <ui:include src="common/editSecurity.xhtml"/> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -3,16 +3,17 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="objectTemplate.xhtml"> - <ui:param name="portalObjectScreen" value="Theme"/> + <ui:param name="portalObjectScreen" value="#{bundle.THEME}"/> <ui:define name="content"> - <h3>Window theme properties</h3> + <h3>#{bundle.WINDOW_THEME_PROPERTIES}</h3> <ui:decorate template="common/editWindowTheme.xhtml"> <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> - <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" + <h:commandButton value="#{bundle.COMMON_UPDATE}" action="objects" actionListener="#{portalobjectmgr.theme.execute}" styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{portalobjectmgr.selectObject}" styleClass="portlet-form-button portlet-section-buttonrow"/> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -6,6 +6,7 @@ xmlns:jbp="http://www.jboss.com/portal" xmlns:c="http://java.sun.com/jstl/core"> +<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="instancesTemplate.xhtml"> <ui:define name="content"> @@ -15,9 +16,9 @@ <table id="instancesTable2" class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> - <th>Instance id</th> - <th>Instance name</th> - <th>Actions</th> + <th>#{bundle.INSTANCE_ID}</th> + <th>#{bundle.INSTANCE_NAME}</th> + <th>#{bundle.ACTIONS}</th> </tr> </thead> <tbody> @@ -38,18 +39,18 @@ <td><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionSecurity"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="security"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:panelGroup rendered="#{! empty(instancemgr.selectedInstancesPrefs[instance.id])}"><h:commandLink action="#{instancemgr.selectInstance}" styleClass="actionPreferences"> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="preferences"/> - Preferences + #{bundle.PREFERENCES} </h:commandLink> | </h:panelGroup><h:commandLink action="confirmDeleteInstance" styleClass="actionDelete" actionListener="#{instancemgr.selectInstance}"> <f:param name="id" value="#{instance.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </td> </tr> @@ -78,11 +79,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> portlet details + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_DETAILS} </li> </ul> </h:form> @@ -96,7 +97,7 @@ </ui:include> </c:when> <c:otherwise> - The associated portlet is not available. + #{bundle.ASSOCIATED_PORTLET_NOT_AVAILABLE}. </c:otherwise> </c:choose> </c:if> @@ -106,11 +107,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> preferences + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PREFERENCES} </li> </ul> </h:form> @@ -121,8 +122,8 @@ </ui:include> <br /> <h:form> - <h:commandButton value="Save" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.SAVE}" action="#{instancemgr.updatePrefs}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{instancemgr.cancelPrefs}" styleClass="portlet-form-button"/> </h:form> </div> </c:if> @@ -132,11 +133,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{instancemgr.selectInstance}">Portlet Instances</h:commandLink> + <h:commandLink action="#{instancemgr.selectInstance}">#{bundle.PORTLET_INSTANCES}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{instancemgr.selectedInstance.id}</span> security settings + <span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.SECURITY_SETTINGS} </li> </ul> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instancesTemplate.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -1,22 +1,24 @@ <div xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" class="admin-ui"> - + + <f:loadBundle basename="Resource" var="bundle" />  <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> - <li id="currentTab">Portlet Instances</li> + <li id="currentTab"><h:outputText value="#{bundle.PORTLET_INSTANCES}" /></li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -27,7 +29,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -7,6 +7,8 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:c="http://java.sun.com/jstl/core"> + +<f:loadBundle basename="Resource" var="bundle" /> <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> @@ -16,7 +18,7 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Portal"/> + <h:outputText value="#{bundle.WIZARD_PORTAL}"/> </f:facet> <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> @@ -24,26 +26,26 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editPortalSecurity" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionSecurity"> <f:param name="id" value="#{object.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPortalTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> <h:panelGroup rendered="#{(object.name != 'admin') and (object.name != 'template')}"> | <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionRename"> - <h:outputText value="Rename"/> + <h:outputText value="#{bundle.RENAME}"/> <f:param name="id" value="#{object.id}"/> </h:commandLink> </h:panelGroup> @@ -52,17 +54,17 @@ | <h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> - Make Default + #{bundle.MAKE_DEFAULT} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" - value="Default"/></h:panelGroup> + value="#{bundle.DEFAULT}"/></h:panelGroup> </h:column> </h:dataTable> </c:if> @@ -74,7 +76,7 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Page"/> + <h:outputText value="#{bundle.WIZARD_PAGE}"/> </f:facet> <h:commandLink action="#{portalobjectmgr.selectObject}">#{object.name} <f:param name="id" value="#{object.id}"/> @@ -82,51 +84,51 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editPageLayout" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionLayout"> <f:param name="id" value="#{object.id}"/> - Page layout + #{bundle.PAGE_LAYOUT} </h:commandLink> | <h:commandLink action="editPageSecurity" styleClass="actionSecurity" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Security + #{bundle.SECURITY} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="editPageTheme" styleClass="actionTheme" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Rename + #{bundle.RENAME} </h:commandLink> | <h:commandLink action="#{addDisplayNameAction.editDisplayNames}" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Display Names + #{bundle.DISPLAY_NAMES} </h:commandLink> |<h:commandLink action="confirm" styleClass="actionDelete" actionListener="#{portalobjectmgr.selectDeletingObject}"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> <h:panelGroup rendered="#{not object.default}"> | <h:commandLink styleClass="actionMakeDefault" action="#{portalobjectmgr.makeObjectDefault}"> <f:param name="id" value="#{object.id}"/> - Make Default + #{bundle.MAKE_DEFAULT} </h:commandLink> </h:panelGroup> <h:panelGroup rendered="#{object.default}"> | <h:outputText styleClass="actionDefault" - value="Default"/></h:panelGroup> + value="#{bundle.DEFAULT}"/></h:panelGroup> </h:column> </h:dataTable> </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> - <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + <h3 class="sectionTitle">#{bundle.Manage windows within} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> <ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> @@ -137,18 +139,18 @@ headerClass="portlet-section-header"> <h:column> <f:facet name="header"> - <h:outputText value="Window"/> + <h:outputText value="#{bundle.WINDOW}"/> </f:facet> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? 'This window is set to a minimized state.' : 'This window defaults to a normal state.'}" + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '#{bundle.THIS_MINIMIZED_STATE}.' : '#{bundle.THIS_NORMAL_STATE}.'}" rendered="#{!maximizedStateExists}" value="#{object.declaredProperties['portal.windowInitialState'] eq 'MINIMIZED' ? '/img/min-icon.gif' : '/img/norm-icon.gif' }" styleClass="windowStateIcon" alt=""/> <h:graphicImage - title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? 'This window is set to a maximized state.' : 'This window defaults to a minimized state because one window within this page is set to maximized.'}" + title="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '#{bundle.THIS_MAXIMIZED_STATE}.' : '#{bundle.THIS_MINIMIZED_STATE_BECAUSE_MAXIMIZED}.'}" rendered="#{maximizedStateExists}" value="#{object.declaredProperties['portal.windowInitialState'] eq 'MAXIMIZED' ? '/img/max-icon.gif' : '/img/min-icon.gif'}" styleClass="windowStateIcon" @@ -169,25 +171,25 @@ </h:column> <h:column> <f:facet name="header"> - <h:outputText value="Actions"/> + <h:outputText value="#{bundle.ACTIONS}"/> </f:facet> <h:commandLink action="editWindowTheme" actionListener="#{portalobjectmgr.selectObject}" styleClass="actionTheme"> <f:param name="id" value="#{object.id}"/> - Theme + #{bundle.THEME} </h:commandLink> | <h:commandLink action="editProperties" styleClass="actionProperties" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> <f:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/> - Properties + #{bundle.COMMON_PROPERTIES} </h:commandLink> | <h:commandLink action="renameObject" styleClass="actionRename" actionListener="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{object.id}"/> - Rename + #{bundle.RENAME} </h:commandLink> | <h:commandLink action="confirm" actionListener="#{portalobjectmgr.selectDeletingObject}" styleClass="actionDelete"> <f:param name="id" value="#{object.id}"/> - Delete + #{bundle.COMMON_DELETE} </h:commandLink> </h:column> </h:dataTable> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectTemplate.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -8,17 +8,18 @@ class="admin-ui">  + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> - <li id="currentTab">Portal Objects</li> + <li id="currentTab">#{bundle.PORTAL_OBJECTS}</li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> <li> - <h:commandLink value="Portlet Definitions" action="#{portletmgr.selectPortlet}"/> + <h:commandLink value="#{bundle.PORTLET_DEFINITIONS}" action="#{portletmgr.selectPortlet}"/> </li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -43,7 +44,7 @@ <h:commandLink action="#{portalobjectmgr.selectObject}"> <f:param name="id" value="#{node.id}"/> <c:choose> - <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">Portals</c:when> + <c:when test="#{node.type == PortalObject.TYPE_CONTEXT}">#{bundle.PORTALS}</c:when> <c:otherwise><span class="objectName">#{node.name}</span> #{node.typeName}</c:otherwise> </c:choose> </h:commandLink> @@ -62,7 +63,7 @@  <div class="property-container"> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </div> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objects.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -1,9 +1,12 @@ <div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> + + <f:loadBundle basename="Resource" var="bundle" /> <c:choose> <c:when test="#{portalobjectmgr.selectedObject.type == PortalObject.TYPE_CONTEXT}"> <ui:include src="editContext.xhtml"/> @@ -21,8 +24,7 @@ </c:choose> <h:form> - <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">Switch to wizard - mode</h:commandLink></p> + <p style="text-align: right"><h:commandLink action="#{newWindowWizard.reset}">#{bundle.SWITCH_TO_WIZARD_MODE}</h:commandLink></p> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portlets.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -8,6 +8,7 @@ xmlns:pfc="http://www.jboss.com/portal/facelet/common" xmlns:portlet="http://java.sun.com/portlet"> +<f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="portletsTemplate.xhtml"> <ui:define name="content"> @@ -16,14 +17,14 @@ <div class="provider-menu-container"> <h:form> <h:outputLabel for="menu"> - <h:outputText value="View portlets provided by the portlet provider named: " + <h:outputText value="#{bundle.VIEW_PORTLETS_PROVIDED_BY}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}"> <f:selectItems value="#{portletmgr.portletInvokerItems}"/> </h:selectOneMenu> - <h:commandButton value="View portlets" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.VIEW_PORTLETS}" styleClass="portlet-form-button"/> </h:form> </div> <h:form> @@ -31,11 +32,11 @@ <table class="portlet-def-table datatable"> <thead class="portlet-section-header"> <tr> - <th>Portlet name</th> - <th>Description</th> - <th>Remote</th> - <th>Remotable</th> - <th>Actions</th> + <th>#{bundle.PORTLET_NAME}</th> + <th>#{bundle.DESCRIPTION}</th> + <th>#{bundle.REMOTE}</th> + <th>#{bundle.REMOTABLE}</th> + <th>#{bundle.ACTIONS}</th> </tr> </thead> <tbody> @@ -60,12 +61,12 @@ <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionPreferences"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="preferences"/> - Preferences + #{bundle.PREFERENCES} </h:commandLink> | </h:panelGroup> <h:commandLink action="#{portletmgr.selectPortlet}" styleClass="actionCreateInstance"> <f:param name="id" value="#{portlet.context.id}"/> <f:param name="plugin" value="createInstance"/> - Create instance + #{bundle.CREATE_INSTANCE} </h:commandLink> </td> </tr> @@ -93,11 +94,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> details + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.DETAILS} </li> </ul> </h:form> @@ -113,11 +114,11 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> preferences + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.PREFERENCES} </li> </ul> </h:form> @@ -134,22 +135,22 @@ <h:form> <ul class="objectpath"> <li class="pathItem"> - <h:commandLink action="#{portletmgr.selectPortlet}">Portlet Definitions</h:commandLink> + <h:commandLink action="#{portletmgr.selectPortlet}">#{bundle.PORTLET_DEFINITIONS}</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="selected"> - <span class="objectName">#{portletmgr.selectedPortlet.name}</span> instance creation + <span class="objectName">#{portletmgr.selectedPortlet.name}</span> #{bundle.INSTANCE_CREATION} </li> </ul> </h:form> <br/> <div class="property-container"> <h:form id="add_instance_form" styleClass="createObjectForm"> - <span class="portlet-font">Create an instance named: </span> + <span class="portlet-font">#{bundle.CREATE_INSTANCE_NAMED}: </span> <h:inputText id="instanceId" value="#{createInstanceAction.instanceId}" styleClass="portlet-form-input-field" required="true"/> <br /> - <h:commandButton action="#{createInstanceAction.execute}" value="Create instance" + <h:commandButton action="#{createInstanceAction.execute}" value="#{bundle.CREATE_INSTANCE}" styleClass="portlet-form-button"/> <h:message for="instanceId" errorClass="portlet-msg-error"/> </h:form> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/portletsTemplate.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -1,22 +1,24 @@ <div xmlns="http://www.w3.org/1999/xhtml" + xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets" class="admin-ui">  + <f:loadBundle basename="Resource" var="bundle" /> <h:form> <ul class="topnav"> <li> - <h:commandLink value="Portal Objects" action="objects" + <h:commandLink value="#{bundle.PORTAL_OBJECTS}" action="objects" actionListener="#{portalobjectmgr.selectRootObject}"/> </li> <li> - <h:commandLink value="Portlet Instances" action="instances"/> + <h:commandLink value="#{bundle.PORTLET_INSTANCES}" action="instances"/> </li> - <li id="currentTab">Portlet Definitions</li> + <li id="currentTab">#{bundle.PORTLET_DEFINITIONS}</li> <li> - <h:commandLink value="Dashboards" action="dashboards"/> + <h:commandLink value="#{bundle.DASHBOARDS}" action="dashboards"/> </li> </ul> </h:form> @@ -27,7 +29,7 @@ fatalClass="portlet-msg-error" warnClass="portlet-msg-alert"/>  - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </ui:define> </ui:decorate> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/renameObject.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -4,17 +4,18 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="/WEB-INF/jsf/objectTemplate.xhtml"> <ui:param name="portalObjectScreen" value="Rename"/> <ui:define name="content"> - <h3>Rename #{portalobjectmgr.selectedObjectType}</h3> + <h3>#{bundle.RENAME} #{portalobjectmgr.selectedObjectType}</h3> <h:form id="renameForm"> <h:message for="newName"/> - <p>Rename the <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> - #{portalobjectmgr.selectedObjectType} to: + <p>#{bundle.RENAME_THE} <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> + #{portalobjectmgr.selectedObjectType} #{bundle.TO}: <h:inputText id="newName" value="#{renameAction.newName}"/> - <h:commandButton value="Rename" action="#{renameAction.execute}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.RENAME}" action="#{renameAction.execute}" styleClass="portlet-form-button"/> </p> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowTpl.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -6,20 +6,21 @@ xmlns:c="http://java.sun.com/jstl/core" class="admin-ui"> +<f:loadBundle basename="Resource" var="bundle" /> <link rel="stylesheet" type="text/css" href="/portal-admin/css/style.css" media="screen"/> <div class="wizard-tab-container"> <ul class="objectpath"> - <li class="selected">Adding a new Portlet</li> + <li class="selected">#{bundle.WIZARD_ADDING_NEW_PORTLET}</li> </ul> <div class="property-container"> <c:choose> <c:when test="#{newWindowWizard.currentStep == 0}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </c:when> <c:otherwise> @@ -29,17 +30,17 @@ <f:param name="step" value="0"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 1</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 1</p> - <p class="stepText">Select Portlet</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTLET}</p> </div> </c:otherwise> </c:choose> @@ -49,9 +50,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 1}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </c:when> <c:otherwise> @@ -61,17 +62,17 @@ <f:param name="step" value="1"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 2</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 2</p> - <p class="stepText">Select Portal</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PORTAL}</p> </div> </c:otherwise> </c:choose> @@ -81,9 +82,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 2}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </c:when> <c:otherwise> @@ -93,17 +94,17 @@ <f:param name="step" value="2"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 3</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 3</p> - <p class="stepText">Select Page</p> + <p class="stepText">#{bundle.WIZARD_SELECT_PAGE}</p> </div> </c:otherwise> </c:choose> @@ -113,9 +114,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 3}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </c:when> <c:otherwise> @@ -125,17 +126,17 @@ <f:param name="step" value="3"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 4</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 4</p> - <p class="stepText">Select Region</p> + <p class="stepText">#{bundle.WIZARD_SELECT_REGION}</p> </div> </c:otherwise> </c:choose> @@ -145,9 +146,9 @@ <c:choose> <c:when test="#{newWindowWizard.currentStep == 4}"> <div class="wizardStepBox" id="selected"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </c:when> <c:otherwise> @@ -157,17 +158,17 @@ <f:param name="step" value="4"/> <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </h:commandLink></h:form> </c:when> <c:otherwise> <div class="wizardStepBox"> - <p class="stepNumber">Step 5</p> + <p class="stepNumber">#{bundle.WIZARD_STEP} 5</p> - <p class="stepText">Confirm</p> + <p class="stepText">#{bundle.WIZARD_CONFIRM}</p> </div> </c:otherwise> </c:choose> @@ -181,21 +182,21 @@  <div class="wizardContent"> - <ui:insert name="content">Content</ui:insert> + <ui:insert name="content">#{bundle.WIZARD_CONTENT}</ui:insert> </div> <div class="wizardButtonBox"> <h:form> - <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="Previous" + <h:commandButton rendered="#{newWindowWizard.currentStep gt 0}" value="#{bundle.WIZARD_PREVIOUS}" action="#{newWindowWizard.previous}" styleClass="portlet-form-button"/> <h:commandButton rendered="#{newWindowWizard.currentStep lt 4 and newWindowWizard.enabled[newWindowWizard.currentStep + 1]}" - value="Next" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> + value="#{bundle.WIZARD_NEXT}" action="#{newWindowWizard.next}" styleClass="portlet-form-button"/> </h:form> </div> <h:form> - <p style="text-align: right;"><h:commandLink action="advancedMode">Switch to advanced mode</h:commandLink></p> + <p style="text-align: right;"><h:commandLink action="advancedMode">#{bundle.WIZARD_SWITCH_ADVANCED_MODE}</h:commandLink></p> </h:form> </div> </div> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/newWindowWizardConfirm.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,31 +5,32 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table> <tr> - <td><b>Portlet:</b></td> + <td><b>#{bundle.WIZARD_PORTLET}:</b></td> <td>#{newWindowWizard.selectedPortlet.name}</td> </tr> <tr> - <td><b>Portal:</b></td> + <td><b>#{bundle.WIZARD_PORTAL}:</b></td> <td>#{newWindowWizard.selectedPortal.name}</td> </tr> <tr> - <td><b>Page:</b></td> + <td><b>#{bundle.WIZARD_PAGE}:</b></td> <td>#{newWindowWizard.selectedPage.name}</td> </tr> <tr> - <td><b>Region:</b></td> + <td><b>#{bundle.WIZARD_REGION}:</b></td> <td>#{newWindowWizard.selectedRegionId}</td> </tr> </table> <h:form> - <h:commandButton value="Confirm" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> - <h:commandButton value="Cancel" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.WIZARD_CONFIRM}" action="#{newWindowWizard.createWindow}" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{newWindowWizard.cancel}" styleClass="portlet-form-button"/> </h:form> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPage.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,13 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table class="datatable full-width"> <tbody class="portlet-section-header"> <tr> - <th>Page</th> + <th>#{bundle.WIZARD_PAGE}</th> <th></th> </tr> </tbody> @@ -19,7 +20,7 @@ <h:form> <h:commandLink action="#{newWindowWizard.up}" rendered="#{newWindowWizard.selectedParentPage.type != PortalObject.TYPE_PORTAL}"> - <h:outputText value="Up"/> + <h:outputText value="#{bundle.COMMON_UP}"/> <f:param name="id" value="#{newWindowWizard.selectedParentPageId}"/> </h:commandLink> <c:forEach items="#{newWindowWizard.pages}" var="object" varStatus="status"> @@ -34,7 +35,7 @@ <td> <c:if test="#{not empty object.pages}"> <h:commandLink id="cl2_#{status.index}" action="#{newWindowWizard.selectParentPage}"> - <h:outputText id="ot2_#{status.index}" value="Sub-Pages"/> + <h:outputText id="ot2_#{status.index}" value="#{bundle.WIZARD_SUB_PAGES}"/> <f:param id="f2_#{status.index}" name="id" value="#{object.id}"/> </h:commandLink> </c:if> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortal.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,13 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <table class="full-width datatable"> <tbody class="portlet-section-header"> <tr> - <th>Portal</th> + <th>#{bundle.WIZARD_PORTAL}</th> </tr> </tbody> <tbody> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectPortlet.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -4,23 +4,24 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> <h:form> <h:outputLabel for="menu"> - <h:outputText value="Portlet provider: " styleClass="portlet-form-field-label"/> + <h:outputText value="#{bundle.WIZARD_PORTLET_PROVIDER}: " styleClass="portlet-form-field-label"/> </h:outputLabel> <h:selectOneMenu id="menu" styleClass="portlet-form-field" value="#{portletmgr.selectedPortletInvokerId}"> <f:selectItems value="#{portletmgr.portletInvokerItems}"/> </h:selectOneMenu> - <h:commandButton value="Change" styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.WIZARD_CHANGE}" styleClass="portlet-form-button"/> </h:form> <h:form> <table class="full-width datatable"> <thead class="portlet-section-header"> <tr> - <th>Name</th> + <th>#{bundle.COMMON_NAME}</th> </tr> </thead> <tbody> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2008-05-28 21:32:25 UTC (rev 10829) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/wizard/selectRegion.xhtml 2008-05-28 23:07:49 UTC (rev 10830) @@ -5,6 +5,7 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core"> + <f:loadBundle basename="Resource" var="bundle" /> <ui:composition template="newWindowTpl.xhtml"> <ui:define name="content"> @@ -12,7 +13,7 @@ <tbody class="portlet-section-header"> <tr> - <th>Portal</th> + <th>#{bundle.WIZARD_PORTAL}</th> </tr> </tbody> <tbody>

18 years

1
0
0 / 0

JBoss Portal SVN: r10829 - in branches/JBoss_Portal_Branch_2_6/core/src: bin/portal-core-war/layouts/3columns and 11 other directories.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-28 17:32:25 -0400 (Wed, 28 May 2008) New Revision: 10829 Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp Log: added internationalization updates Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/1column/index.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -51,7 +53,7 @@ </div>  -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/3columns/index.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -58,7 +60,7 @@ </div>  -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/index.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -46,7 +48,7 @@ </div> </div> -<div id="footer-container" class="portal-copyright">Powered by +<div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br/> </div> Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/layouts/generic/maximized.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,5 +1,7 @@ <%@ page import="org.jboss.portal.server.PortalConstants" %> +<%@page import="java.util.ResourceBundle"%> <%@ taglib uri="/WEB-INF/theme/portal-layout.tld" prefix="p" %> +<% ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -38,7 +40,7 @@ <p:region regionName='maximized' regionID='regionMaximized'/> <hr class="cleaner"/> - <div id="footer-container" class="portal-copyright">Powered by + <div id="footer-container" class="portal-copyright"><%= rb.getString("POWERED_BY") %> <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> <span id="ThemeBy"></span> </div> Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/login/error.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,6 +1,7 @@ +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <html> <head></head> <body> -bad login +${n:i18n("BAD_LOGIN")} </body> </html> Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/nodesk/index.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -21,6 +21,7 @@ %> <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page import="java.util.Iterator, java.io.Writer, @@ -261,8 +262,8 @@ <% } %> <tr> - <td class="portal-copyright" height="10" colspan="<%= nbCol %>" align="center" valign="top">Powered by <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> - Theme by <a class="portal-copyright" href="http://www.nodesk.org">Nodesk</a> + <td class="portal-copyright" height="10" colspan="<%= nbCol %>" align="center" valign="top">${n:i18n("POWERED_BY")} <a class="portal-copyright" href="http://www.jboss.com/products/jbossportal">JBoss Portal</a><br> + ${n:i18n("THEME_BY")} <a class="portal-copyright" href="http://www.nodesk.org">Nodesk</a> </td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/phalanx/index.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,4 +1,5 @@ <%@ taglib uri="/WEB-INF/theme-basic-lib.tld" prefix="basic" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <%@ page import="org.jboss.portal.server.PortalConstants" %> <%@ page import="java.util.ResourceBundle"%> @@ -125,7 +126,7 @@ <tr> <td align="left"><div class="portlet-font-dim" style="font-size:10px"> Copyright 2005, JBoss Inc.<br> - Powered by <a href="http://www.jboss.com/products/jbossportal" target="_blank">JBoss Portal</a> + ${n:i18n("POWERED_BY")} <a href="http://www.jboss.com/products/jbossportal" target="_blank">JBoss Portal</a> </div></td> </tr> </table> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-28 21:32:25 UTC (rev 10829) @@ -25,4 +25,10 @@ PAGENAME_default=Home PAGENAME_Admin=Admin PAGENAME_Test=Test -PAGENAME_News=News \ No newline at end of file +PAGENAME_News=News + +LOGIN_TITLE=JBoss Portal Login +LOGIN_USERNAME=Username +LOGIN_PASSWORD=Password +LOGIN_CANCEL=Cancel +LOGIN_SUBMIT=Submit \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-28 21:32:25 UTC (rev 10829) @@ -25,4 +25,10 @@ PAGENAME_default=Home PAGENAME_Admin=Amministrazione PAGENAME_Test=Test -PAGENAME_News=Novit\u00e0 \ No newline at end of file +PAGENAME_News=Novit\u00e0 + +LOGIN_TITLE=JBoss Portal Login +LOGIN_USERNAME=Nome utente +LOGIN_PASSWORD=Password +LOGIN_CANCEL=Annulla +LOGIN_SUBMIT=Invia \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-28 21:32:25 UTC (rev 10829) @@ -321,4 +321,17 @@ PERMISSION_DOMAIN_MOD=Modify Domain PERMISSION_DEFINEDROLES=Defined roles PERMISSION_IMPLIEDROLES=Implied roles - \ No newline at end of file + +POWERED_BY=Powered by +BAD_LOGIN=bad login +THEME_BY=Theme by +PORTLET_INSTANCE_ASSOCIATED=Portlet instance associated to this window +PORTLET_NAME=Portlet name +PORTLET_DESCRIPTION=Portlet description +DASHBOARD=Dashboard +CONFIGURE_DASHBOARD=Configure dashboard +COPY_TO_DASHBOARD=Copy to my dashboard +PORTAL=Portal +ADMIN=Admin +MEMBERS=Members +LOGGED=Logged in as \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-28 21:32:25 UTC (rev 10829) @@ -130,7 +130,7 @@ Delete=Cancella Edit=Modifica Ok=Ok -Cancel=Cancella +Cancel=Annulla AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente? UserDeleted=Utente cancellato con successo ReturnToMemberList=Ritorna alla lista dei membri @@ -245,7 +245,7 @@ REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti -MENU_LOGOUT=Logout +MENU_LOGOUT=Uscita MENU_EDITPROFILE=Modifica il tuo profilo MENU_LISTUSERS=Lista di tutti gli utenti @@ -321,4 +321,17 @@ PERMISSION_DOMAIN_MOD=Modifica Dominio PERMISSION_DEFINEDROLES=Ruoli definiti PERMISSION_IMPLIEDROLES=Ruoli impliciti - \ No newline at end of file + +POWERED_BY=Sviluppato da +BAD_LOGIN=login sbagliato +THEME_BY=Tema di +PORTLET_INSTANCE_ASSOCIATED=Istanza di Portlet associata a questa finestra +PORTLET_NAME=Nome della Portlet +PORTLET_DESCRIPTION=Descrizione della Portlet +DASHBOARD=Dashboard +CONFIGURE_DASHBOARD=Configura la dashboard +COPY_TO_DASHBOARD=Copia nella mia dashboard +PORTAL=Portale +ADMIN=Amministrazione +MEMBERS=Membri +LOGGED=Benvenuto \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -18,6 +18,7 @@ <%@page import="org.jboss.portal.portlet.info.PortletInfo" %> <%@ page import="java.util.Collection" %> <%@ page import="java.util.Locale" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> <portlet:defineObjects/> <script type='text/javascript' src='/portal-admin/js/domLib.js'></script> <script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script> @@ -33,7 +34,7 @@ <table style="width:500px;"> <tr> - <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td> + <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td> </tr> <% Locale locale = renderRequest.getLocale(); @@ -69,10 +70,10 @@ <span><%= displayName %></span> <div> - <span class="portlet-form-field-label">Portlet name:</span><%= displayName %> + <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %> </div> <div> - <span class="portlet-form-field-label">Portlet description:</span> + <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span> <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> </div> @@ -118,9 +119,9 @@ </div> </div> <div class="content"> - <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %> + <div><span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %> </div> - <div><span class="portlet-form-field-label">Portlet description:</span> + <div><span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span> <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %> </div> </div> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -1,7 +1,9 @@ <%@ page import="org.jboss.portal.api.PortalURL" %> <%@ page import="org.jboss.portal.identity.User" %> +<%@page import="java.util.ResourceBundle"%> <% + ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale()); User user = (User)request.getAttribute("org.jboss.portal.header.USER"); PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL"); PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL"); @@ -32,10 +34,10 @@ </script> <noscript> - <a href="<%= loginURL %>">Login</a> + <a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a> </noscript> <%}else{%> -<a href="<%= loginURL %>">Login</a> +<a href="<%= loginURL %>"><%= rb.getString("LOGIN") %></a> <%}%> @@ -50,34 +52,34 @@ document.getElementById('loginIframe').src = ''; /* ]]> */ </script> -Logged in as: <%= user.getUserName() %><br/><br/> +<%= rb.getString("LOGGED") %>: <%= user.getUserName() %><br/><br/> <% if (dashboardURL != null) { -%>  <a href="<%= dashboardURL %>">Dashboard</a>  |<% +%>  <a href="<%= dashboardURL %>"><%= rb.getString("DASHBOARD") %></a>  |<% } if (defaultPortalURL != null) { -%>  <a href="<%= defaultPortalURL %>">Portal</a>  |<% +%>  <a href="<%= defaultPortalURL %>"><%= rb.getString("PORTAL") %></a>  |<% } if (adminPortalURL != null) { -%>  <a href="<%= adminPortalURL %>">Admin</a>  |<% +%>  <a href="<%= adminPortalURL %>"><%= rb.getString("ADMIN") %></a>  |<% } if (editDashboardURL != null) { -%>  <a href="<%= editDashboardURL %>">Configure dashboard</a>  |<% +%>  <a href="<%= editDashboardURL %>"><%= rb.getString("CONFIGURE_DASHBOARD") %></a>  |<% } if (copyToDashboardURL != null) { -%>  <a href="<%= copyToDashboardURL %>">Copy to my dashboard</a>  |<% +%>  <a href="<%= copyToDashboardURL %>"><%= rb.getString("COPY_TO_DASHBOARD") %></a>  |<% } -%>  <a href="<%= signOutURL %>">Logout</a> +%>  <a href="<%= signOutURL %>"><%= rb.getString("MENU_LOGOUT") %></a> <% } %> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -24,12 +24,12 @@ <portlet:param name="roleid" value="${n:out('role.id')}"/> <portlet:param name="usersperpage" value="10"/> <portlet:param name="usernamefilter" value=""/> - </portlet:actionURL>">Members</a></td> + </portlet:actionURL>">${n:i18n("MEMBERS")}</a></td> <td nowrap class="portlet-table-text"><a href="<portlet:actionURL> <portlet:param name="op" value="removeRole"/> <portlet:param name="roleid" value="${n:out('role.id')}"/> </portlet:actionURL>" - onClick="javascript:return confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">Delete</a> + onClick="javascript:return confirm('${n:i18n("ROLE_CONFIRM_DELETE")}')">${n:i18n("Delete")}</a> </td> </tr> </n:iterate> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -27,8 +27,7 @@ <n:error key="realemail_error"/> </td> - <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>Allow - other users to view my real e-mail address + <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>${n:i18n("AllowEmailView")} </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -34,8 +34,7 @@ <n:error key="realemail_error"/> </td> - <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>Allow - other users to view my real e-mail address + <td><input type="checkbox" name="viewrealemail" value="true" checked="checked" class="portlet-form-label"/>${n:i18n("AllowEmailView")} </td> </tr> <tr> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2008-05-27 23:13:55 UTC (rev 10828) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2008-05-28 21:32:25 UTC (rev 10829) @@ -21,6 +21,11 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> <%@ page pageEncoding="utf-8" %> +<%@page import="java.util.ResourceBundle"%> + +<% + ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale()); +%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -54,7 +59,7 @@ <div class="login-container"> <div class="login-header"> - <h2>JBoss Portal Login</h2> + <h2><%= rb.getString("LOGIN_TITLE") %></h2> </div> <div class="login-content"> <div class="error-message" @@ -64,15 +69,15 @@ <form method="post" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm" target="_parent"> <div class="form-field"> - <label for="j_username">Username:</label> + <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %></label> <input type="text" name="j_username" id="j_username" value=""/> </div> <div class="form-field bottom-field"> - <label for="j_password">Password:</label> + <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %></label> <input type="password" name="j_password" id="j_password" value=""/> </div> - <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="Cancel" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> - <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="Login" class="login-button"/> + <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> + <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/> </form> </div>

18 years

1
0
0 / 0

JBoss Portal SVN: r10828 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-27 19:13:55 -0400 (Tue, 27 May 2008) New Revision: 10828 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.2. Control Policies - adding small 'diagram' for pipeline policies Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-27 17:05:45 UTC (rev 10827) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-27 23:13:55 UTC (rev 10828) @@ -45,11 +45,15 @@ </sect1> <sect1> <title>Control Policies</title> - <para>If an error occurs, the request control-flow changes according to the configuration. This configuration is known as the <emphasis>control policy</emphasis>.</para> + <para>If an error occurs, the request control-flow changes according to the configuration. This configuration is known as the <emphasis>control policy</emphasis>, which is a pipeline of policies, and looks as follows: + </para> + <para> + <emphasis>Default Control Policy</emphasis> -> <emphasis>Portal Control Policy</emphasis> -> <emphasis>Page Control Policy</emphasis>. + </para> <sect2> <title>Policy Delegation and Cascading</title> <para> - When the control policy is invoked, the response sent by the control flow can be changed. If the control policy ignores the error, the error is handled by the next policy. If the control policy provides a new response, the next policy is not invoked, since the new response will not be an error. + When a control policy is invoked, the response sent by the control flow can be changed. If the control policy ignores the error, the error is handled by the next policy. If the control policy provides a new response, the next policy is not invoked, since the new response will not be an error. </para> <para> If a portlet in a page produces an exception, the following reactions are possible:

18 years

1
0
0 / 0

JBoss Portal SVN: r10827 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF: classes and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-05-27 13:05:45 -0400 (Tue, 27 May 2008) New Revision: 10827 Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml Log: - Started i18n of WSRP admin. Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-27 17:05:45 UTC (rev 10827) @@ -0,0 +1,35 @@ +################################################################################ +# 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. # +################################################################################ +# JBoss Portal display information +org.jboss.portal.object.name.WSRPConfigurationPortlet = WSRP Configuration +org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = WSRP Configuration Portlet + +nav_tabs_consumers = Consumers Configuration +nav_tabs_producer_config = Producer Configuration +nav_tabs_producer_management = Producer Management + +path_consumers_root = Consumers +path_consumers_consumer = Consumer ''{0}'' configuration +path_consumers_active = active +path_consumers_inactive = inactive +path_consumers_refreshNeeded = refresh needed Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-27 17:05:45 UTC (rev 10827) @@ -0,0 +1,35 @@ +################################################################################ +# 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. # +################################################################################ +# JBoss Portal display information +org.jboss.portal.object.name.WSRPConfigurationPortlet = Configuration WSRP +org.jboss.portal.instance.name.WSRPConfigurationPortletInstance = Portlet de Configuration pour WSRP + +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 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2008-05-27 14:35:34 UTC (rev 10826) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2008-05-27 17:05:45 UTC (rev 10827) @@ -1,5 +1,7 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jstl/core"> + xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jstl/core" + xmlns:ui="http://java.sun.com/jsf/facelets"> + <f:loadBundle basename="WSRPConfigurationResource" var="i18n"/> <div class="wsrp-consumers-ui"> <ui:insert name="topnav">Top navigation</ui:insert> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-27 14:35:34 UTC (rev 10826) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-27 17:05:45 UTC (rev 10827) @@ -7,10 +7,10 @@ <ui:define name="topnav"> <h:form> <ul class="topnav"> - <li id="currentTab">Consumers Configuration</li> - <li><h:commandLink value="Producer Configuration" action="producer"/></li> + <li id="currentTab">#{i18n.nav_tabs_consumers}</li> + <li><h:commandLink value="#{i18n.nav_tabs_producer_config}" action="producer"/></li> <ui:remove> - <li><h:commandLink value="Producer Management" action="management"/></li> + <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li> </ui:remove> </ul> </h:form> @@ -20,14 +20,17 @@ <h:form> <ul class="objectpath"> <li class="#{!empty title ? 'selected' : 'pathItem'}"> - <h:commandLink action="#{consumersMgr.listConsumers}" value="Consumers"/> + <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.path_consumers_root}"/> </li> <c:if test="#{empty title}"> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> <li class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> - Consumer '#{consumer.id}' configuration (#{consumer.active ? 'active' : 'inactive'}) - #{consumer.refreshNeeded ? '(refresh needed)' : ''} + <h:outputFormat value="#{i18n.path_consumers_consumer}"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> (<h:outputText value="#{i18n.path_consumers_active}" rendered="#{consumer.active}"/> + <h:outputText value="#{i18n.path_consumers_inactive}" rendered="#{!consumer.active}"/>) + (<h:outputText value="#{i18n.path_consumers_refreshNeeded}" rendered="#{consumer.refreshNeeded}"/>) </li> </c:if> </ul> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-05-27 14:35:34 UTC (rev 10826) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-05-27 17:05:45 UTC (rev 10827) @@ -21,26 +21,29 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <portlet-app - xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" - version="1.0"> - <portlet> - <description>Configuration portlet for WSRP.</description> - <portlet-name>WSRPConfigurationPortlet</portlet-name> - <display-name>WSRP Configuration</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> - <init-param> - <name>default-view</name> - <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <portlet-info> - <title>WSRP Configuration</title> - <keywords>management,admin,wsrp</keywords> - </portlet-info> - </portlet> + xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" + version="1.0"> + <portlet> + <description>Configuration portlet for WSRP.</description> + <portlet-name>WSRPConfigurationPortlet</portlet-name> + <display-name>WSRP Configuration</display-name> + <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <init-param> + <name>default-view</name> + <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> + </init-param> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <resource-bundle>WSRPConfigurationResource</resource-bundle> + <portlet-info> + <title>WSRP Configuration</title> + <keywords>management,admin,wsrp</keywords> + </portlet-info> + </portlet> </portlet-app> \ No newline at end of file

18 years

1
0
0 / 0

JBoss Portal SVN: r10826 - branches/JBoss_Portal_Branch_2_6/cms/src/resources/test.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-27 10:35:34 -0400 (Tue, 27 May 2008) New Revision: 10826 Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/standardidentity-config.xml Log: fix for cms tests Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml 2008-05-27 13:56:24 UTC (rev 10825) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/db-config.xml 2008-05-27 14:35:34 UTC (rev 10826) @@ -47,7 +47,13 @@ <type>Membership</type> <implementation>DB</implementation> <config/> - </module> + </module> + <module> +  + <type>UserProfile</type> + <implementation>DB</implementation> + <config/> + </module> </modules> <options/> </identity-configuration> Modified: branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/standardidentity-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/standardidentity-config.xml 2008-05-27 13:56:24 UTC (rev 10825) +++ branches/JBoss_Portal_Branch_2_6/cms/src/resources/test/standardidentity-config.xml 2008-05-27 14:35:34 UTC (rev 10826) @@ -140,8 +140,33 @@ </option> </config> </module> + + <module> +  + <type>UserProfile</type> + <implementation>DB</implementation> + +  + <service-name>portal:service=Module,type=UserProfile</service-name> + <class>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</class> + +  + <config> + <option> + <name>sessionFactoryJNDIName</name> + <value>java:/SessionFactory</value> + </option> + <option> + <name>jNDIName</name> + <value>java:/portal/UserProfileModule</value> + </option> + </config> + </module> + </modules> + + <options>  <option-group>

18 years

1
0
0 / 0

JBoss Portal SVN: r10825 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-05-27 09:56:24 -0400 (Tue, 27 May 2008) New Revision: 10825 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml Log: - Minor reformat. Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml 2008-05-27 13:24:00 UTC (rev 10824) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml 2008-05-27 13:56:24 UTC (rev 10825) @@ -22,17 +22,15 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> -<!DOCTYPE deployments PUBLIC - "-//JBoss Portal//DTD Portlet Instances 2.6//EN" - "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd"> +<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD Portlet Instances 2.6//EN" "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd"> <deployments> <deployment> <if-exists>overwrite</if-exists> <instance> <resource-bundle>WeatherResource</resource-bundle> - <supported-locale>fr</supported-locale> - <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <supported-locale>en</supported-locale> <instance-id>WeatherPortletInstance</instance-id> <portlet-ref>WeatherPortlet</portlet-ref> </instance>

18 years

1
0
0 / 0

JBoss Portal SVN: r10824 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-05-27 09:24:00 -0400 (Tue, 27 May 2008) New Revision: 10824 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java Log: - Minimal optimization. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-05-27 11:43:45 UTC (rev 10823) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-05-27 13:24:00 UTC (rev 10824) @@ -134,9 +134,10 @@ if (oldNS == null) { PortalObjectId id = (PortalObjectId)wantedKey.getId(); - if (store.getAttribute(id.toString()) instanceof WindowNavigationalState) + Object storedNS = store.getAttribute(id.toString()); + if (storedNS instanceof WindowNavigationalState) { - oldNS = (WindowNavigationalState)store.getAttribute(id.toString()); + oldNS = storedNS; } }

18 years

1
0
0 / 0

JBoss Portal SVN: r10823 - modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-05-27 07:43:45 -0400 (Tue, 27 May 2008) New Revision: 10823 Removed: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/StateType.java Log: remove unused moved class Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/StateType.java =================================================================== --- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/StateType.java 2008-05-27 09:00:03 UTC (rev 10822) +++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/StateType.java 2008-05-27 11:43:45 UTC (rev 10823) @@ -1,42 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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.presentation.model; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 1.1 $ - */ -public enum StateType -{ - /** - * The navigational state type. The navigational state type describe sthe a kind of change done at runtime by the user when it - * interacts with the model (i.e not all interactions with the model are automatically navigational state changes). - */ - NAVIGATIONAL, - - /** - * The structural state type. The structural state type describes the structure of the model, i.e it defines an enduring - * state managed by the presentation server. - */ - STRUCTURAL -}

18 years

1
0
0 / 0

JBoss Portal SVN: r10822 - in branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF: classes and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-27 05:00:03 -0400 (Tue, 27 May 2008) New Revision: 10822 Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml Log: - More i18n Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties 2008-05-27 09:00:03 UTC (rev 10822) @@ -0,0 +1,2 @@ +javax.portlet.title=Greetings ! +javax.portlet.keywords=sample,test \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties 2008-05-27 09:00:03 UTC (rev 10822) @@ -0,0 +1,2 @@ +javax.portlet.title=Bienvenue ! +javax.portlet.keywords=exemple,test \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml 2008-05-26 15:28:04 UTC (rev 10821) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml 2008-05-27 09:00:03 UTC (rev 10822) @@ -36,9 +36,6 @@ <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> </supports> - <portlet-info> - <title>Greetings!</title> - <keywords>sample,test</keywords> - </portlet-info> + <resource-bundle>Resource</resource-bundle> </portlet> </portlet-app>

18 years

1
0
0 / 0

JBoss Portal SVN: r10821 - branches/JBoss_Portal_Branch_2_7/testsuite.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-26 11:28:04 -0400 (Mon, 26 May 2008) New Revision: 10821 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/build.xml Log: Oups, needed to remove the reference to "format" Modified: branches/JBoss_Portal_Branch_2_7/testsuite/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/build.xml 2008-05-26 11:47:32 UTC (rev 10820) +++ branches/JBoss_Portal_Branch_2_7/testsuite/build.xml 2008-05-26 15:28:04 UTC (rev 10821) @@ -113,9 +113,6 @@ <param name="module" value="faces"/> </antcall> <antcall target="internal-test-module"> - <param name="module" value="format"/> - </antcall> - <antcall target="internal-test-module"> <param name="module" value="security"/> </antcall> <antcall target="internal-test-module"> @@ -162,8 +159,6 @@ <fileset dir="../cms" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> <fileset dir="../core" includes="output/tests/*.log"/> <fileset dir="../core" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> - <fileset dir="../format" includes="*.log"/> - <fileset dir="../format" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> <fileset dir="../faces" includes="*.log"/> <fileset dir="../faces" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> <fileset dir="../server" includes="*.log"/>

18 years

1
0
0 / 0

JBoss Portal SVN: r10820 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data and 17 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-26 07:47:32 -0400 (Mon, 26 May 2008) New Revision: 10820 Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/UserPortletConstants.java branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties modules/identity/trunk/.settings/ modules/identity/trunk/.settings/org.eclipse.jdt.ui.prefs modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs Removed: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml Log: - More i18n - Russian l10n - Eclipse update Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -21,12 +21,6 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -# This file is deprecated, use the display-name on objects directly -PAGENAME_default=Home -PAGENAME_Admin=Admin -PAGENAME_Test=Test -PAGENAME_News=News - ACCOUNT_DISABLED=Your account is disabled ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is incorrect ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role Deleted: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -1,28 +0,0 @@ -################################################################################ -# JBoss, a division of Red Hat # -# Copyright 2006, 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. # -################################################################################ - -# This file is deprecated, use the display-name on objects directly -PAGENAME_default=Home -PAGENAME_Admin=Admin -PAGENAME_Test=Test -PAGENAME_News=News \ No newline at end of file Deleted: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -1,28 +0,0 @@ -################################################################################ -# JBoss, a division of Red Hat # -# Copyright 2006, 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. # -################################################################################ - -# This file is deprecated, use the display-name on objects directly -PAGENAME_default=Home -PAGENAME_Admin=Administraci�n -PAGENAME_Test=Ejemplos -PAGENAME_News=Noticias \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -21,12 +21,6 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -# This file is deprecated, use the display-name on objects directly -PAGENAME_default=Accueil -PAGENAME_Admin=Admin -PAGENAME_Test=Test -PAGENAME_News=Actualit\u00E9s - ACCOUNT_DISABLED=Votre compte n'est pas actif ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=L'utilisateur n'existe pas ou le mot de passe est incorrect ACCOUNT_NOTASSIGNEDTOROLE=L'utilisateur n'a pas le role requis Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -21,12 +21,6 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -# Navigation Portlet -PAGENAME_default=Home -PAGENAME_Admin=Amministrazione -PAGENAME_Test=Test -PAGENAME_News=Novit\u00e0 - ACCOUNT_DISABLED=Il tuo account \u00e8 disabilitato ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=Utente insesistente o password non corretta ACCOUNT_NOTASSIGNEDTOROLE=L\'utente non ha i giusti permessi Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,32 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +ACCOUNT_DISABLED=Your account is disabled +ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is incorrect +ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role + +LOGIN_TITLE=JBoss Portal Login +LOGIN_USERNAME=Username +LOGIN_PASSWORD=Password +LOGIN_CANCEL=Cancel +LOGIN_SUBMIT=Submit \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -140,6 +140,7 @@ <display-name xml:lang="it">Home</display-name> <display-name xml:lang="es">Home</display-name> <display-name xml:lang="fr">Accueil</display-name> + <display-name xml:lang="ru">Домой</display-name> <properties> <property> <name>order</name> @@ -295,6 +296,7 @@ <display-name xml:lang="it">Home</display-name> <display-name xml:lang="es">Home</display-name> <display-name xml:lang="fr">Accueil</display-name> + <display-name xml:lang="ru">Домой</display-name> <properties> <property> <name>order</name> @@ -353,6 +355,7 @@ <display-name xml:lang="it">Amministrazione</display-name> <display-name xml:lang="es">Administración</display-name> <display-name xml:lang="fr">Administration</display-name> + <display-name xml:lang="ru">Администрирование</display-name> <window> <window-name>AdminPortletWindow</window-name> <instance-ref>AdminPortletInstance</instance-ref> @@ -376,6 +379,7 @@ <page-name>Members</page-name> <display-name xml:lang="en">Members</display-name> <display-name xml:lang="it">Membri</display-name> + <display-name xml:lang="fr">Utilisateurs</display-name> <window> <window-name>IdentityAdminPortletWindow</window-name> <instance-ref>IdentityAdminPortletInstance</instance-ref> Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,324 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +_ASREGISTERED=\u0423 \u0432\u0430\u0441 \u0435\u0449\u0435 \u043d\u0435\u0442 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438? \u041c\u043e\u0436\u0435\u0442\u0435 <a href\="">\u0441\u043e\u0437\u0434\u0430\u0442\u044c</a>. +_BLOCKNICKNAME=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +_BLOCKPASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c + + + +MessageOrder=\u0421\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f +Ascending=\u041f\u043e \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u044e +Descending=\u041f\u043e \u0443\u0431\u044b\u0432\u0430\u043d\u0438\u044e + +AIM=\u0410\u0434\u0440\u0435\u0441 AIM +ICQ=\u041d\u043e\u043c\u0435\u0440 ICQ +YIM=\u041d\u043e\u043c\u0435\u0440 YIM +MSNM=MSN Messenger + +YourAIM=\u0412\u0430\u0448 AIM \u0430\u0434\u0440\u0435\u0441 +YourICQ=\u0412\u0430\u0448 ICQ \u043d\u043e\u043c\u0435\u0440 +YourYIM=\u0412\u0430\u0448 YIM \u043d\u043e\u043c\u0435\u0440 +YourMSNM=\u0412\u0430\u0448 MSN Messenger + +MyEmail=\u041c\u043e\u0439 e-mail +MyHomePage=\u041c\u043e\u044f \u0434\u043e\u043c\u0430\u0448\u043d\u044f\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 + +Question=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 +Answer=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 +Location=\u041c\u0435\u0441\u0442\u043e\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +Occupation=\u0420\u043e\u0434 \u0437\u0430\u043d\u044f\u0442\u0438\u0439 +Interests=\u0418\u043d\u0442\u0435\u0440\u0435\u0441\u044b +ExtraInfo=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f +YourLocation=\u0412\u0430\u0448\u0435 \u043c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +YourOccupation=\u0412\u0430\u0448 \u0440\u043e\u0434 \u0437\u0430\u043d\u044f\u0442\u0438\u0439 +YourInterests=\u0412\u0430\u0448\u0438 \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u044b +Signature=\u041f\u043e\u0434\u043f\u0438\u0441\u044c + +LoginSite=\u0412\u0445\u043e\u0434. +Register=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f. + +UserExist=\u0422\u0430\u043a\u043e\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 +ToChangeInfo=\u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0430\u0448\u0443 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e +EmailVerify=\u0421\u0441\u044b\u043b\u043a\u0430 \u0430\u043a\u0442\u0438\u0432\u0430\u0446\u0438\u0438 \u043e\u0442\u043e\u0441\u043b\u0430\u043d\u0430! \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u043f\u043e\u0447\u0442\u043e\u0432\u044b\u0439 \u044f\u0449\u0438\u0435 \u0438 \u0449\u0435\u043b\u043a\u043d\u0438\u0442\u0435 \u043d\u0430 \u0441\u0441\u044b\u043b\u043a\u0435, \u0447\u0442\u043e\u0431\u044b \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0430\u0448\u0443 \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. +AccountActivated=\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430! +UnableActivate=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +LoggingYou=\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0435\u043c \u0432\u0430\u0448\u0443 \u043b\u0438\u0447\u043d\u043e\u0441\u0442\u044c, \u0434\u0435\u0440\u0436\u0438\u0442\u0435\u0441\u044c\! +YouAreLoggedOut=\u0412\u044b \u0441\u0435\u0439\u0447\u0430\u0441 \u0432\u044b\u0448\u043b\u0438 \u0438\u0437 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438\! +PassDifferent=\u041f\u0430\u0440\u043e\u043b\u0438 \u0440\u0430\u0437\u043b\u0438\u0447\u0430\u044e\u0442\u0441\u044f. \u041e\u043d\u0438 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u043e\u0434\u0438\u043d\u0430\u043a\u043e\u0432\u044b\u043c\u0438. +YourPassMustBe=\u0418\u0437\u0432\u0438\u043d\u0438\u0442\u0435, \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0432 \u0434\u043b\u0438\u043d\u0443 \u043f\u043e \u043a\u0440\u0430\u0439\u043d\u0435\u0439 \u043c\u0435\u0440\u0435 +CharLong=\u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432 +UserNotExist=\u0422\u0430\u043a\u043e\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442\! +UserRegLogin=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f/\u0432\u0445\u043e\u0434 +SelectOption=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u043f\u0446\u0438\u044e \u0438\u0437 \u043c\u0435\u043d\u044e \u0432\u043d\u0438\u0437\u0443\: +RetrievePass=\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u0442\u0435\u0440\u044f\u043d\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c. +RegNewUser=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +PasswordAgain=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c +Email=E-mail +Options=\u041e\u043f\u0446\u0438\u0438 +AllowEmailView=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c \u0432\u0438\u0434\u0435\u0442\u044c \u043c\u043e\u0439 e-mail +AsRegUser=\u0412 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435\: +AsReg6=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u044b\u0435 \u0442\u0435\u043c\u044b +AsReg5=Customize the comments +AsReg4=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c \u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043d\u043e\u0432\u043e\u0441\u0442\u043d\u044b\u0445 \u0441\u044e\u0436\u0435\u0442\u043e\u0432 \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 +AsReg3=Have a personal box on the homepage +AsReg2=\u0420\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c \u043d\u043e\u0432\u043e\u0441\u0442\u0438 \u043e\u0442 \u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438 +AsReg1=\u041e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438 \u043e\u0442 \u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438 +RegisterNow=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044c \u0441\u0435\u0439\u0447\u0430\u0441\! \u042d\u0442\u043e \u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u043e\! +WeDontGive=\u041c\u044b \u043d\u0435 \u0431\u0443\u0434\u0435\u043c \u043f\u0440\u043e\u0434\u0430\u0432\u0430\u0442\u044c/\u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c \u043a\u043e\u043c\u0443-\u0442\u043e \u043d\u0438 \u0431\u044b\u043b\u043e \u0432\u0430\u0448\u0438 \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435. +WelcomeTo=\u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c +Registration=\u0432 \u043e\u0431\u043b\u0430\u0441\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438. + +Over13_1=\u041c\u043d\u0435 +Over13_2=\u0438\u043b\u0438 \u0441\u0442\u0430\u0440\u0448\u0435 \u0438\u043b\u0438 \u0443 \u043c\u0435\u043d\u044f \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u043d\u0430\u0434\u0437\u043e\u0440 \u043a \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 +MustBe_1=\u0412\u0430\u043c \u0434\u043e\u043b\u0436\u043d\u043e \u0431\u044b\u0442\u044c +MustBe_2=\u0438\u043b\u0438 \u0431\u043e\u043b\u044c\u0448\u0435, \u0438\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0437\u0434\u0435\u0441\u044c. +Consent_1=(\u0429\u0435\u043b\u043a\u0430\u044f \u043d\u0430 \u0441\u0441\u044b\u043b\u043a\u0435 \u0441\u0432\u0435\u0440\u0445\u0443 \u0432\u044b \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0430\u0435\u0442\u0435, \u0447\u0442\u043e \u0432\u0430\u043c<br> +Consent_2=\u0438\u043b\u0438 \u0431\u043e\u043b\u044c\u0448\u0435, \u0438\u043b\u0438 \u0443 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 \u0437\u0434\u0435\u0441\u044c.) +Under13_1=\u041c\u043d\u0435 \u043c\u0435\u043d\u044c\u0448\u0435 +Under13_2=\u0438 \u0443 \u043c\u0435\u043d\u044f \u043d\u0435\u0442 \u0440\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0433\u043e \u043d\u0430\u0434\u0437\u043e\u0440\u0430 \u043a \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438. + +Sorry=\u0418\u0437\u0432\u0438\u043d\u0438\u0442\u0435. +Click=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0449\u0435\u043b\u043a\u043d\u0438\u0442\u0435 +Here=\u0437\u0434\u0435\u0441\u044c +Return=\u0447\u0442\u043e\u0431\u044b \u0432\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043d\u0430 \u0433\u043b\u0430\u0432\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443. +UserName=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +GoBack=\u041d\u0430\u0437\u0430\u0434 +Finish=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c +PersonalInfo=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f +RealName=\u041d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0438\u043c\u044f +Optional=(\u043e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e) +CanKnowAbout=(\u041d\u0430\u043f\u0438\u0448\u0438\u0442\u0435, \u0447\u0442\u043e \u0431\u044b\u043b\u043e \u0431\u044b \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u043d\u043e \u043e \u0432\u0430\u0441. \u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) +Language=\u042f\u0437\u044b\u043a +255CharMax=(\u041d\u0430\u043f\u0438\u0448\u0438\u0442\u0435 \u0432\u0430\u0448\u0443 \u043f\u043e\u0434\u043f\u0438\u0441\u044c \u0432 HTML-\u0444\u043e\u0440\u043c\u0435. \u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) +YourAvatar=\u0412\u0430\u0448 \u0430\u0432\u0430\u0442\u0430\u0440 +YourHomePage=\u0412\u0430\u0448 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442 +TimeZoneOffset=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0437\u043e\u043d\u0430 +EmailNotPublic=(\u042d\u0442\u043e\u0442 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0432\u0438\u0434\u0435\u043d, \u043d\u043e \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u0435\u043d. \u041e\u043d \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f \u0432 \u0441\u043b\u0443\u0447\u0430\u0435 \u0435\u0433\u043e \u043f\u043e\u0442\u0435\u0440\u0438) +EmailPublic=(\u042d\u0442\u043e\u0442 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u0431\u0443\u0434\u0435\u0442 \u0432\u0438\u0434\u0435\u043d. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u043e, \u0447\u0442\u043e \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0435 \u043d\u0443\u0436\u043d\u044b\u043c. \u041d\u0435\u043a\u0440\u0438\u0442\u0438\u0447\u043d\u043e \u043a \u0441\u043f\u0430\u043c\u0443) +RealEmail=\u041d\u0430\u0441\u0442\u043e\u044f\u0449\u0438\u0439 e-mail +FakeEmail=\u0412\u044b\u0434\u0443\u043c\u0430\u043d\u043d\u044b\u0439 e-mail +NewUser=\u041d\u043e\u0432\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c +SaveChanges=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f +SaveChange=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 +TypeNewPassword=(\u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0434\u0432\u0430\u0436\u0434\u044b \u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f \u0435\u0433\u043e \u0441\u043c\u0435\u043d\u044b) +Search=\u041f\u043e\u0438\u0441\u043a +All=\u0412\u0441\u0435 +UsersFoundFor=\u043d\u0430\u0439\u0434\u0435\u043d\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 +Pages=\u0441\u0442\u0440\u0430\u043d\u0438\u0446 +UsersShown=\u043f\u043e\u043a\u0430\u0437\u0430\u043d\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 +Delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c +Edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c +Ok=Ok +Cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c +AreYouSureToDeleteUser=\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f? +UserDeleted=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0443\u0434\u0430\u0447\u043d\u043e \u0443\u0434\u0430\u043b\u0435\u043d +ReturnToMemberList=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u0441\u043f\u0438\u0441\u043a\u0443 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 +Avatar=\u0410\u0432\u0430\u0442\u0430\u0440 +AdminFunctions=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u0435 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 +URL=URL +UpdateUser=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +UserID=User ID +ForChanges=(\u0422\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0439) +MemberList=\u0421\u043f\u0438\u0441\u043e\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 +SearchTip=\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0430: \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0431\u0443\u043a\u0432\u0443, \u043f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0432\u0441\u0435\u0445 \u0438\u043b\u0438 \u0438\u0441\u043a\u0430\u0442\u044c \u043a\u043e\u043d\u043a\u0440\u0435\u0442\u043d\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f + +ThemeText1=\u042d\u0442\u0430 \u043e\u043f\u0446\u0438\u044f \u0437\u0430\u0442\u0440\u043e\u043d\u0435\u0442 \u043e\u0431\u043b\u0438\u043a \u0432\u0441\u0435\u0433\u043e \u0441\u0430\u0439\u0442\u0430. +ThemeText2=\u042d\u0442\u0430 \u043e\u043f\u0446\u0438\u044f \u0437\u0430\u0442\u0440\u043e\u043d\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u0432\u0430\u0448\u0443 \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0443\u044e \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443. +ThemeText3=\u041a\u0430\u0436\u0434\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043c\u043e\u0436\u0435\u0442 \u0432\u0438\u0434\u0435\u0442\u044c \u0441\u0430\u0439\u0442 \u0441 \u0438\u043d\u0434\u0438\u0432\u0438\u0434\u0443\u0430\u043b\u044c\u043d\u043e\u0439 \u0442\u0435\u043c\u043e\u0439. +SelectTheme=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0442\u0435\u043c\u0443 +ThemeSelection=\u0412\u044b\u0431\u043e\u0440 \u0442\u0435\u043c + +CannotLogin=Cannot proceed to login + +LoginInvalidName=\u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0435\u0432\u0435\u0440\u043d\u043e +LoginNoSuchUser=\u0434\u0430\u043d\u043d\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 +LoginBadPassword=\u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0435\u0442 +LoginUnexpectedError=\u043d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 +LoginUserDisabled=\u0432\u0430\u0448\u0430 \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0431\u044b\u043b\u0430 \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0430\u043d\u0430. \u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443. + +Enable=Enable +Disable=Disable +StatusChanged=\u0421\u0442\u0430\u0442\u0443\u0441 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0434\u0430\u0447\u043d\u043e \u0438\u0437\u043c\u0435\u043d\u0435\u043d + +NotAuth=\u0412\u0430\u043c \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0430\u0435\u0442\u0441\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0443\u043a\u0430\u0437\u0430\u043d\u043d\u0443\u044e \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044e + + +REMEMBERME=\u0417\u0430\u043f\u043e\u043c\u043d\u0438\u0442\u044c \u043c\u0435\u043d\u044f +LOGIN=\u0412\u0445\u043e\u0434 +USERNAME=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +PASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c +USERLOGIN=\u0412\u0430\u0448 \u0432\u0445\u043e\u0434 + +OPTIONAL=\u041e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e +REQUIRED=\u041e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e + +255MAX=(\u041f\u043e\u0434\u043f\u0438\u0441\u044c - \u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) + +NAMENOTAVAILABLE=N/A + +MODIFIED_PROFILE=\u0412\u0430\u0448 \u043f\u0440\u043e\u0444\u0438\u043b\u044c \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0435\u043d, \u043d\u043e \u043f\u043e\u0440\u0442\u0430\u043b \u0431\u0443\u0434\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0430\u0442\u044c \u0441 \u0432\u0430\u0448\u0438\u043c \u0442\u0435\u043a\u0443\u0449\u0438\u043c \u043f\u0440\u043e\u0444\u0438\u043b\u0435\u043c, \u043f\u043e\u043a\u0430 \u0432\u044b \u0437\u0430\u043d\u043e\u0432\u043e \u043d\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0443\u0435\u0442\u0435\u0441\u044c. + +# Registration +REGISTER_NOT_LOGGED_IN=\u0412\u044b \u043f\u043e\u043a\u0430 \u043d\u0435 \u043f\u0440\u043e\u0448\u043b\u0438 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u0430\u0446\u0438\u044e. +REGISTER_REGISTER=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. +REGISTER_REGISTER_LINK=\u0421\u043e\u0437\u0434\u0430\u0442\u044c +REGISTER_REGISTER_ADMIN_LINK=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +REGISTER_TY=\u0421\u043f\u0430\u0441\u0438\u0431\u043e \u0437\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e. +REGISTER_BASICINFO=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435 +REGISTER_IM=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u044b IM-\u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432 +REGISTER_ADDITIONAL=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435 +REGISTER_NEWUSER=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +REGISTER_PASSWORDAGAIN=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c +REGISTER_REALEMAIL=\u0414\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 e-mail +REGISTER_EMAILNOTPUBLIC=(\u042d\u0442\u043e\u0442 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u0432\u0438\u0434\u0435\u043d, \u043d\u043e \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u0435\u043d \u043f\u0440\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438. \u041e\u043d \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d \u0434\u043b\u044f \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0432\u0430\u043c \u043f\u0430\u0440\u043e\u043b\u044f, \u0432 \u0441\u043b\u0443\u0447\u0430\u0435 \u0435\u0433\u043e \u043f\u043e\u0442\u0435\u0440\u0438) +REGISTER_FAKEEMAIL=\u0412\u044b\u0434\u0443\u043c\u0430\u043d\u043d\u044b\u0439 e-mail +REGISTER_EMAILPUBLIC=(\u042d\u0442\u043e\u0442 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u0431\u0443\u0434\u0435\u043d \u0432\u0438\u0434\u0435\u043d. \u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u043e, \u0447\u0442\u043e \u0441\u0447\u0438\u0442\u0430\u0435\u0442\u0435 \u043d\u0443\u0436\u043d\u044b\u043c. \u041d\u0435\u043a\u0440\u0438\u0442\u0438\u0447\u043d\u043e \u043a \u0441\u043f\u0430\u043c\u0443) +REGISTER_FAKEEMAIL_EXPLAIN=\u0415\u0441\u043b\u0438 \u044d\u0442\u043e \u043f\u043e\u043b\u0435 \u043d\u0435 \u043f\u0443\u0441\u0442\u043e, \u0442\u043e \u043d\u0430 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0438\u0439 email \u0431\u0443\u0434\u0443\u0442 \u0440\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f +REGISTER_QUESTION=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 +REGISTER_ANSWER=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 +REGISTER_ASREGUSER=\u0411\u0443\u0434\u0443\u0447\u0438 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435: +REGISTER_ASREG6=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c \u0440\u0430\u0437\u043b\u0438\u0447\u043d\u044b\u0435 \u0442\u0435\u043c\u044b +REGISTER_ASREG5=Customize the comments +REGISTER_ASREG4=\u0412\u044b\u0431\u0438\u0440\u0430\u0442\u044c, \u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043d\u043e\u0432\u043e\u0441\u0442\u043d\u044b\u0445 \u0441\u044e\u0436\u0435\u0442\u043e\u0432 \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 +REGISTER_ASREG3=\u0418\u043c\u0435\u0442\u044c \u043f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u044b\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u044f\u0449\u0438\u0435 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 +REGISTER_ASREG2=\u0420\u0430\u0441\u0441\u044b\u043b\u0430\u0442\u044c \u043d\u043e\u0432\u043e\u0441\u0442\u0438 \u043e\u0442 \u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438 +REGISTER_ASREG1=\u041e\u0441\u0442\u0430\u0432\u043b\u044f\u0442\u044c \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438 \u043e\u0442 \u0432\u0430\u0448\u0435\u0433\u043e \u0438\u043c\u0435\u043d\u0438 +REGISTER_REGISTERNOW=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044c \u0441\u0435\u0439\u0447\u0430\u0441! \u042d\u0442\u043e \u0431\u0435\u0441\u043f\u043b\u0430\u0442\u043d\u043e! +REGISTER_WEDONTGIVE=\u041c\u044b \u043d\u0435 \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u043e\u0434\u0430\u0432\u0430\u0442\u044c/\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u0442\u044c \u0432\u0430\u0448\u0438 \u043b\u0438\u0447\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435. +REGISTER_ALREADYHAVEACCOUNT=\u0423 \u0432\u0430\u0441 \u0443\u0436\u0435 \u0435\u0441\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c: +REGISTER_SIGNIN=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f +REGISTER_GIVENNAME=\u0418\u043c\u044f +REGISTER_FAMILYNAME=\u0424\u0430\u043c\u0438\u043b\u0438\u044f +REGISTER_PERSONALINFO=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f +REGISTER_VIEWREALEMAIL=\u0420\u0430\u0437\u0440\u0435\u0448\u0438\u0442\u044c \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c \u0432\u0438\u0434\u0435\u0442\u044c \u043c\u043e\u0439 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0438\u0439 e-mail +REGISTER_HOMEPAGE=\u0410\u0434\u0440\u0435\u0441 \u0432\u0430\u0448\u0435\u0433\u043e \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430 +REGISTER_TIMEZONEOFFSET=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0437\u043e\u043d\u0430 +REGISTER_THEME=\u0422\u0435\u043c\u0430 +REGISTER_DEFAULT_THEME=\u041e\u0431\u043b\u0438\u043a \u0441\u0430\u0439\u0442\u0430 \u043f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e +REGISTER_ICQ=ICQ id +REGISTER_AIM=AIM id +REGISTER_YIM=Yahoo id +REGISTER_MSNM=MSN messenger id +REGISTER_SKYPE=Skype id +REGISTER_XMMP=XMMP id +REGISTER_LOCATION=\u041c\u0435\u0441\u0442\u043e\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +REGISTER_LANGUAGE=\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0438\u0442\u0430\u0435\u043c\u044b\u0439 \u044f\u0437\u044b\u043a +REGISTER_OCCUPATION=\u0420\u043e\u0434 \u0434\u0435\u044f\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 +REGISTER_INTERESTS=\u0418\u043d\u0442\u0435\u0440\u0435\u0441\u044b +REGISTER_SIGNATURE=\u041f\u043e\u0434\u043f\u0438\u0441\u044c +REGISTER_EXTRAINFO=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f +REGISTER_CANKNOWABOUT=(\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u043e, \u0447\u0442\u043e \u043e\u0441\u0442\u0430\u043b\u044c\u043d\u044b\u043c \u0431\u0443\u0434\u0435\u0442 \u0438\u043d\u0442\u0435\u0440\u0435\u0441\u043d\u043e \u0443\u0437\u043d\u0430\u0442\u044c \u043e \u0432\u0430\u0441. \u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) +REGISTER_SAVECHANGES=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f +REGISTER_CONFIRMATIONEMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u043d\u0430 email + +REGISTER_SHOWMENU=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u0432 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435 \u043c\u0435\u043d\u044e + +REGISTER_ERROR_INVALIDUSERNAME=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0435\u0432\u0435\u0440\u043d\u043e +REGISTER_ERROR_EXISTINGUSERNAME=\u042d\u0442\u043e \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f +REGISTER_ERROR_INVALIDPASSWORD1=\u041f\u0430\u0440\u043e\u043b\u044c \u043d\u0435\u0432\u0435\u0440\u0435\u043d +REGISTER_ERROR_INVALIDPASSWORD2=\u041f\u0430\u0440\u043e\u043b\u044c \u043d\u0435\u0432\u0435\u0440\u0435\u043d +REGISTER_ERROR_PASSWORDMISMATCH=\u041f\u0430\u0440\u043e\u043b\u0438 \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442 +REGISTER_ERROR_INVALIDREALEMAIL=\u042d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u043d\u0435\u0432\u0435\u0440\u0435\u043d + +REGISTER_CONFIRM=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0443\u0434\u0430\u0447\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u043d. +REGISTER_ADMIN_SEARCH=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c/\u041e\u0442\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 + + +MENU_LOGOUT=\u0412\u044b\u0439\u0442\u0438 +MENU_EDITPROFILE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0430\u0448 \u043f\u0440\u043e\u0444\u0438\u043b\u044c +MENU_LISTUSERS=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0432\u0441\u0435\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 + +LIST_FILTERS=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u0444\u0438\u043b\u044c\u0442\u0440\u044b \u043a \u0441\u043f\u0438\u0441\u043a\u0443 +LIST_USERSPERPAGE=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443 +LIST_USERNAMECONTAINS=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 +LIST_FULLNAME=\u041f\u043e\u043b\u043d\u043e\u0435 \u0438\u043c\u044f +LIST_USERNAME=\u0418\u043c\u044f \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 +LIST_FIRSTNAME=\u0418\u043c\u044f +LIST_LASTNAME=\u0424\u0430\u043c\u0438\u043b\u0438\u044f +LIST_ROLES=\u0420\u043e\u043b\u0438 +LIST_ACTIONS=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f +LIST_ACTIONSSHOWPROFILE=\u041f\u0440\u043e\u0444\u0438\u043b\u044c +LIST_ACTIONADDROLESTOUSER=\u0420\u043e\u043b\u0438 +LIST_ACTIONEDITROLES=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0440\u043e\u043b\u0438 +LIST_ACTIONDELETEUSER=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +LIST_CONFIRMDELETEUSER=\u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +LIST_SEARCHRESULTS=\u041f\u043e\u0438\u0441\u043a\u0430\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 +LIST_MATCHING=\u0441\u043e\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 +FILTER=\u0424\u0438\u043b\u044c\u0442\u0440 + +NEXTPAGE=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 +PREVIOUSPAGE=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 + +ASSIGNROLES=\u041d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c \u0440\u043e\u043b\u0438 +ASSIGNEDROLES=\u0420\u043e\u043b\u0438 \u043a \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044e +ROLESAVAILABLE=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 \u0440\u043e\u043b\u0438 +EDITROLESFORUSER=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0440\u043e\u043b\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f + + +ROLE_THEREARE=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e +ROLE_THEREIS=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0430 +ROLE_ROLESDEFINED=\u0440\u043e\u043b\u0435\u0439 +ROLE_ROLEDEFINED=\u0440\u043e\u043b\u044c + +ROLE_NAME=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u043d\u043e\u0432\u043e\u0439 \u0440\u043e\u043b\u0438 +ROLE_DISPLAYNAME=\u0412\u044b\u0432\u043e\u0434\u0438\u0442\u044c \u0438\u043c\u044f \u0440\u043e\u043b\u0438 +ROLE_NEWDISPLAYNAME=New display name for the role +ROLE_SELECTONETOMODIFY= \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u043e\u043b\u0438 \u0434\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f +ROLE_SELECTONETODELETE= \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u043e\u043b\u044c \u0434\u043b\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f +ROLE_CREATE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0443\u044e \u0440\u043e\u043b\u044c +ROLE_UPDATE=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +ROLE_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +ROLE_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u0443\u044e \u0440\u043e\u043b\u044c +ROLE_CONFIRM_DELETE=\u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u044c +ROLE_DELETED=\u0420\u043e\u043b\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u0430 +ROLE_EDIT_MEMBERS=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0447\u043b\u0435\u043d\u043e\u0432 \u0440\u043e\u043b\u0438 +ROLE_MAINLIST=\u041d\u0430\u0437\u0430\u0434 \u043a \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e \u0440\u043e\u043b\u0438 +ROLE_EDIT_USER=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u0440\u043e\u043b\u0438 +ROLE_ADD=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u043e\u043b\u0438 +ROLE_REMOVE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u0438 + +ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=\u0423\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u043e\u043b\u044c \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0433\u043e \u0438\u043c\u0435\u043d\u0438 +ROLE_ERROR_NAMEALREADYEXISTS=\u0423\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442 \u0440\u043e\u043b\u044c \u0441 \u044d\u0442\u0438\u043c \u0438\u043c\u0435\u043d\u0435\u043c +ROLE_ERROR_NAMEEMPTY=\u0418\u043c\u044f \u0440\u043e\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c +ROLE_ERROR_DISPLAYNAMEEMPTY=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435 \u0438\u043c\u044f \u0440\u043e\u043b\u0438 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u0443\u0441\u0442\u044b\u043c +ROLE_ERROR_DELETE_FAILED=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u044c + +MENU_CREATEROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u0440\u043e\u043b\u044c +MENU_EDITROLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0443\u044e \u0440\u043e\u043b\u044c +MENU_EDITROLEMEMBERS=\u0427\u043b\u0435\u043d \u0440\u043e\u043b\u0438 + +ROLE_TEXT_1=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u044d\u0442\u043e\u0442 \u043f\u043e\u0440\u0442\u043b\u0435\u0442 \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f, \u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f, \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f \u0438\u043b\u0438 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043a \u0440\u043e\u043b\u044f\u043c. +ROLE_TEXT_2=\u042d\u0442\u0438 \u0440\u043e\u043b\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0442\u0441\u044f \u0432 \u043f\u043e\u0440\u0442\u043b\u0435\u0442\u0435 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f \u043f\u0440\u0430\u0432. + +PERMISSION_PICKPORTLET=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439 \u0434\u043b\u044f \u043f\u043e\u0440\u0442\u043b\u0435\u0442\u043e\u0432 +PERMISSION_PERMISSIONS=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u044f +PERMISSION_TOP=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0434\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f +PERMISSION_FINERGRAIN=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0443\u0431-\u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442 \u0434\u043b\u044f \u0437\u0430\u0434\u0430\u043d\u0438\u044f \u0435\u0433\u043e \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0439 +PERMISSION_MODIFYROLES=\u0423\u0430\u043b\u0438\u0442\u044c/\u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u043e\u043b\u0438 +PERMISSION_MODIFYINGROLES=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u043e\u043b\u0438 \u0434\u043b\u044f +PERMISSION_DOMAIN=\u0434\u043e\u043c\u0435\u043d\u0430 +PERMISSION_DOMAIN_MOD=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0434\u043e\u043c\u0435\u043d +PERMISSION_DEFINEDROLES=\u041e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0435 \u0440\u043e\u043b\u0438 +PERMISSION_IMPLIEDROLES=\u041f\u043e\u0434\u0440\u0430\u0437\u0443\u043c\u0435\u0432\u0430\u0435\u043c\u044b\u0435 \u0440\u043e\u043b\u0438 + Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,96 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +## CMS ADMIN PORTLET +TITLE_HEAD=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 CMS +TITLE_BROWSE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 +TITLE_FILEBROWSE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0444\u0430\u0439\u043b\u043e\u0432 +TITLE_DELETECONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 +TITLE_CREATECOLLCONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 +TITLE_COPYCONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u0430 +TITLE_MOVECONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u043f\u0435\u0440\u0435\u043d\u043e\u0441 \u0440\u0435\u0441\u0443\u0440\u0441\u0430 +TITLE_VIEWFILE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u0441\u0432\u043e\u0439\u0441\u0442\u0432 \u0444\u0430\u0439\u043b\u0430 +TITLE_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 +TITLE_CREATE=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 +TITLE_UPLOAD=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 +TITLE_SECURECONFIRM=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c\u0430 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 + +CMS_SEARCH=\u041f\u043e\u0438\u0441\u043a +CMS_SEARCHNORESULT=\u041d\u0435\u0442 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u043f\u0440\u043e\u0441\u0430 +CMS_MENU=\u041c\u0435\u043d\u044e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 +CMS_ACTION=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435 +CMS_NAME=\u0418\u043c\u044f +CMS_TYPE=\u0422\u0438\u043f +CMS_CREATED=\u0421\u043e\u0437\u0434\u0430\u043d\u043e +CMS_MODIFIED=\u041c\u043e\u0434\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u043d\u043e +CMS_DESCRIPTION=\u041e\u0431\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 +CMS_VIEW=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 +CMS_COPY=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c +CMS_MOVE=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c +CMS_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c +CMS_FOLDER=\u041a\u0430\u0442\u0430\u043b\u043e\u0433 +CMS_FILE=\u0424\u0430\u0439\u043b +CMS_CREATE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c +CMS_CANCEL=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c +CMS_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c +CMS_UPLOAD=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c +CMS_MODIFY=\u041c\u043e\u0434\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u0442\u044c +CMS_CREATEFOLDER=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043a\u0430\u0442\u0430\u043b\u043e\u0433 +CMS_CREATEFILE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0444\u0430\u0439\u043b +CMS_UPLOADARCHIVE=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0430\u0440\u0445\u0438\u0432 +CMS_BACKTOBROWSER=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0443 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0439 +CMS_TRANSFER=\u0418\u043c\u043f\u043e\u0440\u0442/\u042d\u043a\u0441\u043f\u043e\u0440\u0442 +CMS_EXPORTARCHIVE=\u042d\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043a\u0430\u0442\u0430\u043b\u043e\u0433 +CMS_SECURE=\u0420\u0435\u0436\u0438\u043c \u0434\u043e\u0441\u0442\u0443\u043f\u0430 +CMS_PREVIEW=\u041f\u0440\u0435\u0434\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 + +CMS_CREATEFILEINDIR=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 \u0432 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 +CMS_FILENAME=\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430 +CMS_TITLE=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 +CMS_LANGUAGE=\u042f\u0437\u044b\u043a + +CMS_DELETEPATH=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 +CMS_DELETEWARN1=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435! \u0414\u0430\u043d\u043d\u043e\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u043d\u0435\u043b\u044c\u0437\u044f \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c\! +CMS_DELETEWARN2=\u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0440\u0435\u0441\u0443\u0440\u0441\? + +CMS_DESTINATION=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 +CMS_SOURCE=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a + +CMS_EDITING=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 +CMS_LIVE=\u0421\u0434\u0435\u043b\u0430\u0442\u044c \"\u0436\u0438\u0432\u044b\u043c\" +CMS_VERSION=\u0412\u0435\u0440\u0441\u0438\u044f +CMS_WYSIWYG=WYSIWYG-\u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440 + +CMS_LIVEVERSION=\u0416\u0438\u0432\u0430\u044f \u0432\u0435\u0440\u0441\u0438\u044f +CMS_SIZE=\u0420\u0430\u0437\u043c\u0435\u0440 + +CMS_CONTENT_DIR=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u0438 +CMS_CONTENT_DIR_USE=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0434\u0435\u0440\u0435\u0432\u043e \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \u0434\u043b\u044f \u043d\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0438 \u043f\u043e \u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0435 \u043f\u043e\u0440\u0442\u0430\u043b\u0430. +CMS_MAIN_USE=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u043f\u043e\u0440\u0442\u043b\u0435\u0442 "\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 CMS" \u0434\u043b\u044f \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u043e\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u044b\u043c \u0432\u0430\u0448\u0435\u0433\u043e \u043f\u043e\u0440\u0442\u0430\u043b\u0430. +CMS_MANAGE=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u044b\u043c + +CMS_CREATED_BY=\u0421\u043e\u0437\u0434\u0430\u043d\u043e +CMS_APPROVE=\u041e\u0434\u043e\u0431\u0440\u0435\u043d\u043e +CMS_DENY=\u0417\u0430\u043f\u0435\u0440\u0438\u0442\u044c +CMS_APPROVAL=\u041c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b \u0434\u043b\u044f \u043e\u0434\u043e\u0431\u0440\u0435\u043d\u0438\u044f +CMS_PATH=\u0420\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u0435 Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -42,6 +42,7 @@ <supported-locale>en</supported-locale> <supported-locale>fr</supported-locale> <supported-locale>es</supported-locale> + <supported-locale>ru</supported-locale> <resource-bundle>Resource</resource-bundle> <portlet-info> <title>CMS</title> Deleted: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java 2008-05-26 11:47:32 UTC (rev 10820) @@ -1,119 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2006, 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.core.identity; - -/** @author <a href="theute(a)jboss.org">Thomas Heute</a> $Revision$ */ -public class UserPortletConstants -{ - - public static final String SALT = "14m1r0nm4n"; - - public static final String INFOMESSAGE = "infomessage"; - public static final String ERRORMESSAGE = "errormessage"; - - // Cookie names - public static String CK_USERNAME = "username"; - public static String CK_PASS = "password"; - - // Default values - public static int DEFAULT_USERSPERPAGE = 10; - - // Status return codes for the login. - public static final int LOGIN_STATUS_OK = 0; - public static final int LOGIN_STATUS_BAD_PASSWORD = 1; - public static final int LOGIN_STATUS_NO_SUCH_USER = 2; - public static final int LOGIN_STATUS_USER_DISABLED = 3; - public static final int LOGIN_STATUS_INVALID_NAME = 4; - public static final int LOGIN_STATUS_UNEXPECTED_ERROR = 5; - - public static final int PERMANENT_USER_MAX_INACTIVE = 60 * 60 * 24 * 5 * 1000; // 5 days in ms - public static final int TRANSIENT_USER_MAX_INACTIVE = 60 * 60; // 1 hours in seconds - - public static final String HASH = "hash"; - public static final String USERID = "userid"; - - // Portlet configuration - - public static final String EMAILFROM = "emailFrom"; - public static final String SUBSCRIPTIONMODE = "subscriptionMode"; - public static final String SUBSCRIPTIONMODE_AUTOMATIC = "automatic"; - public static final String SUBSCRIPTIONMODE_EMAILVERIFICATION = "emailVerification"; - public static final String DEFAULT_ROLE = "defaultRole"; - - /** Timezone information : ((value + 1) * 2) - 1 = 2 * value + 1 */ - public static final String[] TIME_ZONE_OFFSETS = - { - "(GMT -12:00 hours) Eniwetok, Kwajalein", - null, - "(GMT -11:00 hours) Midway Island, Samoa", - null, - "(GMT -10:00 hours) Hawaii", - null, - "(GMT -9:00 hours) Alaska", - null, - "(GMT -8:00 hours) Pacific Time (US & Canada)", - null, - "(GMT -7:00 hours) Mountain Time (US & Canada)", - null, - "(GMT -6:00 hours) Central Time (US & Canada), Mexico City", - null, - "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito", - null, - "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz", - "(GMT -3:30 hours) Newfoundland", - "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown", - null, - "(GMT -2:00 hours) Mid-Atlantic", - null, - "(GMT -1:00 hours) Azores, Cape Verde Islands", - null, - "(GMT) Western Europe Time, London, Lisbon, Casablanca, Monrovia", - null, - "(GMT +1:00 hours) CET(Central Europe Time), Brussels, Copenhagen, Madrid, Paris", - null, - "(GMT +2:00 hours) EET(Eastern Europe Time), Kaliningrad, South Africa", - null, - "(GMT +3:00 hours) Baghdad, Kuwait, Riyadh, Moscow, St. Petersburg", - "(GMT +3:30 hours) Tehran", - "(GMT +4:00 hours) Abu Dhabi, Muscat, Baku, Tbilisi", - "(GMT +4:30 hours) Kabul", - "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent", - "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi", - "(GMT +6:00 hours) Almaty, Dhaka, Colombo", - null, - "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta", - null, - "(GMT +8:00 hours) Beijing, Perth, Singapore, Hong Kong, Chongqing, Urumqi, Taipei", - null, - "(GMT +9:00 hours) Tokyo, Seoul, Osaka, Sapporo, Yakutsk", - "(GMT +9:30 hours) Adelaide, Darwin", - "(GMT +10:00 hours) EAST(East Australian Standard)", - null, - "(GMT +11:00 hours) Magadan, Solomon Islands, New Caledonia", - null, - "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island", - null - }; - - public static final String DEFAULT_IMAGES_PATH = "images/user"; -} Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/UserPortletConstants.java (from rev 10818, branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java) =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/UserPortletConstants.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/UserPortletConstants.java 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,119 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.core.identity.ui; + +/** @author <a href="theute(a)jboss.org">Thomas Heute</a> $Revision$ */ +public class UserPortletConstants +{ + + public static final String SALT = "14m1r0nm4n"; + + public static final String INFOMESSAGE = "infomessage"; + public static final String ERRORMESSAGE = "errormessage"; + + // Cookie names + public static String CK_USERNAME = "username"; + public static String CK_PASS = "password"; + + // Default values + public static int DEFAULT_USERSPERPAGE = 10; + + // Status return codes for the login. + public static final int LOGIN_STATUS_OK = 0; + public static final int LOGIN_STATUS_BAD_PASSWORD = 1; + public static final int LOGIN_STATUS_NO_SUCH_USER = 2; + public static final int LOGIN_STATUS_USER_DISABLED = 3; + public static final int LOGIN_STATUS_INVALID_NAME = 4; + public static final int LOGIN_STATUS_UNEXPECTED_ERROR = 5; + + public static final int PERMANENT_USER_MAX_INACTIVE = 60 * 60 * 24 * 5 * 1000; // 5 days in ms + public static final int TRANSIENT_USER_MAX_INACTIVE = 60 * 60; // 1 hours in seconds + + public static final String HASH = "hash"; + public static final String USERID = "userid"; + + // Portlet configuration + + public static final String EMAILFROM = "emailFrom"; + public static final String SUBSCRIPTIONMODE = "subscriptionMode"; + public static final String SUBSCRIPTIONMODE_AUTOMATIC = "automatic"; + public static final String SUBSCRIPTIONMODE_EMAILVERIFICATION = "emailVerification"; + public static final String DEFAULT_ROLE = "defaultRole"; + + /** Timezone information : ((value + 1) * 2) - 1 = 2 * value + 1 */ + public static final String[] TIME_ZONE_OFFSETS = + { + "(GMT -12:00 hours) Eniwetok, Kwajalein", + null, + "(GMT -11:00 hours) Midway Island, Samoa", + null, + "(GMT -10:00 hours) Hawaii", + null, + "(GMT -9:00 hours) Alaska", + null, + "(GMT -8:00 hours) Pacific Time (US & Canada)", + null, + "(GMT -7:00 hours) Mountain Time (US & Canada)", + null, + "(GMT -6:00 hours) Central Time (US & Canada), Mexico City", + null, + "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito", + null, + "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz", + "(GMT -3:30 hours) Newfoundland", + "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown", + null, + "(GMT -2:00 hours) Mid-Atlantic", + null, + "(GMT -1:00 hours) Azores, Cape Verde Islands", + null, + "(GMT) Western Europe Time, London, Lisbon, Casablanca, Monrovia", + null, + "(GMT +1:00 hours) CET(Central Europe Time), Brussels, Copenhagen, Madrid, Paris", + null, + "(GMT +2:00 hours) EET(Eastern Europe Time), Kaliningrad, South Africa", + null, + "(GMT +3:00 hours) Baghdad, Kuwait, Riyadh, Moscow, St. Petersburg", + "(GMT +3:30 hours) Tehran", + "(GMT +4:00 hours) Abu Dhabi, Muscat, Baku, Tbilisi", + "(GMT +4:30 hours) Kabul", + "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent", + "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi", + "(GMT +6:00 hours) Almaty, Dhaka, Colombo", + null, + "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta", + null, + "(GMT +8:00 hours) Beijing, Perth, Singapore, Hong Kong, Chongqing, Urumqi, Taipei", + null, + "(GMT +9:00 hours) Tokyo, Seoul, Osaka, Sapporo, Yakutsk", + "(GMT +9:30 hours) Adelaide, Darwin", + "(GMT +10:00 hours) EAST(East Australian Standard)", + null, + "(GMT +11:00 hours) Magadan, Solomon Islands, New Caledonia", + null, + "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island", + null + }; + + public static final String DEFAULT_IMAGES_PATH = "images/user"; +} Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2008-05-26 11:47:32 UTC (rev 10820) @@ -34,7 +34,7 @@ import javax.portlet.PortletContext; import org.jboss.portal.common.i18n.LocaleManager; -import org.jboss.portal.core.identity.UserPortletConstants; +import org.jboss.portal.core.identity.ui.UserPortletConstants; import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.theme.ThemeInfo; import org.jboss.portal.theme.ThemeService; Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,178 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +IDENTITY_APPLICATION_NOT_AVAILABLE=\u0414\u0430\u043d\u043d\u044b\u0439 \u043f\u043e\u0440\u0442\u043b\u0435\u0442 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d. \u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0432\u0430\u0448\u0443 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e, \u0430 \u0442\u0430\u043a\u0436\u0435 \u0436\u0443\u0440\u043d\u0430\u043b \u043e\u0448\u0438\u0431\u043e\u043a \u0434\u043b\u044f \u0431\u043e\u043b\u0435\u0435 \u0434\u0435\u0442\u0430\u043b\u044c\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438. + +IDENTITY_WELCOME=\u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c +IDENTITY_REGISTER=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f +IDENTITY_LOST_PASSWORD=\u041f\u043e\u0442\u0435\u0440\u044f\u043b \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_NOT_LOGGED_IN=\u0412\u044b \u0435\u0449\u0435 \u043d\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043b\u0438\u0441\u044c. +IDENTITY_CREATE_ACCOUNT=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. +IDENTITY_BUTTON_SUBMIT=\u0414\u0430 +IDENTITY_BUTTON_EDIT=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c +IDENTITY_BUTTON_CANCEL=\u041e\u0442\u043c\u0435\u043d\u0430 + +IDENTITY_REGISTER_TITLE=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435 +IDENTITY_REGISTER_TITLE_CONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 +IDENTITY_REGISTER_PASSWORD_CONFIRM=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_REGISTER_STATUS_TITLE=\u0421\u0442\u0430\u0442\u0443\u0441 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 +IDENTITY_REGISTER_SUCCESS_TITLE=\u0412\u0430\u0448\u0430 \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0441\u043e\u0437\u0434\u0430\u043d\u0430. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f. +IDENTITY_REGISTER_PENDING_TITLE=\u041f\u043e\u0447\u0442\u043e\u0432\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0431\u044b\u043b\u043e \u043e\u0442\u043e\u0441\u043b\u0430\u043d\u043e \u043d\u0430 \u0432\u0430\u0448 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441. +IDENTITY_REGISTER_REQUIRED_INFORMATION=\u043e\u0437\u043d\u0430\u0447\u0430\u0435\u0442 \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u043f\u043e\u043b\u0435. + +IDENTITY_LOST_PASSWORD_TITLE=\u0417\u0430\u0431\u044b\u043b\u0438 \u0432\u0430\u0448\u0438 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u043e\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435? +IDENTITY_LOST_PASSWORD_DESCRIPTION=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0432\u0430\u0448\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435 \u0438\u043c\u044f \u0434\u043b\u044f \u0441\u0431\u0440\u043e\u0441\u0430 \u043f\u0430\u0440\u043e\u043b\u044f. +IDENTITY_LOST_PASSWORD_ERROR=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c. +IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=\u0412\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u0435 \u043f\u043e\u0447\u0442\u043e\u0432\u043e\u0435 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0441 \u0432\u0430\u0448\u0438\u043c \u043d\u043e\u0432\u044b\u043c \u043f\u0430\u0440\u043e\u043b\u0435\u043c. +IDENTITY_LOST_PASSWORD_STATUS_404=\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430. +IDENTITY_LOST_PASSWORD_STATUS_TITLE=\u041f\u043e\u0442\u0435\u0440\u044f\u043d \u043f\u0430\u0440\u043e\u043b\u044c + +IDENTITY_EDIT_PROFILE_ERROR=\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u043f\u0440\u043e\u0444\u0438\u043b\u044f. +IDENTITY_EDIT_PASSWORD_TITLE=\u0421\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_EDIT_PASSWORD_CURRENT=\u0422\u0435\u043a\u0443\u0449\u0438\u0439 \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_EDIT_CHANGE_PASSWORD=\u0421\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0441\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c. +IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=\u0412\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c \u0431\u044b\u043b \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d. + +IDENTITY_EDIT_EMAIL_TITLE=\u0421\u043c\u0435\u043d\u0430 \u0432\u0430\u0448\u0435\u0433\u043e \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0433\u043e \u0430\u0434\u0440\u0435\u0441\u0430 +IDENTITY_EDIT_EMAIL_NEW=\u041d\u043e\u0432\u044b\u0439 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 +IDENTITY_EDIT_CHANGE_EMAIL=\u041f\u043e\u043c\u0435\u043d\u044f\u0442\u044c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 +IDENTITY_EDIT_CHANGE_EMAIL_ERROR=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u043c\u0435\u043d\u044f\u0442\u044c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=\u041f\u0438\u0441\u044c\u043c\u043e \u0441 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435\u043c \u0431\u044b\u043b\u043e \u043e\u0442\u043e\u0441\u043b\u0430\u043d\u043e \u043d\u0430 \u0432\u0430\u0448 \u0430\u0434\u0440\u0435\u0441. +IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=\u0412\u0430\u0448 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u0431\u044b\u043b \u0441\u043c\u0435\u043d\u0435\u043d. + +IDENTITY_EDIT_PROFILE_TITLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0440\u043e\u0444\u0438\u043b\u044f +IDENTITY_VIEW_PROFILE_TITLE=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043f\u0440\u043e\u0444\u0438\u043b\u044f + +IDENTITY_USERNAME=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u043e\u0435 \u0438\u043c\u044f +IDENTITY_PASSWORD=\u041f\u0430\u0440\u043e\u043b\u044c +IDENTITY_EMAIL=\u042d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 +IDENTITY_GIVENNAME=\u0418\u043c\u044f +IDENTITY_FAMILYNAME=\u0424\u0430\u043c\u0438\u043b\u0438\u044f +IDENTITY_SKYPE=Skype ID +IDENTITY_LOCATION=\u041c\u0435\u0441\u0442\u043e\u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +IDENTITY_OCCUPATION=\u0421\u0444\u0435\u0440\u0430 \u0434\u0435\u044f\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 +IDENTITY_EXTRA=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e +IDENTITY_SIGNATURE=\u041f\u043e\u0434\u043f\u0438\u0441\u044c +IDENTITY_INTERESTS=\u0418\u043d\u0442\u0435\u0440\u0435\u0441\u044b +IDENTITY_LOCALE=\u041b\u043e\u043a\u0430\u043b\u044c +IDENTITY_ICQ=Icq ID +IDENTITY_AIM=Aim ID +IDENTITY_MSNM= MSN messenger ID +IDENTITY_YIM=Yahoo ID +IDENTITY_XMMP=Xmmp ID +IDENTITY_HOMEPAGE=\u0414\u043e\u043c\u0430\u0448\u043d\u044f\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 +IDENTITY_TIMEZONE=\u0412\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u0437\u043e\u043d\u0430 +IDENTITY_THEME=\u0422\u0435\u043c\u0430 +IDENTITY_SECURITY_QUESTION=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 +IDENTITY_SECURITY_ANSWER=\u041e\u0442\u0432\u0435\u0442 \u043d\u0430 \u0441\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u0432\u043e\u043f\u0440\u043e\u0441 +IDENTITY_LAST_LOGIN=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0432\u0445\u043e\u0434 \u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u0443 +IDENTITY_REIGSTRATION_DATE=\u0414\u0430\u0442\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438 +IDENTITY_ENABLED=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043e + +IDENTITY_CATEGORY_GENERAL=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435 \u043f\u0440\u0435\u0434\u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 +IDENTITY_CATEGORY_PERSONAL=\u041f\u0435\u0440\u0441\u043e\u043d\u0430\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f +IDENTITY_CATEGORY_INSTANT=\u0414\u0430\u043d\u043d\u044b\u0435 \u043e\u0431 IM-\u043a\u043b\u0438\u0435\u043d\u0442\u0430\u0445 +IDENTITY_CATEGORY_ADDITIONAL=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f + +IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(\u0421\u0438\u0433\u043d\u0430\u0442\u0443\u0440\u0430 - \u043c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) +IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c 255 \u0441\u0438\u043c\u0432\u043e\u043b\u043e\u0432) + +IDENTITY_MANAGEMENT_ACTION=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f +IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +IDENTITY_MANAGEMENT_ACTION_ROLES=\u0420\u043e\u043b\u0438 +IDENTITY_MANAGEMENT_ACTION_DELETE=\u0423\u0434\u0430\u043b\u0438\u0442\u044c +IDENTITY_MANAGEMENT_USER_MANAGEMENT=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438 +IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0440\u043e\u043b\u044f\u043c\u0438 +IDENTITY_MANAGEMENT_SEARCH_USER=\u041f\u043e\u0438\u0441\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 +IDENTITY_MANAGEMENT_CREATE_USER=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0443\u044e \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +IDENTITY_MANAGEMENT_CREATE_USER_CREATED=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0441\u043e\u0437\u0434\u0430\u043d +IDENTITY_MANAGEMENT_USER_DELETED=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0443\u0434\u0430\u043b\u0435\u043d +IDENTITY_MANAGEMENT_ROLE=\u0420\u043e\u043b\u044c +IDENTITY_MANAGEMENT_ROLE_DISPLAY=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435 \u0438\u043c\u044f +IDENTITY_MANAGEMENT_ROLE_MEMBERS=\u0427\u043b\u0435\u043d\u044b +IDENTITY_MANAGEMENT_ROLE_ASSIGNED=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u044b\u0435 \u0440\u043e\u043b\u0438 +IDENTITY_MANAGEMENT_CREATE_ROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u0440\u043e\u043b\u044c +IDENTITY_MANAGEMENT_EDIT_ROLE=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0440\u043e\u043b\u044c +IDENTITY_MANAGEMENT_CREATE_ROLE=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0440\u043e\u043b\u044c +IDENTITY_MANAGEMENT_DISABLE=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c +IDENTITY_MANAGEMENT_ENABLE=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c +IDENTITY_MANAGEMENT_RESET_PASSWORD=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e \u0431\u0443\u0434\u0435\u0442 \u043e\u0442\u043e\u0441\u043b\u0430\u043d\u043e \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0441\u043e \u0441\u043b\u0443\u0447\u0430\u0439\u043d\u043e \u0441\u0433\u0435\u043d\u0435\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u043c \u043f\u0430\u0440\u043e\u043b\u0435\u043c. +IDENTITY_MANAGEMENT_ASSIGN_ROLES=\u041d\u0430\u0437\u043d\u0430\u0447\u0438\u0442\u044c \u0440\u043e\u043b\u0438 +IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438, \u0442\u0440\u0435\u0431\u0443\u044e\u0449\u0438\u0435 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f +IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=\u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 +IDENTITY_MANAGEMENT_APPROVE_ALL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0435 +IDENTITY_MANAGEMENT_REJECT_ALL=\u041e\u0442\u0432\u0435\u0440\u0433\u043d\u0443\u0442\u044c \u0432\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0435 +IDENTITY_MANAGEMENT_SELECT_ALL=\u0432\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435 +IDENTITY_MANAGEMENT_UNSELECT_ALL=\u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u044b\u0431\u043e\u0440 +IDENTITY_MANAGEMENT_MATRIX=\u041c\u0430\u0442\u0440\u0438\u0446\u0430 +IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=\u0420\u0435\u0436\u0438\u043c\u044b \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 + +IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438, \u0442\u0440\u0435\u0431\u0443\u044e\u0449\u0438\u0435 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f +IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id +IDENTITY_MANAGEMENT_PENDING_APPROVE=\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c +IDENTITY_MANAGEMENT_PENDING_REJECT=\u043e\u0442\u0432\u0435\u0440\u0433\u043d\u0443\u0442\u044c + +IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=\u0420\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 +IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=\u0412\u044b\u0431\u0438\u0440\u0430\u0435\u043c\u044b\u0439 \u0440\u0435\u0436\u0438\u043c \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 \u0440\u0435\u0436\u0438\u043c - \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043f\u043e no e-mail \u043d\u0435\u0442, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043e\u0442 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u043d\u0435\u0442. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u043f\u043e e-mail \u0435\u0441\u0442\u044c, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043e\u0442 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u043d\u0435\u0442. +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043f\u043e e-mail \u0438 \u043e\u0442 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430 \u0435\u0441\u0442\u044c. + +IDENTITY_REGISTER_VERIFY_CAPTCHA=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u043a\u043e\u0434 \u0440\u0438\u0441\u0443\u043d\u043a\u0430 +IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=\u041e\u0441\u0442\u043e\u0440\u043e\u0436\u043d\u043e: \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044f +IDENTITY_WARNING_CONFIRM_DELETE_USER=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435! \u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +IDENTITY_WARNING_CONFIRM_DELETE_ROLE=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435! \u0412\u044b \u0441\u043e\u0431\u0438\u0440\u0430\u0435\u0442\u0435\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u043b\u044c +IDENTITY_REGISTER_CONFIRMATIONEMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 \u0432\u0430\u0448\u0435\u0439 \u043f\u043e\u0434\u043f\u0438\u0441\u043a\u0438 + +IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=\u0421\u0431\u0440\u043e\u0441 \u0432\u0430\u0448\u0435\u0433\u043e \u043f\u0430\u0440\u043e\u043b\u044f +IDENTITY_MAIL_SUBJECT_REGISTER=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044e +IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u0432\u0430\u0448 \u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 + +IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0441 \u044d\u0442\u043e\u0439 \u0440\u043e\u043b\u044c\u044e. \u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435 \u0434\u0435\u0442\u0430\u043b\u044c\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a \u0436\u0443\u0440\u043d\u0430\u043b\u0443 \u043e\u0448\u0438\u0431\u043e\u043a. +IDENTITY_MANAGEMENT_ERROR_ACTION_USER=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0441 \u044d\u0442\u0438\u043c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c. \u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435 \u0434\u0435\u0442\u0430\u043b\u044c\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a \u0436\u0443\u0440\u043d\u0430\u043b\u0443 \u043e\u0448\u0438\u0431\u043e\u043a. + +IDENTITY_VERIFICATION_RETURN=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043d\u0430 \u043f\u043e\u0440\u0442\u0430\u043b +IDENTITY_VERIFICATION_LOGIN=\u0412\u043e\u0439\u0442\u0438 +IDENTITY_VERIFICATION_STATUS_EROOR=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0438 \u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u043e\u0433\u043e \u0430\u0434\u0440\u0435\u0441\u0430. +IDENTITY_VERIFICATION_STATUS_FAILED=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044c \u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441. +IDENTITY_VERIFICATION_STATUS_VALIDATED=\u042d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d. +IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=\u0412\u0430\u0448\u0430 \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430. \u0422\u0435\u043f\u0435\u0440\u044c \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f. +IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=\u0412\u0430\u0448 \u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441 \u0431\u044b\u043b \u043f\u0440\u043e\u0432\u0435\u0440\u0435\u043d, \u043d\u043e \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0442\u0435\u043f\u0435\u0440\u044c \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043e\u0434\u043e\u0431\u0440\u0435\u043d\u0430 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u043e\u043c. +IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=\u0412\u0430\u0448\u0430 \u0443\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0430\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u0430. \u0422\u0435\u043f\u0435\u0440\u044c \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0430\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f. + +IDENTITY_VALIDATION_ERROR_REGISTRATION=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=\u042d\u0442\u043e \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f. +IDENTITY_VALIDATION_ERROR_USERNAME_ERROR=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0438 \u0438\u043c\u0435\u043d\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +IDENTITY_VALIDATION_ERROR_PASSWORD_DOESNT_MATCH=\u041f\u0430\u0440\u043e\u043b\u0438 \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442. +IDENTITY_VALIDATION_ERROR_PASSWORD_ERROR=\u041e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0438 \u043f\u0430\u0440\u043e\u043b\u044f. +IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=\u041d\u0435\u0432\u0435\u0440\u043d\u044b\u0439 \u044d\u043b\u0435\u0442\u0440\u043e\u043d\u043d\u044b\u0439 \u0430\u0434\u0440\u0435\u0441. +IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c +IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u044b\u0439 \u043a\u043e\u0434 \u0441 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0438 + +# Example usage for dynamic values +IDENTITY_DYNAMIC_VALUE_TEST=test label +IDENTITY_DYNAMIC_VALUE_TEST2=test label2 Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -57,6 +57,7 @@ <portlet-mode>VIEW</portlet-mode> </supports> <supported-locale>fr</supported-locale> + <supported-locale>ru</supported-locale> <supported-locale>en</supported-locale> <supported-locale>it</supported-locale> <resource-bundle>conf.bundles.Identity</resource-bundle> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -36,6 +36,7 @@ <display-name xml:lang="it">Test</display-name> <display-name xml:lang="es">Ejemplos</display-name> <display-name xml:lang="fr">Test</display-name> + <display-name xml:lang="ru">Тест</display-name> <properties> <property> <name>order</name> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,25 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +javax.portlet.preference.name.RssXml=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a RSS +javax.portlet.preference.name.expires=\u0422\u0430\u0439\u043c-\u0430\u0443\u0442 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -36,6 +36,7 @@ <display-name xml:lang="it">Novita'</display-name> <display-name xml:lang="es">Noticias</display-name> <display-name xml:lang="fr">Actualités</display-name> + <display-name xml:lang="ru">Новости</display-name> <properties> <property> <name>order</name> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -54,6 +54,7 @@ <supported-locale>en</supported-locale> <supported-locale>fr</supported-locale> <supported-locale>it</supported-locale> + <supported-locale>ru</supported-locale> <resource-bundle>NewsResource</resource-bundle> <portlet-info> <title>News Feeds</title> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,32 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +NO_USERS_ONLINE=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u0439 \u043d\u0435\u0442 +ONE_USER_ONLINE_0=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d <b> +ONE_USER_ONLINE_1=</b> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c: +ONE_USER_IS_0=<b> +ONE_USER_IS_1=</b> +USERS_ONLINE_0=\u0410\u0432\u0442\u043e\u0440\u0438\u0437\u043e\u0432\u0430\u043d\u043e <b> +USERS_ONLINE_1=</b> \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f(\u0439): +USERS_ARE_0=<b> +USERS_ARE_1=</b> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -39,6 +39,7 @@ <supported-locale>en</supported-locale> <supported-locale>it</supported-locale> <supported-locale>fr</supported-locale> + <supported-locale>ru</supported-locale> <resource-bundle>Resource</resource-bundle> <portlet-info> <title>Current users</title> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,28 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, 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. # +################################################################################ + +javax.portlet.preference.name.RssXml=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a RSS +javax.portlet.preference.name.expires=\u0422\u0430\u0439\u043c-\u0430\u0443\u0442 +org.jboss.portal.object.name.Weather=\u041f\u043e\u0433\u043e\u0434\u0430 + +org.jboss.portal.instance.name.WeatherPortletInstance=\u041c\u0435\u0442\u0435\u043e\u0441\u0432\u043e\u0434\u043a\u0430 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2008-05-26 10:30:56 UTC (rev 10819) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2008-05-26 11:47:32 UTC (rev 10820) @@ -54,6 +54,7 @@ <supported-locale>fr</supported-locale> <supported-locale>en</supported-locale> <supported-locale>it</supported-locale> + <supported-locale>ru</supported-locale> <resource-bundle>WeatherResource</resource-bundle> <portlet-info> <title>Weather Portlet</title> Added: modules/identity/trunk/.settings/org.eclipse.jdt.ui.prefs =================================================================== --- modules/identity/trunk/.settings/org.eclipse.jdt.ui.prefs (rev 0) +++ modules/identity/trunk/.settings/org.eclipse.jdt.ui.prefs 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,3 @@ +#Mon May 26 12:22:39 CEST 2008 +eclipse.preferences.version=1 +internal.default.compliance=user Added: modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs =================================================================== --- modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ modules/identity/trunk/.settings/org.maven.ide.eclipse.prefs 2008-05-26 11:47:32 UTC (rev 10820) @@ -0,0 +1,9 @@ +#Mon May 26 12:21:18 CEST 2008 +activeProfiles= +eclipse.preferences.version=1 +filterResources=false +includeModules=true +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +useMavenFolders=false +version=1

18 years

1
0
0 / 0

JBoss Portal SVN: r10819 - branches/JBoss_Portal_Branch_2_7/build.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-26 06:30:56 -0400 (Mon, 26 May 2008) New Revision: 10819 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml Log: switch to snapshot Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-05-26 08:04:11 UTC (rev 10818) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-05-26 10:30:56 UTC (rev 10819) @@ -51,7 +51,7 @@ <componentref name="jboss-portal/modules/web" version="1.2.0.Beta3"/> <componentref name="jboss-portal/modules/test" version="1.0.1"/> <componentref name="jboss-portal/modules/portlet" version="2.0.0.CR2"/> - <componentref name="jboss-portal/modules/identity" version="1.0.1"/> + <componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/> <componentref name="antlr" version="2.7.6.ga"/> <componentref name="apache-ant" version="1.6.5"/> <componentref name="jackrabbit" version="1.1.1"/>

18 years

1
0
0 / 0

JBoss Portal SVN: r10818 - in modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity: auth and 5 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-26 04:04:11 -0400 (Mon, 26 May 2008) New Revision: 10818 Added: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event/UserProfileChangedEvent.java Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot/IdentityServiceLoader.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPConnectionContext.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserProfileModuleService.java Log: Sync changes from 1.0 branch Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -134,6 +134,7 @@ log.debug("Delegating to DB module"); getDBModule().setProperty(user, name, propertyValue); + fireUserProfileChangedEvent(user.getId(), user.getUserName(), name); return; } throw new IdentityException("Cannot process property - incorrect profile or module configuration"); Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -71,6 +71,8 @@ public static final String USER_ALLOW_EMPTY_PASSWORDS = "allowEmptyPasswords"; + public static final String USER_USER_NAME_TO_LOWER_CASE = "userNameToLowerCase"; + //public static final String ROLE_CONTAINER_DN = "roleContainerDN"; public static final String ROLE_RID_ATTRIBUTE_ID = "ridAttributeID"; Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -75,7 +75,7 @@ public String getUserName(); /** Set the password using proper encoding. */ - public void updatePassword(String password); + public void updatePassword(String password) throws IdentityException; /** Return true if the password is valid. */ public boolean validatePassword(String password); Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -50,7 +50,7 @@ /** * A login module that uses the user module. - * + * * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> @@ -59,7 +59,7 @@ */ public class IdentityLoginModule extends UsernamePasswordLoginModule { - + protected String userModuleJNDIName; protected String roleModuleJNDIName; @@ -72,6 +72,10 @@ protected String havingRole; + protected String validateUserNameCase; + + protected String userNameToLowerCase; + public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { super.initialize(subject, callbackHandler, sharedState, options); @@ -85,6 +89,8 @@ .get("membershipModuleJNDIName"); additionalRole = (String) options.get("additionalRole"); havingRole = (String) options.get("havingRole"); + validateUserNameCase = (String) options.get("validateUserNameCase"); + userNameToLowerCase = (String) options.get("userNameToLowerCase"); // Some info log.trace("userModuleJNDIName = " + userModuleJNDIName); @@ -93,6 +99,8 @@ log.trace("membershipModuleJNDIName = " + membershipModuleJNDIName); log.trace("additionalRole = " + additionalRole); log.trace("havingRole = " + havingRole); + log.trace("validateUserNameCase = " + validateUserNameCase); + log.trace("userNameToLowerCase = " + userNameToLowerCase); } private UserModule userModule; @@ -178,7 +186,7 @@ // Set the user Status in the request so that the login page can show an error message accordingly request.setAttribute("org.jboss.portal.userStatus", userStatus); - + if (userStatus == UserStatus.OK) { return true; @@ -218,8 +226,16 @@ // exception... if (user == null) { - throw new NoSuchUserException("UserModule returned null user object"); + throw new NoSuchUserException("UserModule returned null user object"); } + + //This is because LDAP binds can be non case sensitive + if (validateUserNameCase != null && validateUserNameCase.equalsIgnoreCase("true") + && !getUsername().equals(user.getUserName())) + { + return UserStatus.UNEXISTING; + } + boolean enabled = false; try { Object enabledS; @@ -331,4 +347,28 @@ { return new UserPrincipal(username); } + + protected String getUsername() + { + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) + { + return super.getUsername().toLowerCase(); + } + return super.getUsername(); + } + + protected String[] getUsernameAndPassword() throws LoginException + { + String[] names = super.getUsernameAndPassword(); + + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) + { + if (names[0] != null) + { + names[0] = names[0].toLowerCase(); + } + } + return names; + + } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot/IdentityServiceLoader.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot/IdentityServiceLoader.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot/IdentityServiceLoader.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -100,6 +100,8 @@ unregisterMBean(ds.getServiceName()); registerMBean(ds.getServiceName(), datasource); } + + } } @@ -111,7 +113,7 @@ ModuleServiceMetaData moduleService = (ModuleServiceMetaData)iterator.next(); ModuleMetaData module = moduleService.getModuleData(); - + String entryName = "portal:identity=Module,type=" + module.getType(); AbstractBeanMetaData moduleBMD = new AbstractBeanMetaData(entryName, module.getClassName()); @@ -148,8 +150,10 @@ { unregisterMBean(module.getServiceName()); registerMBean(module.getServiceName(), moduleServiceObject); + } } + } /** @@ -157,7 +161,7 @@ * @param serviceName * @param serviceObject */ - protected void registerMBean(String serviceName, Object serviceObject) throws Exception + protected void unregisterMBean(String serviceName) throws Exception { //does nothing } @@ -167,7 +171,7 @@ * @param serviceName * @param serviceObject */ - protected void unregisterMBean(String serviceName) throws Exception + protected void registerMBean(String serviceName, Object serviceObject) throws Exception { //does nothing } @@ -178,7 +182,7 @@ */ protected ServiceJNDIBinder getServiceJNDIBinder() throws Exception { - return null; + return null; } public IdentityContext getIdentityContext() Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -25,6 +25,7 @@ import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.p3p.P3PConstants; import org.jboss.portal.identity.ProfileMap; +import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.db.ProfileMapImpl; import java.util.Map; @@ -216,7 +217,7 @@ this.familyName = familyName; } - public void updatePassword(String password) + public void updatePassword(String password) throws IdentityException { this.password = Tools.md5AsHexString(password); } @@ -400,7 +401,7 @@ Object object = toObject((String)value); field.set(instance, object); - + } else { @@ -550,7 +551,7 @@ catch (ParseException e) { throw new IllegalArgumentException("Can't convert the date in the user profile. value=[" + value + "].", e); - } + } } protected String toString(Object value) Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/HibernateUserProfileModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -162,6 +162,7 @@ { dbUser.getProfileMap().remove(propertyName); } + fireUserProfileChangedEvent(user.getId(), user.getUserName(), propertyName); } public Map getProperties(User user) throws IdentityException Added: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event/UserProfileChangedEvent.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event/UserProfileChangedEvent.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event/UserProfileChangedEvent.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -0,0 +1,79 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.identity.event; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public class UserProfileChangedEvent extends IdentityEvent +{ + + /** . */ + private final Object userId; + + /** . */ + private final String userName; + + /** . */ + private final String propertyName; + + public UserProfileChangedEvent(Object userId, String userName, String propertyName) + { + if (userId == null) + { + throw new IllegalArgumentException(); + } + if (userName == null) + { + throw new IllegalArgumentException(); + } + if (propertyName == null) + { + throw new IllegalArgumentException(); + } + this.userId = userId; + this.userName = userName; + this.propertyName = propertyName; + } + + public Object getUserId() + { + return userId; + } + + public String getUserName() + { + return userName; + } + + public String getPropertyName() + { + return propertyName; + } + + public String toString() + { + return "UserProfileChangedEvent[userId=" + userId + ",userName=" + userName + ",propertyName=" + propertyName + "]"; + } +} \ No newline at end of file Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPConnectionContext.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPConnectionContext.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPConnectionContext.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -110,27 +110,31 @@ env.put(CONNECTION_POOL, "true"); if (getPoolingDebug() != null) { - env.put(CONNECTION_POOL_DEBUG, getPoolingDebug()); + System.setProperty(CONNECTION_POOL_DEBUG, getPoolingDebug()); } if (getPoolingInitsize() != null) { - env.put(CONNECTION_POOL_INITSIZE, getPoolingInitsize()); + System.setProperty(CONNECTION_POOL_INITSIZE, getPoolingInitsize()); } if (getPoolingMaxsize() != null) { - env.put(CONNECTION_POOL_MAXSIZE, getPoolingMaxsize()); + System.setProperty(CONNECTION_POOL_MAXSIZE, getPoolingMaxsize()); } if (getPoolingPrefsize() != null) { - env.put(CONNECTION_POOL_PREFSIZE, getPoolingPrefsize()); + System.setProperty(CONNECTION_POOL_PREFSIZE, getPoolingPrefsize()); } if (getPoolingProtocol() != null) { - env.put(CONNECTION_POOL_PROTOCOL, getPoolingProtocol()); + System.setProperty(CONNECTION_POOL_PROTOCOL, getPoolingProtocol()); } + else + { + System.setProperty(CONNECTION_POOL_PROTOCOL, "plain ssl"); + } if (getPoolingTimeout() != null) { - env.put(CONNECTION_POOL_TIMEOUT, getPoolingTimeout()); + System.setProperty(CONNECTION_POOL_TIMEOUT, getPoolingTimeout()); } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtRoleModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -28,6 +28,7 @@ import org.jboss.portal.identity.Role; import javax.naming.NamingException; +import javax.naming.NamingEnumeration; import javax.naming.directory.DirContext; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; @@ -210,6 +211,7 @@ { LdapContext ldapContext = getConnectionContext().createInitialContext(); + NamingEnumeration results = null; try { @@ -236,7 +238,7 @@ if (roleCtxs.size() == 1) { - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(getRoleCtxDN(), filter, controls); @@ -256,7 +258,7 @@ for (Iterator iterator = roleCtxs.iterator(); iterator.hasNext();) { String roleCtx = (String)iterator.next(); - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(roleCtx, filter, controls); @@ -266,6 +268,7 @@ results = ldapContext.search(roleCtx, filter, filterArgs, controls); } merged.addAll(Tools.toList(results)); + results.close(); } return merged; @@ -273,6 +276,10 @@ } finally { + if (results != null) + { + results.close(); + } ldapContext.close(); } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -30,6 +30,7 @@ import javax.naming.Context; import javax.naming.NamingException; +import javax.naming.NamingEnumeration; import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; @@ -104,7 +105,6 @@ throw new IdentityException("Failed to close LDAP connection", e); } } - throw new NoSuchUserException("No user found with name: " + userName); } @@ -156,8 +156,6 @@ filter = "*" + filter + "*"; } - Enumeration results = null; - String ldap_filter = getUserSearchFilter(); //* chars are escaped in filterArgs so we must replace it manually @@ -238,6 +236,7 @@ { LdapContext ldapContext = getConnectionContext().createInitialContext(); + NamingEnumeration results = null; try { @@ -261,7 +260,6 @@ if (userCtxs.size() == 1) { - Enumeration results = null; if (filterArgs == null) { results = ldapContext.search(getUserSearchCtxDN(), filter, controls); @@ -281,7 +279,6 @@ for (Iterator iterator = userCtxs.iterator(); iterator.hasNext();) { String userCtx = (String)iterator.next(); - Enumeration results = null; if (filterArgs == null) { results = ldapContext.search(userCtx, filter, controls); @@ -291,6 +288,7 @@ results = ldapContext.search(userCtx, filter, filterArgs, controls); } merged.addAll(Tools.toList(results)); + results.close(); } return merged; @@ -298,6 +296,10 @@ } finally { + if (results != null) + { + results.close(); + } ldapContext.close(); } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModule.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModule.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModule.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -104,7 +104,7 @@ - protected LDAPRoleImpl createRoleInstance(Attributes attrs, String dn) throws IdentityException + public LDAPRoleImpl createRoleInstance(Attributes attrs, String dn) throws IdentityException { LDAPRoleImpl ldapr = null; try Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPRoleModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -328,7 +328,7 @@ { LdapContext ldapContext = getConnectionContext().createInitialContext(); - + NamingEnumeration results = null; try { SearchControls controls = new SearchControls(); @@ -339,7 +339,7 @@ filter = filter.replaceAll("\\\\", "\\\\\\\\"); log.debug("Search filter: " + filter); - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(getContainerDN(), filter, controls); @@ -352,6 +352,10 @@ } finally { + if (results != null) + { + results.close(); + } ldapContext.close(); } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -100,7 +100,7 @@ this.identityContext = context; //this.realEmail = email; this.id = id; - + } public boolean equals(Object obj) @@ -124,7 +124,7 @@ return id.hashCode()*13 + 5; } - public void updatePassword(String password) + public void updatePassword(String password) throws IdentityException { if (password == null) { @@ -137,6 +137,7 @@ catch (IdentityException e) { log.debug("Password update failure: " + e); + throw new IdentityException("Password update failure: " + e); } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModule.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -199,8 +199,16 @@ //make DN as user ID ldapu = new LDAPUserImpl(dn,getIdentityContext(), dn); - ldapu.setUserName(uida.get().toString()); + if (isUserNameToLowerCase()) + { + ldapu.setUserName(uida.get().toString().toLowerCase()); + } + else + { + ldapu.setUserName(uida.get().toString()); + } + log.debug("user uid: " + ldapu.getId()); log.debug("user dn: " + ldapu.getDn()); @@ -415,7 +423,16 @@ return Boolean.FALSE.booleanValue(); } + protected boolean isUserNameToLowerCase() + { + String userNameToLowerCase = getIdentityConfiguration().getValue(IdentityConfiguration.USER_USER_NAME_TO_LOWER_CASE); + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) + { + return Boolean.TRUE.booleanValue(); + } + return Boolean.FALSE.booleanValue(); + } /*protected String getEmailAttributeId() throws IdentityException Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -30,6 +30,7 @@ import javax.naming.NamingException; import javax.naming.Context; +import javax.naming.NamingEnumeration; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.BasicAttribute; @@ -394,10 +395,10 @@ log.debug("Search filter: " + filter); LdapContext ldapContext = getConnectionContext().createInitialContext(); - + NamingEnumeration results = null; try { - Enumeration results = null; + if (filterArgs == null) { results = ldapContext.search(getContainerDN(), filter, controls); @@ -411,7 +412,15 @@ } finally { - ldapContext.close(); + if (results != null) + { + results.close(); + } + if (ldapContext != null) + { + ldapContext.close(); + } + } } Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/LDAPUserProfileModuleImpl.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -214,6 +214,7 @@ attrs.put(attr); ldapContext.modifyAttributes(ldapUser.getDn(), DirContext.REPLACE_ATTRIBUTE,attrs); + fireUserProfileChangedEvent(user.getId(), user.getUserName(), propertyName); } catch (NamingException e) { Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserProfileModuleService.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserProfileModuleService.java 2008-05-26 07:24:48 UTC (rev 10817) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/UserProfileModuleService.java 2008-05-26 08:04:11 UTC (rev 10818) @@ -23,6 +23,9 @@ import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.event.IdentityEvent; +import org.jboss.portal.identity.event.UserProfileChangedEvent; import org.jboss.portal.identity.metadata.profile.info.ProfileInfoSupport; import org.jboss.portal.identity.metadata.config.ConfigurationParser; import org.jboss.portal.identity.info.ProfileInfo; @@ -51,13 +54,13 @@ { if (log.isDebugEnabled()) { - log.debug("Processing profile configuration for the module...."); + log.debug("Processing profile configuration for the module...."); } profileInfo = new ProfileInfoSupport(ConfigurationParser.parseProfileConfiguration(getProfileConfigFile())); } super.start(); - + } // public ProfileInfo getProfileInfo() throws IdentityException @@ -79,5 +82,12 @@ { this.profileConfigFile = profileConfigFile; } + + protected void fireUserProfileChangedEvent(Object userId, String userName, String propertyName) throws IdentityException + { + IdentityEvent event = new UserProfileChangedEvent(userId, userName, propertyName); + getIdentityEventBroadcaster().fireEvent(event); + } + }

18 years

1
0
0 / 0

JBoss Portal SVN: r10817 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/aspects/server and 9 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-26 03:24:48 -0400 (Mon, 26 May 2008) New Revision: 10817 Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/login-config.xml Log: Syncing changes from 2.6 branch Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -30,7 +30,6 @@ import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.identity.IdentityConfiguration; -import org.jboss.portal.identity.IdentityContext; import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.MembershipModule; import org.jboss.portal.identity.Role; @@ -42,11 +41,16 @@ import org.jboss.portal.security.spi.provider.PermissionFactory; import org.jboss.portal.security.spi.provider.PermissionRepository; import org.jboss.portal.security.spi.provider.SecurityConfigurationException; +import org.jboss.portal.security.impl.jacc.JACCPortalPrincipal; +import javax.security.auth.Subject; +import javax.security.jacc.PolicyContext; +import javax.security.jacc.PolicyContextException; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import java.security.Principal; /** * Created on : Jan 23, 2007 @@ -61,9 +65,11 @@ private MembershipModule membershipModule = null; private UserModule userModule = null; - + private String cmsRootUserName = null; + private User adminUser = null; + /** * */ @@ -110,9 +116,9 @@ { return this.getClass().getName(); } - + /** - * + * * @return */ public String getCmsRootUserName() @@ -121,7 +127,7 @@ } /** - * + * * @param cmsRootUserName */ public void setCmsRootUserName(String cmsRootUserName) @@ -207,33 +213,40 @@ return permissions; } - + /** - * + * */ public User getRoot() { - Session session = Tools.getOpenSession(); - Transaction tx = session.beginTransaction(); - try + + if (adminUser == null) { - User cmsRoot = this.userModule.findUserByUserName(this.cmsRootUserName); - tx.commit(); - return cmsRoot; + Session session = Tools.getOpenSession(); + Transaction tx = session.beginTransaction(); + try + { + adminUser = this.userModule.findUserByUserName(this.cmsRootUserName); + tx.commit(); + } + catch(Exception e) + { + tx.rollback(); + throw new RuntimeException(e); + } + finally + { + Tools.closeSession(session); + } } - catch(Exception e) - { - tx.rollback(); - throw new RuntimeException(e); - } - finally - { - Tools.closeSession(session); - } + + return adminUser; + + } - + /** - * + * * @return */ public String getDefaultAdminRole() @@ -241,11 +254,11 @@ try { String defaultAdminRole = null; - + IdentityConfiguration configuration = (IdentityConfiguration)this.identityServiceController.getIdentityContext(). getObject(IdentityContext.TYPE_IDENTITY_CONFIGURATION); defaultAdminRole = configuration.getValue(IdentityConfiguration.ROLE_DEFAULT_ADMIN_ROLE); - + return defaultAdminRole; } catch(IdentityException ie) @@ -435,17 +448,21 @@ } else { + + // in the case of LDAP use the IdentityModule // now find permissions for all the roles that this user belongs to - Set belongedRoles = this.membershipModule.getRoles(this.userModule - .findUserByUserName(userId)); + //Set belongedRoles = this.membershipModule.getRoles(this.userModule + // .findUserByUserName(userId)); + + Set belongedRoles = getCurrentRoles(); + if (belongedRoles != null) { for (Iterator itr = belongedRoles.iterator(); itr.hasNext();) { - Role role = (Role)itr.next(); - Collection rolePermissions = this.findPermissionsByRole(role - .getName()); + String role = (String)itr.next(); + Collection rolePermissions = this.findPermissionsByRole(role); if (rolePermissions != null && !rolePermissions.isEmpty()) { permissions.addAll(rolePermissions); @@ -453,7 +470,7 @@ } } } - + tx.commit(); return permissions; @@ -490,7 +507,7 @@ roleQuery.setString(0, roleId); roleQuery.setCacheable(true); permissions.addAll(roleQuery.list()); - + tx.commit(); } catch (Exception e) @@ -528,7 +545,7 @@ criteriaQuery.setString(1, criteria.getValue()); criteriaQuery.setCacheable(true); permissions.addAll(criteriaQuery.list()); - + tx.commit(); } catch (Exception e) @@ -543,4 +560,39 @@ return permissions; } + + private Set getCurrentRoles() throws PolicyContextException + { + Set<String> roles = new HashSet<String>(); + + // Get the current authenticated subject through the JACC contract + Subject subject = (Subject)PolicyContext.getContext("javax.security.auth.Subject.container"); + + if (subject != null) + { + Set tmp = subject.getPrincipals(JACCPortalPrincipal.class); + JACCPortalPrincipal pp = null; + for (Iterator i = tmp.iterator(); i.hasNext();) + { + pp = (JACCPortalPrincipal)i.next(); + if (pp != null) + { + break; + } + } + if (pp == null) + { + pp = new JACCPortalPrincipal(subject); + tmp.add(pp); + + // Lazy create all the permission containers for the given role names + for (Iterator i = pp.getRoles().iterator(); i.hasNext();) + { + Principal role = (Principal)i.next(); + roles.add(role.getName()); + } + } + } + return roles; + } } Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -0,0 +1,88 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.aspects.server; + +import org.jboss.portal.core.identity.cache.IdentityCacheService; +import org.jboss.portal.server.ServerInterceptor; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class IdentityCacheInterceptor extends ServerInterceptor +{ + + /** Our logger. */ + private static final Logger log = Logger.getLogger(IdentityCacheInterceptor.class); + + private IdentityCacheService identityCacheService; + + public IdentityCacheService getIdentityCacheService() + { + if (identityCacheService == null) + { + try + { + identityCacheService = (IdentityCacheService)new InitialContext().lookup(IdentityCacheService.JNDI_NAME); + } + catch (NamingException e) + { + log.debug("Could not obtain IdentityCacheService. Setting empty wrapper"); + identityCacheService = new EmptyIdentityCache(); + } + } + return identityCacheService; + } + + protected void invoke(ServerInvocation invocation) throws Exception, InvocationException + { + + try + { + invocation.invokeNext(); + } + finally + { + IdentityCacheService cache = getIdentityCacheService(); + if (cache != null) + { + cache.cleanup(); + } + } + + } + + private class EmptyIdentityCache extends IdentityCacheService + { + public void cleanup() + { + // Do nothing + } + } +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -0,0 +1,161 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.ldap.LDAPRoleModule; +import org.jboss.portal.identity.ldap.LDAPRoleImpl; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.IdentityException; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import java.util.Set; +import java.util.List; +import java.util.HashSet; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CachedLDAPRoleModuleWrapper extends LDAPRoleModule implements RoleModule +{ + private LDAPRoleModule ldapRoleModule; + + private IdentityCacheService cacheService; + + public CachedLDAPRoleModuleWrapper(LDAPRoleModule ldapRoleModule, IdentityCacheService cacheService) + { + this.ldapRoleModule = ldapRoleModule; + this.cacheService = cacheService; + } + + public Role findRoleByName(String name) throws IdentityException, IllegalArgumentException + { + Role role = cacheService.findRoleByName(name); + + if (role != null) + { + return role; + } + + return ldapRoleModule.findRoleByName(name); + } + + public Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException + { + + //Check if all roles needed are in cache. If not just delegate to the wrapped module + Set roles = new HashSet(); + + for (String name : names) + { + Role role = cacheService.findRoleByName(name); + if (role != null) + { + roles.add(role); + } + else + { + roles = ldapRoleModule.findRolesByNames(names); + break; + } + } + + return roles; + } + + public Role findRoleById(Object id) throws IdentityException, IllegalArgumentException + { + Role role = cacheService.findRoleById(id); + + if (role != null) + { + return role; + } + + return ldapRoleModule.findRoleById(id); + } + + public Role findRoleById(String id) throws IdentityException, IllegalArgumentException + { + return this.findRoleById((Object)id); + } + + public Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException + { + Role role = ldapRoleModule.createRole(name, displayName); + + cacheService.storeRole(role); + + return role; + } + + public void removeRole(Object id) throws IdentityException, IllegalArgumentException + { + ldapRoleModule.removeRole(id); + + // Invalidate this role in cache + Role role = cacheService.findRoleById(id); + if (role != null) + { + cacheService.invalidateRole(role); + } + } + + public int getRolesCount() throws IdentityException + { + return ldapRoleModule.getRolesCount(); + } + + public Set findRoles() throws IdentityException + { + return ldapRoleModule.findRoles(); + } + + public List searchRoles(String filter, Object[] filterArgs) throws NamingException, IdentityException + { + return ldapRoleModule.searchRoles(filter, filterArgs); + } + + // Methods of LDAPRoleModule - need to delegate for compatibility + + public void updateDisplayName(LDAPRoleImpl ldapr, String name) throws IdentityException + { + ldapRoleModule.updateDisplayName(ldapr, name); + + cacheService.invalidateRole(ldapr); + } + + public LDAPRoleImpl createRoleInstance(Attributes attrs, String dn) throws IdentityException + { + return ldapRoleModule.createRoleInstance(attrs, dn); + } + + public Role findRoleByDN(String dn) throws IdentityException, IllegalArgumentException + { + return ldapRoleModule.findRoleByDN(dn); + } + + +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -0,0 +1,168 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.UserModule; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.NoSuchUserException; +import org.jboss.portal.identity.IdentityContext; +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.ldap.LDAPUserModule; +import org.jboss.portal.identity.ldap.LDAPUserImpl; +import org.jboss.portal.identity.ldap.LDAPConnectionContext; +import org.jboss.portal.identity.service.IdentityModuleService; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import java.util.Set; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CachedLDAPUserModuleWrapper extends LDAPUserModule implements UserModule +{ + private LDAPUserModule userModule; + + private IdentityCacheService cacheService; + + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(CachedLDAPUserModuleWrapper.class); + + public CachedLDAPUserModuleWrapper(LDAPUserModule userModule, IdentityCacheService cacheService) + { + this.userModule = userModule; + this.cacheService = cacheService; + } + + + public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + if (userName == null) + { + throw new IllegalArgumentException("UserName cannot be null"); + } + + User user = cacheService.findUserByUserName(userName); + + if (user != null) + { + return user; + } + + user = userModule.findUserByUserName(userName); + + cacheService.storeUser(user); + + return user; + } + + public User findUserById(Object id) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + if (id == null) + { + throw new IllegalArgumentException("User id cannot be null"); + } + + User user = cacheService.findUserById(id); + + if (user != null) + { + return user; + } + + user = userModule.findUserById(id); + + cacheService.storeUser(user); + + return user; + } + + public User findUserById(String id) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + return findUserById((Object)id); + } + + public User createUser(String userName, String password) throws IdentityException, IllegalArgumentException + { + return userModule.createUser(userName, password); + } + + public void removeUser(Object id) throws IdentityException, IllegalArgumentException + { + userModule.removeUser(id); + + // Invalidate this user in cache + User user = cacheService.findUserById(id); + if (user != null) + { + cacheService.invalidateUser(user); + } + } + + public Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException + { + return userModule.findUsers(offset, limit); + } + + public Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException + { + return userModule.findUsersFilteredByUserName(filter, offset, limit); + } + + public int getUserCount() throws IdentityException, IllegalArgumentException + { + return userModule.getUserCount(); + } + + public List searchUsers(String filter, Object[] filterArgs) throws NamingException, IdentityException + { + return userModule.searchUsers(filter, filterArgs); + } + + public void updatePassword(LDAPUserImpl ldapu, String password) throws IdentityException + { + userModule.updatePassword(ldapu, password); + } + + public boolean validatePassword(LDAPUserImpl ldapu, String password) throws IdentityException + { + return userModule.validatePassword(ldapu, password); + } + + // Methods of LDAPUserModule - need to delegate for compatibility + public LDAPUserImpl createUserInstance(Attributes attrs, String dn) throws IdentityException + { + return userModule.createUserInstance(attrs, dn); + } + + public User findUserByDN(String dn) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + return userModule.findUserByDN(dn); + } + + +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -0,0 +1,95 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.info.ProfileInfo; +import org.jboss.logging.Logger; + +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CachedUserProfileModuleWrapper implements UserProfileModule +{ + + private static final Logger log = Logger.getLogger(CachedUserProfileModuleWrapper.class); + + private UserProfileModule userProfileModule; + + private IdentityCacheService cacheService; + + public CachedUserProfileModuleWrapper(UserProfileModule userProfileModule, IdentityCacheService identityCacheService) + { + this.userProfileModule = userProfileModule; + this.cacheService = identityCacheService; + } + + public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException + { + // Just grab the whole profile and check if this property is there + + Map profile = this.getProperties(user); + + if (profile != null && profile.containsKey(propertyName)) + { + + return profile.get(propertyName); + } + + // else delegate to the wrapped implementation + + return userProfileModule.getProperty(user, propertyName); + + } + + public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException + { + userProfileModule.setProperty(user, name, property); + cacheService.invalidateProfile(user); + + } + + public Map getProperties(User user) throws IdentityException, IllegalArgumentException + { + Map profile = cacheService.findUserProfileById(user.getId()); + + if (profile != null) + { + return profile; + } + + profile = userProfileModule.getProperties(user); + cacheService.storeProfile(user, profile); + return profile; + } + + public ProfileInfo getProfileInfo() throws IdentityException + { + return userProfileModule.getProfileInfo(); + } +} Added: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -0,0 +1,258 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.Role; + +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class IdentityCacheService +{ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(IdentityCacheService.class); + + public final static String JNDI_NAME = "java:portal/IdentityCacheService"; + + protected ThreadLocal<Map<String, User>> userNameCache = new ThreadLocal<Map<String, User>>(); + + protected ThreadLocal<Map<Object, User>> userIdCache = new ThreadLocal<Map<Object, User>>(); + + protected ThreadLocal<Map<Object, Map>> profileCache = new ThreadLocal<Map<Object, Map>>(); + + protected ThreadLocal<Map<String, Role>> roleNameCache = new ThreadLocal<Map<String, Role>>(); + + protected ThreadLocal<Map<Object, Role>> roleIdCache = new ThreadLocal<Map<Object, Role>>(); + + + public void cleanup() + { + userNameCache.set(null); + userIdCache.set(null); + profileCache.set(null); + roleNameCache.set(null); + roleIdCache.set(null); + + log.debug("Identity cache invalidated"); + } + + private Map<String, User> getUserNameCache() + { + if (userNameCache.get() == null) + { + userNameCache.set(new HashMap<String, User>()); + } + return userNameCache.get(); + } + + private Map<Object, User> getUserIdCache() + { + if (userIdCache.get() == null) + { + userIdCache.set(new HashMap<Object, User>()); + } + return userIdCache.get(); + } + + private Map<Object, Map> getProfileCache() + { + if (profileCache.get() == null) + { + profileCache.set(new HashMap<Object, Map>()); + } + return profileCache.get(); + } + + private Map<String, Role> getRoleNameCache() + { + if (roleNameCache.get() == null) + { + roleNameCache.set(new HashMap<String, Role>()); + } + return roleNameCache.get(); + } + + private Map<Object, Role> getRoleIdCache() + { + if (roleIdCache.get() == null) + { + roleIdCache.set(new HashMap<Object, Role>()); + } + return roleIdCache.get(); + } + + public void storeUser(User user) + { + // We want to be transparent so just ignore null argument + if (user != null) + { + getUserIdCache().put(user.getId(), user); + getUserNameCache().put(user.getUserName(), user); + + if (log.isDebugEnabled()) + { + log.debug("User cached for id=" + user.getId() + "; username=" + user.getUserName()); + } + } + } + + public void invalidateUser(User user) + { + // We want to be transparent so just ignore null argument + if (user != null) + { + getUserIdCache().put(user.getId(), null); + getUserNameCache().put(user.getUserName(), null); + + if (log.isDebugEnabled()) + { + log.debug("User invalidated in cache for id=" + user.getId() + "; username=" + user.getUserName()); + } + } + } + + public void storeProfile(User user, Map profile) + { + // We want to be transparent so just ignore null argument + if (user != null && profile != null) + { + getProfileCache().put(user.getId(), profile); + + if (log.isDebugEnabled()) + { + log.debug("User profile cached for id=" + user.getId()); + } + } + } + + + public void invalidateProfile(User user) + { + // We want to be transparent so just ignore null argument + if (user != null) + { + getProfileCache().put(user.getId(), null); + + if (log.isDebugEnabled()) + { + log.debug("User profile invalidated in cache for id=" + user.getId()); + } + } + } + + public void storeRole(Role role) + { + // We want to be transparent so just ignore null argument + if (role != null) + { + getRoleIdCache().put(role.getId(), role); + getRoleNameCache().put(role.getName(), role); + + if (log.isDebugEnabled()) + { + log.debug("Role cached for id=" + role.getId() + "; name=" + role.getName()); + } + } + } + + public void invalidateRole(Role role) + { + // We want to be transparent so just ignore null argument + if (role != null) + { + getRoleIdCache().put(role.getId(), null); + getRoleNameCache().put(role.getName(), null); + + if (log.isDebugEnabled()) + { + log.debug("Role invalidated in cache for id=" + role.getId() + "; name=" + role.getName()); + } + } + } + + public User findUserByUserName(String userName) + { + User user = getUserNameCache().get(userName); + + if (user != null && log.isDebugEnabled()) + { + log.debug("User retreived from cache for username=" + user.getUserName()); + } + + return user; + } + + public User findUserById(Object id) + { + User user = getUserIdCache().get(id); + + if (user != null && log.isDebugEnabled()) + { + log.debug("User retreived from cache for id=" + user.getId()); + } + + return user; + } + + public Map findUserProfileById(Object id) + { + Map profile = getProfileCache().get(id); + + if (profile != null && log.isDebugEnabled()) + { + log.debug("User profile retreived from cache for user id=" + id); + } + + return profile; + } + + public Role findRoleByName(String roleName) + { + Role role = getRoleNameCache().get(roleName); + + if (role != null && log.isDebugEnabled()) + { + log.debug("Role retreived from cache for name=" + role.getName()); + } + + return role; + } + + public Role findRoleById(Object id) + { + Role role = getRoleIdCache().get(id); + + if (role != null && log.isDebugEnabled()) + { + log.debug("Role retreived from cache for id=" + role.getId()); + } + + return role; + } + + +} Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -30,16 +30,31 @@ import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.identity.ServiceJNDIBinder; +import org.jboss.portal.identity.UserModule; +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.DelegatingUserProfileModuleImpl; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.ldap.LDAPUserModule; +import org.jboss.portal.identity.ldap.LDAPUserProfileModule; +import org.jboss.portal.identity.ldap.LDAPRoleModule; import org.jboss.portal.identity.boot.IdentityServiceLoader; import org.jboss.portal.identity.event.IdentityEvent; import org.jboss.portal.identity.event.IdentityEventBroadcaster; import org.jboss.portal.identity.metadata.service.IdentityServicesMetaData; +import org.jboss.portal.identity.metadata.service.ModuleServiceMetaData; +import org.jboss.portal.identity.metadata.config.ModuleMetaData; import org.jboss.portal.identity.service.IdentityConfigurationService; +import org.jboss.portal.identity.service.UserProfileModuleService; import org.jboss.portal.jems.as.JNDI; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.jems.as.system.JBossServiceModelMBean; +import org.jboss.portal.core.identity.cache.CachedLDAPUserModuleWrapper; +import org.jboss.portal.core.identity.cache.IdentityCacheService; +import org.jboss.portal.core.identity.cache.CachedUserProfileModuleWrapper; +import org.jboss.portal.core.identity.cache.CachedLDAPRoleModuleWrapper; import javax.management.ObjectName; +import java.util.List; /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> @@ -64,6 +79,8 @@ private IdentityEventBroadcaster identityEventBroadcaster; + private boolean ldapIdentityCache = true; + /** . */ protected Kernel kernel; @@ -154,6 +171,209 @@ serviceLoader.bootstrapModules(servicesMetaData.getModuleServices().getModulesList()); + UserModule userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE); + + RoleModule roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); + + UserProfileModule userProfileModule = (UserProfileModule)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE); + + + // For performance reasons we inject a wrapper around some identity modules to cache the calls. This is optional + // and apply only to LDAP implementation of modules. Cache is request scoped and invalidated in server interceptor + // IdentityCacheInterceptor + + if (isLdapIdentityCache()) + { + ServiceJNDIBinder binder = new SimpleServiceJNDIBinder(); + + IdentityCacheService cacheService = new IdentityCacheService(); + + binder.bind(IdentityCacheService.JNDI_NAME, cacheService); + + List modules = servicesMetaData.getModuleServices().getModulesList(); + + if (userModule instanceof LDAPUserModule) + { + LDAPUserModule ldapUserModule = (LDAPUserModule)userModule; + + // Unregister in IdentityContext + + identityContext.unregister(IdentityContext.TYPE_USER_MODULE); + + // Unregister in JNDI + + binder.unbind(ldapUserModule.getJNDIName()); + + // Un/egister mbean + + String serviceName = null; + + // Discover serviceName for this module type + + for (Object moduleData : modules) + { + ModuleServiceMetaData moduleService = (ModuleServiceMetaData)moduleData; + ModuleMetaData module = moduleService.getModuleData(); + + if (module.getType().equals(ldapUserModule.getModuleType())) + { + serviceName = module.getServiceName(); + break; + } + } + + // If we have the service name then follow with registration + + if (serviceName != null) + { + // Unregister + + ObjectName on = new ObjectName(serviceName); + if (getServer().isRegistered(on)) + { + getServer().unregisterMBean(on); + } + } + + + CachedLDAPUserModuleWrapper userModuleWrapper = new CachedLDAPUserModuleWrapper((LDAPUserModule)userModule, cacheService); + + // Register wrapper + identityContext.register(userModuleWrapper, ldapUserModule.getModuleType()); + binder.bind(ldapUserModule.getJNDIName(), userModuleWrapper); + + if (serviceName != null) + { + // Register + + JBossServiceModelMBean mbean = new JBossServiceModelMBean(userModuleWrapper); + getServer().registerMBean(mbean, new ObjectName(serviceName)); + } + + } + + if (roleModule instanceof LDAPRoleModule) + { + LDAPRoleModule ldapRoleModule = (LDAPRoleModule)roleModule; + + // Unregister in IdentityContext + + identityContext.unregister(IdentityContext.TYPE_ROLE_MODULE); + + // Unregister in JNDI + + binder.unbind(ldapRoleModule.getJNDIName()); + + // Un/egister mbean + + String serviceName = null; + + // Discover serviceName for this module type + + for (Object moduleData : modules) + { + ModuleServiceMetaData moduleService = (ModuleServiceMetaData)moduleData; + ModuleMetaData module = moduleService.getModuleData(); + + if (module.getType().equals(ldapRoleModule.getModuleType())) + { + serviceName = module.getServiceName(); + break; + } + } + + // If we have the service name then follow with registration + + if (serviceName != null) + { + // Unregister + + ObjectName on = new ObjectName(serviceName); + if (getServer().isRegistered(on)) + { + getServer().unregisterMBean(on); + } + } + + + CachedLDAPRoleModuleWrapper roleModuleWrapper = new CachedLDAPRoleModuleWrapper((LDAPRoleModule)roleModule, cacheService); + + // Register wrapper + identityContext.register(roleModuleWrapper, ldapRoleModule.getModuleType()); + binder.bind(ldapRoleModule.getJNDIName(), roleModuleWrapper); + + if (serviceName != null) + { + // Register + + JBossServiceModelMBean mbean = new JBossServiceModelMBean(roleModuleWrapper); + getServer().registerMBean(mbean, new ObjectName(serviceName)); + } + + } + + if (userProfileModule instanceof LDAPUserProfileModule || + userProfileModule instanceof DelegatingUserProfileModuleImpl) + { + UserProfileModuleService profileModuleService = (UserProfileModuleService)userProfileModule; + + // Unregister in IdentityContext + + identityContext.unregister(IdentityContext.TYPE_USER_PROFILE_MODULE); + + // Unregister in JNDI + + binder.unbind(profileModuleService.getJNDIName()); + + // Un/egister mbean + + String serviceName = null; + + // Discover serviceName for this module type + + for (Object moduleData : modules) + { + ModuleServiceMetaData moduleService = (ModuleServiceMetaData)moduleData; + ModuleMetaData module = moduleService.getModuleData(); + + if (module.getType().equals(profileModuleService.getModuleType())) + { + serviceName = module.getServiceName(); + break; + } + } + + // If we have the service name then follow with registration + + if (serviceName != null) + { + // Unregister + + ObjectName on = new ObjectName(serviceName); + if (getServer().isRegistered(on)) + { + getServer().unregisterMBean(on); + } + } + + CachedUserProfileModuleWrapper userProfileModuleWrapper = new CachedUserProfileModuleWrapper(userProfileModule, cacheService); + + // Register wrapper + + identityContext.register(userProfileModuleWrapper, profileModuleService.getModuleType()); + binder.bind(profileModuleService.getJNDIName(), userProfileModuleWrapper); + + if (serviceName != null) + { + // Register + + JBossServiceModelMBean mbean = new JBossServiceModelMBean(userProfileModuleWrapper); + getServer().registerMBean(mbean, new ObjectName(serviceName)); + } + + } + } + } catch (Throwable e) { @@ -257,4 +477,14 @@ { this.identityEventBroadcaster = identityEventBroadcaster; } + + public boolean isLdapIdentityCache() + { + return ldapIdentityCache; + } + + public void setLdapIdentityCache(boolean ldapIdentityCache) + { + this.ldapIdentityCache = ldapIdentityCache; + } } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -42,6 +42,7 @@ import org.jboss.portal.core.model.portal.content.WindowRendition; import org.jboss.portal.core.theme.PageRendition; import org.jboss.portal.core.theme.WindowContextFactory; +import org.jboss.portal.core.aspects.server.UserInterceptor; import org.jboss.portal.identity.User; import org.jboss.portal.identity.UserProfileModule; import org.jboss.portal.security.spi.auth.PortalAuthorizationManager; @@ -54,12 +55,14 @@ import org.jboss.portal.theme.page.PageResult; import org.jboss.portal.portlet.controller.PortletControllerContext; import org.jboss.portal.portlet.controller.state.PageNavigationalState; +import org.jboss.portal.server.ServerInvocation; import javax.naming.InitialContext; import javax.naming.NamingException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.Map; /** * Render a full page. @@ -170,8 +173,21 @@ } // - String themeId = (String)userProfileModule.getProperty(user, User.INFO_USER_THEME); + // If its possible use cachec user profile to obtain theme + Map profile = (Map)getContext().getAttribute(ServerInvocation.PRINCIPAL_SCOPE, UserInterceptor.PROFILE_KEY); + + String themeId = null; + + if (profile == null) + { + themeId = (String)userProfileModule.getProperty(user, User.INFO_USER_THEME); + } + else + { + themeId = (String)profile.get(User.INFO_USER_THEME); + } + if (themeId != null) { theme = themeService.getThemeById(themeId); @@ -211,7 +227,7 @@ // We ignore null result objects if (rendition != null) { - // Get the controller response + // Get the controller response ControllerResponse response = rendition.getControllerResponse(); // Null means we skip the window Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-05-26 07:24:48 UTC (rev 10817) @@ -123,6 +123,13 @@ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> </mbean> + <mbean + code="org.jboss.portal.core.aspects.server.IdentityCacheInterceptor" + name="portal:service=Interceptor,type=Server,name=IdentityCache" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" name="portal:service=InterceptorStackFactory,type=Server" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> @@ -130,6 +137,7 @@ <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Server,name=SessionLock</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Server,name=IdentityCache</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=UserEvent</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/ldap_identity-config.xml 2008-05-26 07:24:48 UTC (rev 10817) @@ -26,6 +26,10 @@ "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN" "http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">--> + + + <identity-configuration> <datasources> <datasource> @@ -59,17 +63,19 @@  <type>User</type> <implementation>LDAP</implementation> - <class> +  +  <config/> </module> <module> <type>Role</type> <implementation>LDAP</implementation> - <class> +  +  <config/> </module> <module> @@ -111,19 +117,21 @@ <name>userCtxDN</name> <value>ou=People,o=test,dc=portal,dc=example,dc=com</value> </option> - <option> +  +  <option> <name>roleCtxDN</name> <value>ou=Roles,o=test,dc=portal,dc=example,dc=com</value> </option> - <option> +  +  </option-group> + </options> - </options> </identity-configuration> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/profile-config.xml 2008-05-26 07:24:48 UTC (rev 10817) @@ -334,9 +334,9 @@ <type>dynamic</type> <value>portal.user.homepage</value> </database> - <ldap> - <value>seeAlso</value> - </ldap> +  +  +  </mapping> </property> <property> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/identity/standardidentity-config.xml 2008-05-26 07:24:48 UTC (rev 10817) @@ -25,7 +25,7 @@  @@ -213,7 +213,7 @@ <name>connectionJNDIName</name> <value>java:/portal/LDAPConnectionContext</value> </option> - </config> + </config> </module> <module> @@ -324,22 +324,23 @@ <option> <name>defaultAdminRole</name> <value>Admin</value> - </option> + </option> </option-group> <option-group> <group-name>userCreateAttibutes</group-name> <option> <name>objectClass</name> <value>top</value> - <value>uidObject</value> <value>person</value> - <value>inetUser</value> + <value>inetOrgPerson</value> +  +  </option>  -  + </option> <option> <name>sn</name> <value>none</value> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/login-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/login-config.xml 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/login-config.xml 2008-05-26 07:24:48 UTC (rev 10817) @@ -44,8 +44,8 @@ <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option> <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option> <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option> + <module-option name="validateUserNameCase">true</module-option> <module-option name="additionalRole">Authenticated</module-option> - <module-option name="password-stacking">useFirstPass</module-option> </login-module> <!--Use can use this module instead of IdentityLoginModule to bind to LDAP. It simply extends JBossSX LdapExtLoginModule so Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/common/IdentityUserBean.java 2008-05-26 07:24:48 UTC (rev 10817) @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.ResourceBundle; @@ -36,11 +37,16 @@ import org.jboss.portal.core.identity.services.IdentityConstants; import org.jboss.portal.core.identity.services.metadata.UIComponentConfiguration; import org.jboss.portal.core.identity.ui.IdentityUIUser; +import org.jboss.portal.core.aspects.server.UserInterceptor; +import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.NoSuchUserException; import org.jboss.portal.identity.User; import org.jboss.portal.identity.UserModule; import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossActionRequest; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> @@ -91,18 +97,18 @@ this.metaDataService = metaDataService; } - /** - * converts the dynamic attribute Map to a map for the identity service - UserProfileModule + /* + * converts the dynamic attribute Map to a map concerning the identity service - UserProfileModule */ public Map<String, Object> getProfileMap(Map<String, Object> attributeMap) { Map<String, Object> profileMap = new HashMap<String, Object>(); - + for(String key : attributeMap.keySet()) { Object value = attributeMap.get(key); UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(key).getObject(); - + if ( uiComponent != null) { profileMap.put(uiComponent.getPropertyRef(), value); @@ -110,11 +116,11 @@ } return profileMap; } - + public void updateProfile(User user, Map<String, Object> attributeMap) { Map<String, Object> profileMap = this.getProfileMap(attributeMap); - + for(String key : profileMap.keySet()) { Object value = profileMap.get(key); @@ -161,14 +167,14 @@ public Object getLocalizedValue(String propertyName, Object value) { UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject(); - if( uiComponent.getValues() != null + if( uiComponent.getValues() != null && value instanceof String && uiComponent.getValues().size() > 0) { try { ResourceBundle bundle = ResourceBundle.getBundle("conf.bundles.Identity", FacesContext.getCurrentInstance().getViewRoot().getLocale()); - return bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + ((String)value).toUpperCase()); + return bundle.getString(IdentityConstants.DYNAMIC_VALUE_PREFIX + ((String)value).toUpperCase()); } catch (Exception e) { @@ -177,17 +183,98 @@ } return value; } - - public Class getPropertyType(String propertyName) throws IdentityException, ClassNotFoundException + + public Class getPropertyType(String propertyName) throws IdentityException, ClassNotFoundException { UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject(); return uiComponent.getPropertyClass(); } - + public Object getUserProperty(String username, String propertyName) throws IllegalArgumentException, NoSuchUserException, IdentityException { - User user = this.findUserByUserName(username); + UIComponentConfiguration uiComponent = (UIComponentConfiguration) this.metaDataService.getValue(propertyName).getObject(); - return this.userProfileModule.getProperty(user, uiComponent.getPropertyRef()); + + Map profile = null; + + // Uncomment this to use the cached profile (for now its not invalidated on write) + //profile = getCachedUserProfile(); + + if (profile == null) + { + + // This is to intercept calls to display current user profile and decrease number of calls to identity modules + // Needs to be done in better way + User user = getCurrentUser(); + if (user == null || !user.getUserName().equals(username)) + { + user = this.findUserByUserName(username); + } + + return this.userProfileModule.getProperty(user, uiComponent.getPropertyRef()); + } + + return profile.get(uiComponent.getPropertyRef()); + } + + public User getCurrentUser() + { + Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest(); + + ControllerContext context = null; + + if (request instanceof JBossRenderRequest) + { + JBossRenderRequest renderRequest = (JBossRenderRequest)request; + context = renderRequest.getControllerContext(); + } + else if (request instanceof JBossActionRequest) + { + JBossActionRequest actionRequest = (JBossActionRequest)request; + context = actionRequest.getControllerContext(); + } + + if (context != null) + { + Object user = context.getAttribute(ServerInvocation.PRINCIPAL_SCOPE, UserInterceptor.USER_KEY); + if (user instanceof User) + { + return (User)user; + } + } + + return null; + + } + + public Map getCachedUserProfile() + { + Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest(); + + ControllerContext context = null; + + if (request instanceof JBossRenderRequest) + { + JBossRenderRequest renderRequest = (JBossRenderRequest)request; + context = renderRequest.getControllerContext(); + } + else if (request instanceof JBossActionRequest) + { + JBossActionRequest actionRequest = (JBossActionRequest)request; + context = actionRequest.getControllerContext(); + } + + if (context != null) + { + Object profile = context.getAttribute(ServerInvocation.PRINCIPAL_SCOPE, UserInterceptor.PROFILE_KEY); + if (profile instanceof Map) + { + return (Map)profile; + } + } + + return null; + + } } Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-26 05:42:41 UTC (rev 10816) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-26 07:24:48 UTC (rev 10817) @@ -51,7 +51,7 @@ <name>default-view</name> <value>/WEB-INF/jsf/index.xhtml</value> </init-param> - <expiration-cache>0</expiration-cache> + <expiration-cache>-1</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode>

18 years

1
0
0 / 0

JBoss Portal SVN: r10816 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-26 01:42:41 -0400 (Mon, 26 May 2008) New Revision: 10816 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.4. Handling Errors with JavaServer Pages (JSP) - starting to revise Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-26 05:28:14 UTC (rev 10815) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-26 05:42:41 UTC (rev 10816) @@ -354,32 +354,37 @@ <colspec colname='c3'/> <thead> <row> - <entry align="center">Attribute name</entry> + <entry align="center">Attribute Name</entry> <entry align="center">Attribute Description</entry> - <entry align="center">Attribute value</entry> + <entry align="center">Attribute Value</entry> </row> </thead> <tbody> <row> - <entry align="center">org.jboss.portal.control.ERROR_TYPE</entry> - <entry align="center">The error type</entry> - <entry align="center">The possible values are <emphasis>ACCESS_DENIED</emphasis>, <emphasis>UNAVAILABLE</emphasis>, <emphasis>ERROR</emphasis>, <emphasis>INTERNAL_ERROR</emphasis>, <emphasis>NOT_FOUND</emphasis></entry> + <entry align="center"><computeroutput>org.jboss.portal.control.ERROR_TYPE</computeroutput></entry> + <entry align="center">the error type</entry> + <entry align="center">possible values are <computeroutput>ACCESS_DENIED</computeroutput>, <computeroutput>UNAVAILABLE</computeroutput>, <computeroutput>ERROR</computeroutput>, <computeroutput>INTERNAL_ERROR</computeroutput>, and <computeroutput>NOT_FOUND</computeroutput></entry> </row> <row> - <entry align="center">org.jboss.portal.control.CAUSE</entry> - <entry align="center">The throwable cause that can be null</entry> - <entry align="center">The object is a subclass of java.lang.Throwable</entry> + <entry align="center"><computeroutput>org.jboss.portal.control.CAUSE</computeroutput></entry> + <entry align="center">a cause which is thrown, that can be null</entry> + <entry align="center">the object is a subclass of <computeroutput>java.lang.Throwable</computeroutput></entry> </row> <row> - <entry align="center">org.jboss.portal.control.MESSAGE</entry> - <entry align="center">An error message that can be null</entry> - <entry align="center">Text</entry> + <entry align="center"><computeroutput>org.jboss.portal.control.MESSAGE</computeroutput></entry> + <entry align="center">an error message that can be null</entry> + <entry align="center">text</entry> </row> </tbody> </tgroup> </table> </para> - <note>The JavaServer Pages have to be located in the jboss-portal.sar/portal-core.war Web Application.</note> + <para> + <note> + <title>JSP Location</title> + The JavaServer Pages must be located in the <filename>jboss-portal.sar/portal-core.war/</filename> web application. + </note> + </para> </sect1> <sect1> <title>Configuration using the Portal Management Application</title>

18 years

1
0
0 / 0

JBoss Portal SVN: r10815 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-26 01:28:14 -0400 (Mon, 26 May 2008) New Revision: 10815 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml Log: 8.4. Handling Errors with JavaServer Pages (JSP) - minor revisions Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-25 14:42:48 UTC (rev 10814) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-26 05:28:14 UTC (rev 10815) @@ -333,24 +333,21 @@ </para> <para> <note> + <title>Page property inheritance for objects</title> <para> - You can configure the page properties also on objects of type portal, in that case they will be inherited by the pages - which are located in the portal. - </para> - </note> -</para> - - </sect2> + When page properties are configured for objects that use the <emphasis>portal</emphasis> type, the properties are inherited by pages in that portal. + </para> + </note> + </para> +</sect2> </sect1> <sect1> - <title>Handling errors with JSP</title> - <para>As described above it is possible to redirect error handling to a JavaServer Page. Two pages can be created - to handle errors at portal and page level. Portal level error handling requires a page that will produce a full - page and the page level error handling requires a page that will produce markup for a window only. When the page - is invoked a set of request attributes will be passed.</para> + <title>Handling Errors with JavaServer Pages (JSP)</title> <para> + As described in previous sections, error handling can be redirected to a JSP. Two pages can be created to handle errors, one for the portal level, and the other for the page level. Portal level error-handling requires a page that produces a full page, and page-level handling requires a page that produces markup, but only for a window. When the page is invoked, a set of request attributes are passed. The following table represents request attributes: + </para> + <para> <table frame="all"> - <title>Request attributes</title> <tgroup cols="3" align="left" colsep="1" rowset="1"> <colspec colname='c1'/> <colspec colname='c2'/> Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-05-25 14:42:48 UTC (rev 10814) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-05-26 05:28:14 UTC (rev 10815) @@ -242,6 +242,7 @@ </para> <para> <note> + <title>Markup Fragments</title> <para> Portlets are responsible for generating markup fragments, as they are included on a page and are surrounded by other portlets. In particular, this means that a portlet outputting HTML must

18 years

1
0
0 / 0

JBoss Portal SVN: r10814 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-25 10:42:48 -0400 (Sun, 25 May 2008) New Revision: 10814 Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties Log: updated for italian language Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-24 18:18:40 UTC (rev 10813) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-25 14:42:48 UTC (rev 10814) @@ -25,4 +25,14 @@ PAGENAME_default=Home PAGENAME_Admin=Amministrazione PAGENAME_Test=Test -PAGENAME_News=Novit\u00e0 \ No newline at end of file +PAGENAME_News=Novit\u00e0 + +ACCOUNT_DISABLED=Il tuo account \u00e8 disabilitato +ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=Utente insesistente o password non corretta +ACCOUNT_NOTASSIGNEDTOROLE=L\'utente non ha i giusti permessi + +LOGIN_TITLE=JBoss Portal Login +LOGIN_USERNAME=Nome utente +LOGIN_PASSWORD=Password +LOGIN_CANCEL=Annulla +LOGIN_SUBMIT=Invia \ No newline at end of file

18 years

1
0
0 / 0

JBoss Portal SVN: r10813 - in branches/JBoss_Portal_Branch_2_6: core-identity/src/resources/portal-identity-sar/conf/bundles and 1 other directories.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-24 14:18:40 -0400 (Sat, 24 May 2008) New Revision: 10813 Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties Log: update for italian traslation Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-24 18:17:22 UTC (rev 10812) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-24 18:18:40 UTC (rev 10813) @@ -58,6 +58,7 @@ CMS_CREATEFOLDER= Crea Cartella CMS_CREATEFILE=Crea File CMS_UPLOADARCHIVE=Carica Archivio +CMS_UPLOADARCHIVE_ASYNC=Carica Archivio in modo asincrono CMS_BACKTOBROWSER=Torna al Navigatore delle Directory CMS_TRANSFER=Importa/Esporta CMS_EXPORTARCHIVE=Esporta Cartella @@ -96,4 +97,7 @@ CMS_PATH=Localit\u00e0 CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota . + +CMS_ERROR_UPLOADARCHIVE_ASYNC=Si \u00e8 verificato un errore nell\'aggiornamento dell\'archivio. Riprova attivando la modalit\u00e0 asincrona +CMS_MSG_UPLOADARCHIVE_ASYNC=L\'archivio \u00e8 stato accettato. Le risorse appariranno nella tua cartella una volta terminato il processo \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 18:17:22 UTC (rev 10812) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 18:18:40 UTC (rev 10813) @@ -39,6 +39,7 @@ IDENTITY_REGISTER_SUCCESS_TITLE=Il tuo account \u00e8 stato creato con successo. Puoi ora loggarti. IDENTITY_REGISTER_PENDING_TITLE=Un' e-mail \u00e8 stata mandata al tuo indirizzo e-mail per confermare la registrazione. IDENTITY_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto. +IDENTITY_REGISTER_FAILED=La registrazione \u00e8 fallita per un motivo sconosciuto. IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login? IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password. @@ -47,6 +48,8 @@ IDENTITY_LOST_PASSWORD_STATUS_404=Nessun account trovato. IDENTITY_LOST_PASSWORD_STATUS_TITLE=Password smarrita +IDENTITY_SERVER_ERROR=Errore inaspettato sul Server dell\'identit\u00e0 + IDENTITY_EDIT_PROFILE_ERROR=Errore nell'aggiornamento del profilo. IDENTITY_EDIT_PASSWORD_TITLE=Cambia la password IDENTITY_EDIT_PASSWORD_CURRENT=Password corrente Modified: branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 18:17:22 UTC (rev 10812) +++ branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 18:18:40 UTC (rev 10813) @@ -61,4 +61,4 @@ # Nav continue=Continua back=Indietro -retry=Riprova +retry=Riprova \ No newline at end of file

18 years

1
0
0 / 0

JBoss Portal SVN: r10812 - in branches/JBoss_Portal_Branch_2_7: migration/src/resources/portal-migration-war/WEB-INF/classes and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-24 14:17:22 -0400 (Sat, 24 May 2008) New Revision: 10812 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/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties Log: update for italian traslation 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 2008-05-24 17:24:58 UTC (rev 10811) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2008-05-24 18:17:22 UTC (rev 10812) @@ -39,6 +39,7 @@ IDENTITY_REGISTER_SUCCESS_TITLE=Il tuo account \u00e8 stato creato con successo. Puoi ora loggarti. IDENTITY_REGISTER_PENDING_TITLE=Un' e-mail \u00e8 stata mandata al tuo indirizzo e-mail per confermare la registrazione. IDENTITY_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto. +IDENTITY_REGISTER_FAILED=La registrazione \u00e8 fallita per un motivo sconosciuto. IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login? IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password. @@ -47,6 +48,8 @@ IDENTITY_LOST_PASSWORD_STATUS_404=Nessun account trovato. IDENTITY_LOST_PASSWORD_STATUS_TITLE=Password smarrita +IDENTITY_SERVER_ERROR=Errore inaspettato sul Server dell\'identit\u00e0 + IDENTITY_EDIT_PROFILE_ERROR=Errore nell'aggiornamento del profilo. IDENTITY_EDIT_PASSWORD_TITLE=Cambia la password IDENTITY_EDIT_PASSWORD_CURRENT=Password corrente Modified: branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 17:24:58 UTC (rev 10811) +++ branches/JBoss_Portal_Branch_2_7/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2008-05-24 18:17:22 UTC (rev 10812) @@ -61,4 +61,4 @@ # Nav continue=Continua back=Indietro -retry=Riprova +retry=Riprova \ No newline at end of file

18 years

1
0
0 / 0

JBoss Portal SVN: r10811 - in branches/JBoss_Portal_Branch_2_7/core-samples/src: resources/portal-users-samples-war/WEB-INF and 2 other directories.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-24 13:24:58 -0400 (Sat, 24 May 2008) New Revision: 10811 Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml Log: I add customization and help page for current users portlet. See http://jira.jboss.org/jira/browse/JBPORTAL-2026 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 17:23:43 UTC (rev 10810) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 17:24:58 UTC (rev 10811) @@ -22,6 +22,15 @@ package org.jboss.portal.core.samples.users; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Set; + +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletSecurityException; +import javax.portlet.UnavailableException; + import org.apache.log4j.Logger; import org.jboss.portal.core.identity.UsersActivityStatsService; import org.jboss.portal.core.servlet.jsp.PortalJsp; @@ -30,13 +39,6 @@ import org.jboss.portlet.JBossRenderRequest; import org.jboss.portlet.JBossRenderResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.UnavailableException; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Set; - /** * Read the current users online and write them in output. * @@ -44,51 +46,67 @@ */ public class CurrentUsersPortlet extends JBossPortlet { - /** Logger */ - public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); + /** Logger */ + public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); - protected void doView(JBossRenderRequest rRequest, - JBossRenderResponse rResponse) throws PortletException, - IOException, UnavailableException { - UsersActivityStatsService uass = (UsersActivityStatsService) this - .getPortletContext().getAttribute("UsersActivityStats"); + /** Help page */ + private static final String JSP_HELP = "/WEB-INF/jsp/users/help.jsp"; - rResponse.setContentType("text/html"); - PrintWriter writer = rResponse.getWriter(); + protected void doHelp(JBossRenderRequest request, + JBossRenderResponse response) throws PortletException, + PortletSecurityException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher(JSP_HELP); + dispatcher.include(request, response); + } - long currentTime = System.currentTimeMillis(); + protected void doView(JBossRenderRequest rRequest, + JBossRenderResponse rResponse) throws PortletException, + IOException, UnavailableException { + + String guestNumber = rRequest.getPreferences().getValue("guestNumber",""); + + UsersActivityStatsService uass = (UsersActivityStatsService) this + .getPortletContext().getAttribute("UsersActivityStats"); - // TODO: this is wrong - should pass period instead of current time - - // actually it works by a coincedence... - Set users = uass.getActiveUsersNames(currentTime); + rResponse.setContentType("text/html"); + PrintWriter writer = rResponse.getWriter(); - int sessionCount = uass.getActiveSessionCount(currentTime); + long currentTime = System.currentTimeMillis(); - int allLoggedSessions = uass.getUsersActivities(currentTime).size(); + // TODO: this is wrong - should pass period instead of current time - + // actually it works by a coincedence... + Set users = uass.getActiveUsersNames(currentTime); - if (sessionCount == 1) { - DelegateContext ctx = new DelegateContext(); - ctx.put("USERS", users.toString()); - ctx.put("USERS_COUNT", Integer.toString(sessionCount)); - rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); - PortletRequestDispatcher rd = getPortletContext() - .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); - rd.include(rRequest, rResponse); - } else if (sessionCount > 1) { - DelegateContext ctx = new DelegateContext(); - ctx.put("USERS", users.toString()); - ctx.put("USERS_COUNT", Integer.toString(sessionCount)); - ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); - rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); - PortletRequestDispatcher rd = getPortletContext() - .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); - rd.include(rRequest, rResponse); - } else { - PortletRequestDispatcher rd = getPortletContext() - .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); - rd.include(rRequest, rResponse); - } + int sessionCount = uass.getActiveSessionCount(currentTime); - writer.close(); - } + int allLoggedSessions = uass.getUsersActivities(currentTime).size(); + + if (sessionCount == 1 || (guestNumber.equals("false") && users.size() == 1)) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(sessionCount)); + ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); + rd.include(rRequest, rResponse); + } else if (sessionCount > 1) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(sessionCount)); + ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); + rd.include(rRequest, rResponse); + } else { + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); + rd.include(rRequest, rResponse); + } + + writer.close(); + } } Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 17:23:43 UTC (rev 10810) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 17:24:58 UTC (rev 10811) @@ -21,12 +21,17 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -NO_USERS_ONLINE=No logged-in user +NO_USERS_ONLINE=No online user ONE_USER_ONLINE_0=There is <b> -ONE_USER_ONLINE_1=</b> logged-in user: +ONE_USER_ONLINE_1=</b> online user +ONE_USER_LOGGED_1=</b> logged user ONE_USER_IS_0=<b> ONE_USER_IS_1=</b> USERS_ONLINE_0=There are <b> -USERS_ONLINE_1=</b> logged-in users: +USERS_ONLINE_1=</b> online users +USERS_LOGGED_1=</b> logged users USERS_ARE_0=<b> -USERS_ARE_1=</b> \ No newline at end of file +USERS_ARE_1=</b> +USERS_WHICH_0=Whose <b> +USERS_WHICH_1=</b> are logged-in: +USERS_WHICH_2=</b> is logged-in: \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 17:23:43 UTC (rev 10810) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 17:24:58 UTC (rev 10811) @@ -23,10 +23,15 @@ NO_USERS_ONLINE=Nessun utente \u00e8 online ONE_USER_ONLINE_0=Al momento c'\u00e8 <b> -ONE_USER_ONLINE_1=</b> utente online: +ONE_USER_ONLINE_1=</b> utente online +ONE_USER_LOGGED_1=</b> utente loggato ONE_USER_IS_0=<b> ONE_USER_IS_1=</b> USERS_ONLINE_0=Al momento ci sono <b> -USERS_ONLINE_1=</b> utenti online: +USERS_ONLINE_1=</b> utenti online +USERS_LOGGED_1=</b> utenti loggati USERS_ARE_0=<b> -USERS_ARE_1=</b> \ No newline at end of file +USERS_ARE_1=</b> +USERS_WHICH_0=Di cui <b> +USERS_WHICH_1=</b> sono loggati: +USERS_WHICH_2=</b> \u00e8 loggato: \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp 2008-05-24 17:24:58 UTC (rev 10811) @@ -0,0 +1,41 @@ +<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> + +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%> + +<portlet:defineObjects /> + +<div class="portlet-font" style="font-size: larger; font-weight: bold">Current +Users Portlet Help:</div> +</div> +<br /> +<div class="portlet-font">Description: The Current users Portlet +shows current users actually connected. You can to see both guest and +logged users number and to see which users are logged.</div> +<br /> +<div class="portlet-font">You can to manage what to show to users. +You can to choose paragraphes to show, clicking the checkboxes</div> +<br /> +<br /> +<div class="portlet-font"><a + href="<portlet:renderURL portletMode='view'/>">Back</a></div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 17:23:43 UTC (rev 10810) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 17:24:58 UTC (rev 10811) @@ -32,13 +32,34 @@ <tr> <td colspan="1"> <span class="portlet-text"> + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> ${n:i18n("ONE_USER_ONLINE_0")} ${n:out("USERS_COUNT")} - ${n:i18n("ONE_USER_ONLINE_1")} + ${n:i18n("ONE_USER_ONLINE_1")} <br/><br/> + <% } + java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get(); + org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext = + ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext(); + if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %> + + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> + ${n:i18n("USERS_WHICH_0")} + ${n:out("USERS_LOGGED_COUNT")} + ${n:i18n("USERS_WHICH_2")} + <% } else { %> + ${n:i18n("ONE_USER_ONLINE_0")} + ${n:out("USERS_LOGGED_COUNT")} + ${n:i18n("ONE_USER_LOGGED_1")} + <% } %> + <br/><br/> + <% } + if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %> + ${n:i18n("ONE_USER_IS_0")} ${n:out("USERS")} ${n:i18n("ONE_USER_IS_1")} + <% } %> </span> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 17:23:43 UTC (rev 10810) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 17:24:58 UTC (rev 10811) @@ -32,13 +32,38 @@ <tr> <td colspan="1"> <span class="portlet-text"> + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> ${n:i18n("USERS_ONLINE_0")} ${n:out("USERS_COUNT")} - ${n:i18n("USERS_ONLINE_1")} + ${n:i18n("USERS_ONLINE_1")} + <br/><br/> + <% } + java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get(); + org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext = + ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext(); + if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %> + + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> + ${n:i18n("USERS_WHICH_0")} + ${n:out("USERS_LOGGED_COUNT")} + <% if (!currentContext.get("USERS_LOGGED_COUNT").equals("1")) { %> + ${n:i18n("USERS_WHICH_1")} + <% } else { %> + ${n:i18n("USERS_WHICH_2")} + <% } %> + <% } else { %> + ${n:i18n("USERS_ONLINE_0")} + ${n:out("USERS_LOGGED_COUNT")} + ${n:i18n("USERS_LOGGED_1")} + <% } %> <br/><br/> + <% } + if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %> + ${n:i18n("USERS_ARE_0")} ${n:out("USERS")} - ${n:i18n("USERS_ARE_1")} + ${n:i18n("USERS_ARE_1")} + <% } %> </span> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 17:23:43 UTC (rev 10810) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 17:24:58 UTC (rev 10811) @@ -44,5 +44,19 @@ <title>Current users</title> <keywords>sample,test</keywords> </portlet-info> + <portlet-preferences> + <preference> + <name>guestNumber</name> + <value>true</value> + </preference> + <preference> + <name>loggedNumber</name> + <value>true</value> + </preference> + <preference> + <name>loggedUsers</name> + <value>true</value> + </preference> + </portlet-preferences> </portlet> </portlet-app>

18 years

1
0
0 / 0

JBoss Portal SVN: r10810 - in branches/JBoss_Portal_Branch_2_6/core-samples/src: resources/portal-users-samples-war/WEB-INF and 2 other directories.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-24 13:23:43 -0400 (Sat, 24 May 2008) New Revision: 10810 Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml Log: I add customization and help page for current users portlet. See http://jira.jboss.org/jira/browse/JBPORTAL-2026 Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 01:39:58 UTC (rev 10809) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-24 17:23:43 UTC (rev 10810) @@ -22,6 +22,15 @@ package org.jboss.portal.core.samples.users; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Set; + +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.PortletSecurityException; +import javax.portlet.UnavailableException; + import org.apache.log4j.Logger; import org.jboss.portal.core.identity.UsersActivityStatsService; import org.jboss.portal.core.servlet.jsp.PortalJsp; @@ -30,67 +39,74 @@ import org.jboss.portlet.JBossRenderRequest; import org.jboss.portlet.JBossRenderResponse; -import javax.portlet.PortletException; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.UnavailableException; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.Set; - /** * Read the current users online and write them in output. - * + * * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> */ -public class CurrentUsersPortlet extends JBossPortlet -{ +public class CurrentUsersPortlet extends JBossPortlet { - /** Logger */ - public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); + /** Logger */ + public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); - protected void doView(JBossRenderRequest rRequest, JBossRenderResponse rResponse) throws PortletException, - IOException, UnavailableException - { - UsersActivityStatsService uass = (UsersActivityStatsService) this.getPortletContext().getAttribute( - "UsersActivityStats"); + /** Help page */ + private static final String JSP_HELP = "/WEB-INF/jsp/users/help.jsp"; - rResponse.setContentType("text/html"); - PrintWriter writer = rResponse.getWriter(); + protected void doHelp(JBossRenderRequest request, + JBossRenderResponse response) throws PortletException, + PortletSecurityException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher(JSP_HELP); + dispatcher.include(request, response); + } - long currentTime = System.currentTimeMillis(); + protected void doView(JBossRenderRequest rRequest, + JBossRenderResponse rResponse) throws PortletException, + IOException, UnavailableException { + + String guestNumber = rRequest.getPreferences().getValue("guestNumber",""); + + UsersActivityStatsService uass = (UsersActivityStatsService) this + .getPortletContext().getAttribute("UsersActivityStats"); - //TODO: this is wrong - should pass period instead of current time - actually it works by a coincedence... - Set users = uass.getActiveUsersNames(currentTime); + rResponse.setContentType("text/html"); + PrintWriter writer = rResponse.getWriter(); - int sessionCount = uass.getActiveSessionCount(currentTime); + long currentTime = System.currentTimeMillis(); - int allLoggedSessions = uass.getUsersActivities(currentTime).size(); + // TODO: this is wrong - should pass period instead of current time - + // actually it works by a coincedence... + Set users = uass.getActiveUsersNames(currentTime); - if (sessionCount == 1) - { - DelegateContext ctx = new DelegateContext(); - ctx.put("USERS", users.toString()); - ctx.put("USERS_COUNT", Integer.toString(sessionCount)); - rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); - PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); - rd.include(rRequest, rResponse); - } - else if (sessionCount > 1) - { - DelegateContext ctx = new DelegateContext(); - ctx.put("USERS", users.toString()); - ctx.put("USERS_COUNT", Integer.toString(sessionCount)); - ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); - rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); - PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); - rd.include(rRequest, rResponse); - } - else - { - PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); - rd.include(rRequest, rResponse); - } + int sessionCount = uass.getActiveSessionCount(currentTime); - writer.close(); - } + int allLoggedSessions = uass.getUsersActivities(currentTime).size(); + + if (sessionCount == 1 || (guestNumber.equals("false") && users.size() == 1)) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(sessionCount)); + ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); + rd.include(rRequest, rResponse); + } else if (sessionCount > 1) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(sessionCount)); + ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); + rd.include(rRequest, rResponse); + } else { + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); + rd.include(rRequest, rResponse); + } + + writer.close(); + } } Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 01:39:58 UTC (rev 10809) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties 2008-05-24 17:23:43 UTC (rev 10810) @@ -21,13 +21,15 @@ # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # ################################################################################ -NO_USERS_ONLINE=No logged-in user +NO_USERS_ONLINE=No online user ONE_USER_ONLINE_0=There is <b> ONE_USER_ONLINE_1=</b> online user +ONE_USER_LOGGED_1=</b> logged user ONE_USER_IS_0=<b> ONE_USER_IS_1=</b> USERS_ONLINE_0=There are <b> USERS_ONLINE_1=</b> online users +USERS_LOGGED_1=</b> logged users USERS_ARE_0=<b> USERS_ARE_1=</b> USERS_WHICH_0=Whose <b> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 01:39:58 UTC (rev 10809) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2008-05-24 17:23:43 UTC (rev 10810) @@ -24,10 +24,12 @@ NO_USERS_ONLINE=Nessun utente \u00e8 online ONE_USER_ONLINE_0=Al momento c'\u00e8 <b> ONE_USER_ONLINE_1=</b> utente online +ONE_USER_LOGGED_1=</b> utente loggato ONE_USER_IS_0=<b> ONE_USER_IS_1=</b> USERS_ONLINE_0=Al momento ci sono <b> USERS_ONLINE_1=</b> utenti online +USERS_LOGGED_1=</b> utenti loggati USERS_ARE_0=<b> USERS_ARE_1=</b> USERS_WHICH_0=Di cui <b> Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp 2008-05-24 17:23:43 UTC (rev 10810) @@ -0,0 +1,41 @@ +<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ JBoss, a division of Red Hat ~ + ~ Copyright 2006, 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. ~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%> + +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%> + +<portlet:defineObjects /> + +<div class="portlet-font" style="font-size: larger; font-weight: bold">Current +Users Portlet Help:</div> +</div> +<br /> +<div class="portlet-font">Description: The Current users Portlet +shows current users actually connected. You can to see both guest and +logged users number and to see which users are logged.</div> +<br /> +<div class="portlet-font">You can to manage what to show to users. +You can to choose paragraphes to show, clicking the checkboxes</div> +<br /> +<br /> +<div class="portlet-font"><a + href="<portlet:renderURL portletMode='view'/>">Back</a></div> \ No newline at end of file Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/help.jsp ___________________________________________________________________ Name: svn:executable + * Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 01:39:58 UTC (rev 10809) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2008-05-24 17:23:43 UTC (rev 10810) @@ -32,14 +32,30 @@ <tr> <td colspan="1"> <span class="portlet-text"> + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> ${n:i18n("ONE_USER_ONLINE_0")} ${n:out("USERS_COUNT")} - ${n:i18n("ONE_USER_ONLINE_1")} - <% java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get(); + ${n:i18n("ONE_USER_ONLINE_1")} + <br/><br/> + <% } + java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get(); org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext = - ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext(); - if (!currentContext.get("USERS").equals("[]")) { %> + ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext(); + if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %> + + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> + ${n:i18n("USERS_WHICH_0")} + ${n:out("USERS_LOGGED_COUNT")} + ${n:i18n("USERS_WHICH_2")} + <% } else { %> + ${n:i18n("ONE_USER_ONLINE_0")} + ${n:out("USERS_LOGGED_COUNT")} + ${n:i18n("ONE_USER_LOGGED_1")} + <% } %> <br/><br/> + <% } + if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %> + ${n:i18n("ONE_USER_IS_0")} ${n:out("USERS")} ${n:i18n("ONE_USER_IS_1")} Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 01:39:58 UTC (rev 10809) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2008-05-24 17:23:43 UTC (rev 10810) @@ -32,24 +32,34 @@ <tr> <td colspan="1"> <span class="portlet-text"> + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> ${n:i18n("USERS_ONLINE_0")} ${n:out("USERS_COUNT")} - ${n:i18n("USERS_ONLINE_1")} - <% java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get(); + ${n:i18n("USERS_ONLINE_1")} + <br/><br/> + <% } + java.util.LinkedList linkedStack = (java.util.LinkedList)contextStack.get(); org.jboss.portal.core.servlet.jsp.taglib.context.Context currentContext = ((org.jboss.portal.core.servlet.jsp.taglib.context.NamedContext)linkedStack.getLast()).getContext(); - if (!currentContext.get("USERS_LOGGED_COUNT").equals("0")) { %> + if (!currentContext.get("USERS_LOGGED_COUNT").equals("0") && renderRequest.getPreferences().getValue("loggedNumber", "").equals("true")) { %> + + <% if (renderRequest.getPreferences().getValue("guestNumber", "").equals("true")) { %> + ${n:i18n("USERS_WHICH_0")} + ${n:out("USERS_LOGGED_COUNT")} + <% if (!currentContext.get("USERS_LOGGED_COUNT").equals("1")) { %> + ${n:i18n("USERS_WHICH_1")} + <% } else { %> + ${n:i18n("USERS_WHICH_2")} + <% } %> + <% } else { %> + ${n:i18n("USERS_ONLINE_0")} + ${n:out("USERS_LOGGED_COUNT")} + ${n:i18n("USERS_LOGGED_1")} + <% } %> <br/><br/> - ${n:i18n("USERS_WHICH_0")} - ${n:out("USERS_LOGGED_COUNT")} - <% if (!currentContext.get("USERS_LOGGED_COUNT").equals("1")) { %> - ${n:i18n("USERS_WHICH_1")} - <% } else { %> - ${n:i18n("USERS_WHICH_2")} - <% } %> <% } - if (!currentContext.get("USERS").equals("[]")) { %> - <br/><br/> + if (!currentContext.get("USERS").equals("[]") && renderRequest.getPreferences().getValue("loggedUsers", "").equals("true")) { %> + ${n:i18n("USERS_ARE_0")} ${n:out("USERS")} ${n:i18n("USERS_ARE_1")} Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 01:39:58 UTC (rev 10809) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-24 17:23:43 UTC (rev 10810) @@ -35,6 +35,7 @@ <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> + <portlet-mode>HELP</portlet-mode> </supports> <supported-locale>en</supported-locale> <supported-locale>it</supported-locale> @@ -44,5 +45,19 @@ <title>Current users</title> <keywords>sample,test</keywords> </portlet-info> + <portlet-preferences> + <preference> + <name>guestNumber</name> + <value>true</value> + </preference> + <preference> + <name>loggedNumber</name> + <value>true</value> + </preference> + <preference> + <name>loggedUsers</name> + <value>true</value> + </preference> + </portlet-preferences> </portlet> </portlet-app>

18 years

1
0
0 / 0

JBoss Portal SVN: r10809 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 21:39:58 -0400 (Fri, 23 May 2008) New Revision: 10809 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.3.2. Page Policy Properties - starting markup and content revisions Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-24 01:13:15 UTC (rev 10808) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-24 01:39:58 UTC (rev 10809) @@ -149,7 +149,7 @@ <sect2> <title>Portal Policy Properties</title> <para> - A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties: + A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal-policy properties: </para> <para> <table frame="all"> @@ -240,12 +240,12 @@ </para> </sect2> <sect2> - <title>Page policy properties</title> - <para>A set of properties configure the the behavior of the page policy. Those properties will only be - taken in account for objects of type portal and page.</para> + <title>Page Policy Properties</title> + <para> + A set of properties configure the the behavior of the page policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents page-policy properties: + </para> <para> <table frame="all"> - <title>Page policy properties</title> <tgroup cols="3" align="left" colsep="1" rowset="1"> <colspec colname='c1'/> <colspec colname='c2'/> @@ -259,41 +259,44 @@ </thead> <tbody> <row> - <entry align="center">control.page.access_denied</entry> - <entry align="center">On access denied</entry> - <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry> + <entry align="center"><computeroutput>control.page.access_denied</computeroutput></entry> + <entry align="center">when access is denied</entry> + <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> <row> - <entry align="center">control.page.unavailable</entry> - <entry align="center">On resource not available</entry> - <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry> + <entry align="center"><computeroutput>control.page.unavailable</computeroutput></entry> + <entry align="center">when a resource is unavailable</entry> + <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> <row> - <entry align="center">control.page.error</entry> - <entry align="center">On an expected error</entry> - <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry> + <entry align="center"><computeroutput>control.page.error</computeroutput></entry> + <entry align="center">when an expected error occurs</entry> + <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> <row> - <entry align="center">control.page.internal_error</entry> - <entry align="center">On an unexpected error</entry> - <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry> + <entry align="center"><computeroutput>control.page.internal_error</computeroutput></entry> + <entry align="center">when an unexpected error occurs</entry> + <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> <row> - <entry align="center">control.page.not_found</entry> - <entry align="center">On resource not found</entry> - <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry> + <entry align="center"><computeroutput>control.page.not_found</computeroutput></entry> + <entry align="center">when a resource is not found</entry> + <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> <row> - <entry align="center">control.page.resource_uri</entry> - <entry align="center">The path of the JSP used for redirections</entry> - <entry align="center"><emphasis>ignore</emphasis>, <emphasis>jsp</emphasis> and <emphasis>hide</emphasis></entry> + <entry align="center"><computeroutput>control.page.resource_uri</computeroutput></entry> + <entry align="center">the path of the JSP used for redirections</entry> + <entry align="center"><computeroutput>ignore</computeroutput>, <computeroutput>jsp</computeroutput> and <computeroutput>hide</computeroutput></entry> </row> </tbody> </tgroup> </table> - </para> - <para>An example of page configuration: - <programlisting><![CDATA[ + </para> + <para> + The following page configuration details the use of page-policy properties: + </para> + <para> +<programlisting><![CDATA[ <page> <page-name>MyPortal</page-name> ... @@ -328,8 +331,15 @@ </page> ]]></programlisting> </para> - <note>You can configure the page properties also on objects of type portal, in that case they will be inherited by the pages - which are located in the portal.</note> + <para> + <note> + <para> + You can configure the page properties also on objects of type portal, in that case they will be inherited by the pages + which are located in the portal. + </para> + </note> +</para> + </sect2> </sect1> <sect1>

18 years

1
0
0 / 0

JBoss Portal SVN: r10808 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 21:13:15 -0400 (Fri, 23 May 2008) New Revision: 10808 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml Log: Chapter 8. Error Handling Configuration - minor revisions Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 22:02:29 UTC (rev 10807) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-24 01:13:15 UTC (rev 10808) @@ -9,7 +9,7 @@ </chapterinfo> <title>Error Handling Configuration</title> <para> - The JBoss Portal request pipeline allows fine-grained, dynamic configuration of how JBoss Portal behaves when errors occur at runtime. + The JBoss Portal request pipeline allows fine-grained, dynamic configuration of how JBoss Portal behaves when errors occur during runtime. </para> <sect1> <title>Error Types</title> @@ -117,7 +117,7 @@ <sect2> <title>Portal Policy</title> <para> - The portal error-policy controls the response that is sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore the error. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with appropriate request attributes, allowing page customization. + The portal error-policy controls the response sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore the error. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with the appropriate request attributes, allowing page customization. </para> </sect2> <sect2> @@ -144,11 +144,12 @@ <sect1> <title>Configuration using XML Descriptors</title> <para> - Different policies are configured using portal object properties, allowing the error-handling policy for objects to be configured in XML descriptors, <filename>*-object.xml</filename> files, for a portal deployment. + Different policies are configured using portal object properties, allowing the error-handling policy for objects to be configured in XML descriptors -- the <filename>*-object.xml</filename> files -- for a portal deployment. </para> <sect2> <title>Portal Policy Properties</title> - <para>A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties: + <para> + A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties: </para> <para> <table frame="all"> @@ -198,8 +199,11 @@ </tgroup> </table> </para> - <para>An example of portal configuration: - <programlisting><![CDATA[ + <para> + The following portal configuration details the use of portal-policy properties: + </para> + <para> +<programlisting><![CDATA[ <portal> <portal-name>MyPortal</portal-name> ... Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml 2008-05-23 22:02:29 UTC (rev 10807) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml 2008-05-24 01:13:15 UTC (rev 10808) @@ -33,7 +33,7 @@ </mediaobject> </para> <para> - Before reading the following sections, be familiar with how to define a page and a portal. Refer to <xref linkend="desc_example_page" /> for details. + Before reading the following sections, be familiar with how to define pages and portal. Refer to <xref linkend="desc_example_page" /> for details. </para> </sect1> <sect1>

18 years

1
0
0 / 0

JBoss Portal SVN: r10807 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-23 18:02:29 -0400 (Fri, 23 May 2008) New Revision: 10807 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java Log: added support for session and guest Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2008-05-23 22:00:51 UTC (rev 10806) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2008-05-23 22:02:29 UTC (rev 10807) @@ -34,20 +34,24 @@ public static final int NAVIGATION = 0; - public static final int SIGN_OUT = 1; + public static final int EXIT = 1; private String id; + private String sessionId; + private long timestamp; private final int type; + public final static String GUEST = "guest"; + private UserActivity() { this.type = NAVIGATION; } - public UserActivity(String id, long timestamp, int type) + public UserActivity(String id, String sessionId, long timestamp, int type) { if (id == null) { @@ -55,6 +59,7 @@ } this.id = id; + this.sessionId = sessionId; this.timestamp = timestamp; this.type = type; } @@ -65,7 +70,8 @@ { throw new IllegalArgumentException("Id (notification message) cannot be null"); } - this.id = notification.getMessage(); + this.id = notification.getMessage().substring(0, notification.getMessage().indexOf("_")); + this.sessionId = notification.getMessage().substring(notification.getMessage().indexOf("_")); this.timestamp = notification.getTimeStamp(); this.type = Integer.parseInt(notification.getType()); } @@ -75,6 +81,11 @@ return id; } + public String getSessionId() + { + return sessionId; + } + public long getTimestamp() { return timestamp; @@ -85,7 +96,6 @@ return type; } - public boolean equals(Object o) { if (this == o) @@ -97,9 +107,9 @@ return false; } - UserActivity that = (UserActivity)o; + UserActivity that = (UserActivity) o; - if (!id.equals(that.id)) + if (!id.equals(that.id) || !sessionId.equals(that.sessionId)) { return false; } @@ -110,7 +120,7 @@ public int hashCode() { int result; - result = id.hashCode(); + result = id.hashCode() + sessionId.hashCode(); return result; } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2008-05-23 22:00:51 UTC (rev 10806) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2008-05-23 22:02:29 UTC (rev 10807) @@ -33,6 +33,8 @@ public Set getActiveUsersIds(long period); + public int getActiveSessionCount(long period); + public Set getActiveUsersNames(long period); public Set getUsersActivities(long period); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-05-23 22:00:51 UTC (rev 10806) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-05-23 22:02:29 UTC (rev 10807) @@ -1,24 +1,24 @@ /* -* JBoss, a division of Red Hat -* Copyright 2006, 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. -*/ + * JBoss, a division of Red Hat + * Copyright 2006, 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.core.identity; @@ -42,16 +42,20 @@ import java.util.Set; /** - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot + * com">Boleslaw Dawidowicz</a> * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> * @version $Revision$ */ -public class UsersActivityStatsServiceImpl extends AbstractJBossService implements UsersActivityStatsService, NotificationListener +public class UsersActivityStatsServiceImpl extends AbstractJBossService + implements + UsersActivityStatsService, + NotificationListener { /** Our logger. */ private static final Logger log = Logger.getLogger(UsersActivityStatsServiceImpl.class); - //TODO: some value just to begin - find some good default + // TODO: some value just to begin - find some good default private int userTrackerThreadsNumber = 10; private int updaterThreadsNumber = 1; @@ -86,7 +90,8 @@ updaterExecutor = Executors.newScheduledThreadPool(getUpdaterThreadsNumber()); - updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), getUpdaterInterval(), getUpdaterInterval(), TimeUnit.MILLISECONDS); + updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), getUpdaterInterval(), getUpdaterInterval(), + TimeUnit.MILLISECONDS); if (activityBroadcasterName != null) { @@ -97,7 +102,6 @@ addNotificationListener(this, null, null); } - } protected void stopService() throws Exception @@ -114,23 +118,39 @@ Set results = new HashSet(); for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity)iterator.next(); - if (currentTime - ua.getTimestamp() < period) + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period && !ua.getId().equals(UserActivity.GUEST)) { - results.add(ua.getId()); + results.add(ua.getSessionId()); } } return results; } + public int getActiveSessionCount(long period) + { + long currentTime = System.currentTimeMillis(); + + int results = 0; + for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) + { + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period && ua.getId().equals(UserActivity.GUEST)) + { + results++; + } + } + return results; + } + public Set getActiveUsersNames(long period) { long currentTime = System.currentTimeMillis(); Set results = new HashSet(); for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity)iterator.next(); - if (currentTime - ua.getTimestamp() < period) + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period && !ua.getId().equals(UserActivity.GUEST)) { results.add(ua.getId()); } @@ -144,7 +164,7 @@ Set results = new HashSet(); for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity)iterator.next(); + UserActivity ua = (UserActivity) iterator.next(); if (currentTime - ua.getTimestamp() < period) { results.add(ua); @@ -157,21 +177,17 @@ { try { - Notification notification = new Notification(Integer.toString(userActivity.getType()), - this.getServiceName(), - userActivity.getTimestamp(), - userActivity.getTimestamp(), - userActivity.getId()); + Notification notification = new Notification(Integer.toString(userActivity.getType()), this.getServiceName(), + userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + "_" + + userActivity.getSessionId()); - if (activityBroadcasterName != null) { log.debug("Broadcasting user activity notification "); - server.invoke(new ObjectName(activityBroadcasterName), - "sendNotification", - new Object[]{notification}, - new String[]{Notification.class.getName()}); + server.invoke(new ObjectName(activityBroadcasterName), "sendNotification", new Object[] + {notification}, new String[] + {Notification.class.getName()}); } else { @@ -185,7 +201,6 @@ log.error("Failed to send user activity notification: ", e); } - } public void handleNotification(Notification notification, Object object) @@ -213,7 +228,6 @@ userTrackerExecutor.execute(task); } - public int getUserTrackerThreadsNumber() { return userTrackerThreadsNumber; @@ -283,7 +297,7 @@ this.activityQueue = activityQueue; } - //never run + // never run private Updater() { this.activityQueue = null; @@ -297,10 +311,10 @@ while (!activityQueue.isEmpty()) { - UserActivity activity = (UserActivity)activityQueue.poll(); + UserActivity activity = (UserActivity) activityQueue.poll(); if (activity != null && ((currentTime - activity.getTimestamp()) < activityTimeout)) { - if (activity.getType() != UserActivity.SIGN_OUT) + if (activity.getType() != UserActivity.EXIT) { stillActive.add(activity); } @@ -316,6 +330,4 @@ } } - } -

18 years

1
0
0 / 0

JBoss Portal SVN: r10806 - in branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users: event and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-23 18:00:51 -0400 (Fri, 23 May 2008) New Revision: 10806 Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java Log: added support for session and guest Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-23 14:54:41 UTC (rev 10805) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-23 22:00:51 UTC (rev 10806) @@ -26,12 +26,12 @@ import org.jboss.portal.core.identity.UsersActivityStatsService; import org.jboss.portal.core.servlet.jsp.PortalJsp; import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext; +import org.jboss.portlet.JBossPortlet; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossRenderResponse; -import javax.portlet.GenericPortlet; import javax.portlet.PortletException; import javax.portlet.PortletRequestDispatcher; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; import javax.portlet.UnavailableException; import java.io.IOException; import java.io.PrintWriter; @@ -39,52 +39,56 @@ /** * Read the current users online and write them in output. - * + * * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> */ -public class CurrentUsersPortlet extends GenericPortlet -{ +public class CurrentUsersPortlet extends JBossPortlet { - /** Logger */ - public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); + /** Logger */ + public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); - protected void doView(RenderRequest rRequest, RenderResponse rResponse) - throws PortletException, IOException, UnavailableException - { - UsersActivityStatsService uass = (UsersActivityStatsService)this - .getPortletContext().getAttribute("UsersActivityStats"); + protected void doView(JBossRenderRequest rRequest, + JBossRenderResponse rResponse) throws PortletException, + IOException, UnavailableException { + UsersActivityStatsService uass = (UsersActivityStatsService) this + .getPortletContext().getAttribute("UsersActivityStats"); - rResponse.setContentType("text/html"); - PrintWriter writer = rResponse.getWriter(); + rResponse.setContentType("text/html"); + PrintWriter writer = rResponse.getWriter(); - //TODO: this is wrong - should pass period instead of current time - actually it works by a coincedence... - Set users = uass.getActiveUsersNames(System.currentTimeMillis()); + long currentTime = System.currentTimeMillis(); - if (users.size() == 1) - { - DelegateContext ctx = new DelegateContext(); - ctx.put("USERS", users.toString()); - ctx.put("USERS_COUNT", Integer.toString(users.size())); - rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); - PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); - rd.include(rRequest, rResponse); - } - else if (users.size() > 1) - { - DelegateContext ctx = new DelegateContext(); - ctx.put("USERS", users.toString()); - ctx.put("USERS_COUNT", Integer.toString(users.size())); - rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); - PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); - rd.include(rRequest, rResponse); - } - else - { - PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); - rd.include(rRequest, rResponse); - } + // TODO: this is wrong - should pass period instead of current time - + // actually it works by a coincedence... + Set users = uass.getActiveUsersNames(currentTime); + int sessionCount = uass.getActiveSessionCount(currentTime); - writer.close(); - } + int allLoggedSessions = uass.getUsersActivities(currentTime).size(); + + if (sessionCount == 1) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(sessionCount)); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); + rd.include(rRequest, rResponse); + } else if (sessionCount > 1) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(sessionCount)); + ctx.put("USERS_LOGGED_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); + rd.include(rRequest, rResponse); + } else { + PortletRequestDispatcher rd = getPortletContext() + .getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); + rd.include(rRequest, rResponse); + } + + writer.close(); + } } Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java 2008-05-23 22:00:51 UTC (rev 10806) @@ -0,0 +1,57 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.core.samples.users.event; + +import org.jboss.portal.api.event.PortalEvent; +import org.jboss.portal.api.event.PortalEventContext; +import org.jboss.portal.api.session.event.PortalSessionEvent; +import org.jboss.portal.core.identity.UserActivity; + +/** + * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> + * @version $Revision: 1.1 $ + */ +public class PortalSessionEventListener extends StatsListener +{ + + public void onEvent(PortalEventContext eventContext, PortalEvent event) + { + if (event instanceof PortalSessionEvent) + { + PortalSessionEvent portalEvent = (PortalSessionEvent) event; + UserActivity userActivity = null; + + if (portalEvent.getType() == PortalSessionEvent.SESSION_CREATED) + { + userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION); + } + else if (portalEvent.getType() == PortalSessionEvent.SESSION_DESTROYED) + { + userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.EXIT); + } + getStatsService().registerActivity(userActivity); + } + } +} Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java 2008-05-23 22:00:51 UTC (rev 10806) @@ -0,0 +1,44 @@ +package org.jboss.portal.core.samples.users.event; + +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; + +import org.apache.log4j.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.portal.api.event.PortalEventListener; +import org.jboss.portal.core.identity.UsersActivityStatsService; + +public abstract class StatsListener implements PortalEventListener +{ + + /** Our logger. */ + private static final Logger log = Logger.getLogger(StatsListener.class); + + private UsersActivityStatsService activityService; + + public UsersActivityStatsService getStatsService() + { + if (activityService == null) + { + try + { + MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); + activityService = (UsersActivityStatsService) MBeanProxy.get(UsersActivityStatsService.class, + new ObjectName("portal:service=Module,type=UsersActivityStatsService"), mbeanServer); + } + catch (MBeanProxyCreationException e) + { + log.error("could not obtain a proxy for User Activity Statistics Service", e); + } + catch (MalformedObjectNameException e2) + { + log.error("object name to obtain User Activity Statistics Service is wrong", e2); + } + } + return activityService; + } + +} Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java 2008-05-23 14:54:41 UTC (rev 10805) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java 2008-05-23 22:00:51 UTC (rev 10806) @@ -22,84 +22,36 @@ ******************************************************************************/ package org.jboss.portal.core.samples.users.event; -import org.apache.log4j.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; import org.jboss.portal.api.event.PortalEvent; import org.jboss.portal.api.event.PortalEventContext; -import org.jboss.portal.api.event.PortalEventListener; import org.jboss.portal.api.user.event.UserAuthenticationEvent; import org.jboss.portal.core.identity.UserActivity; -import org.jboss.portal.core.identity.UsersActivityStatsService; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - /** * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> * @version $Revision: 1.1 $ */ -public class UserEventListener implements PortalEventListener +public class UserEventListener extends StatsListener { - /** Our logger. */ - private static final Logger log = Logger - .getLogger(UserEventListener.class); - - private UsersActivityStatsService activityService; - - public UsersActivityStatsService getStatsService() - { - if (activityService == null) - { - try - { - MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); - activityService = (UsersActivityStatsService)MBeanProxy - .get( - UsersActivityStatsService.class, - new ObjectName( - "portal:service=Module,type=UsersActivityStatsService"), - mbeanServer); - } - catch (MBeanProxyCreationException e) - { - log - .error( - "could not obtain a proxy for User Activity Statistics Service", - e); - } - catch (MalformedObjectNameException e2) - { - log - .error( - "object name to obtain User Activity Statistics Service is wrong", - e2); - } - } - return activityService; - } - public void onEvent(PortalEventContext eventContext, PortalEvent event) { if (event instanceof UserAuthenticationEvent) { - UserAuthenticationEvent userEvent = (UserAuthenticationEvent)event; + UserAuthenticationEvent userEvent = (UserAuthenticationEvent) event; UserActivity userActivity = null; if (userEvent.getType() == UserAuthenticationEvent.SIGN_IN) { - userActivity = new UserActivity(userEvent.getUserId(), System - .currentTimeMillis(), UserActivity.NAVIGATION); + userActivity = new UserActivity(userEvent.getUserId(), eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION); } else if (userEvent.getType() == UserAuthenticationEvent.SIGN_OUT) { - userActivity = new UserActivity(userEvent.getUserId(), System - .currentTimeMillis(), UserActivity.SIGN_OUT); + userActivity = new UserActivity(userEvent.getUserId(), eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.EXIT); } getStatsService().registerActivity(userActivity); }

18 years

1
0
0 / 0

JBoss Portal SVN: r10805 - modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-23 10:54:41 -0400 (Fri, 23 May 2008) New Revision: 10805 Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java Log: - i18n day Modified: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-23 12:48:14 UTC (rev 10804) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-23 14:54:41 UTC (rev 10805) @@ -59,7 +59,7 @@ */ public class IdentityLoginModule extends UsernamePasswordLoginModule { - + protected String userModuleJNDIName; protected String roleModuleJNDIName; @@ -175,29 +175,16 @@ { UserStatus userStatus = getUserStatus(inputPassword); + + // Set the user Status in the request so that the login page can show an error message accordingly + request.setAttribute("org.jboss.portal.userStatus", userStatus); - if (userStatus == UserStatus.DISABLE) + if (userStatus == UserStatus.OK) { - request.setAttribute("org.jboss.portal.loginError", "Your account is disabled"); - return false; - } - else if (userStatus == UserStatus.NOTASSIGNEDTOROLE) - { - request.setAttribute("org.jboss.portal.loginError", "The user doesn't have the correct role"); - return false; - } - else if ((userStatus == UserStatus.UNEXISTING) || userStatus == UserStatus.WRONGPASSWORD) - { - request.setAttribute("org.jboss.portal.loginError", "The user doesn't exist or the password is incorrect"); - return false; - } - else if (userStatus == UserStatus.OK) - { return true; } else { - log.error("Unexpected error while logging in"); return false; } }

18 years

1
0
0 / 0

JBoss Portal SVN: r10804 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-sar/conf/bundles and 4 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-23 08:48:14 -0400 (Fri, 23 May 2008) New Revision: 10804 Removed: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/role/ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/user/ 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_fr.properties branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp Log: - removed obsolete stuff - i18n day ! Make the identity module and login window i18n Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/css/login.css 2008-05-23 12:48:14 UTC (rev 10804) @@ -22,14 +22,12 @@ input.login-button { bottom: 20px; - width: 60px; right: 90px } input.cancel-button { bottom: 20px; right: 10px; - width: 70px; } div.login-container div.login-header { Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-23 12:48:14 UTC (rev 10804) @@ -25,4 +25,14 @@ PAGENAME_default=Home PAGENAME_Admin=Admin PAGENAME_Test=Test -PAGENAME_News=News \ No newline at end of file +PAGENAME_News=News + +ACCOUNT_DISABLED=Your account is disabled +ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=The user doesn't exist or the password is incorrect +ACCOUNT_NOTASSIGNEDTOROLE=The user doesn't have the correct role + +LOGIN_TITLE=JBoss Portal Login +LOGIN_USERNAME=Username +LOGIN_PASSWORD=Password +LOGIN_CANCEL=Cancel +LOGIN_SUBMIT=Submit \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-23 12:48:14 UTC (rev 10804) @@ -25,4 +25,14 @@ PAGENAME_default=Accueil PAGENAME_Admin=Admin PAGENAME_Test=Test -PAGENAME_News=Actualit\u00E9s \ No newline at end of file +PAGENAME_News=Actualit\u00E9s + +ACCOUNT_DISABLED=Votre compte n'est pas actif +ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=L'utilisateur n'existe pas ou le mot de passe est incorrect +ACCOUNT_NOTASSIGNEDTOROLE=L'utilisateur n'a pas le role requis + +LOGIN_TITLE=Connexion JBoss Portal +LOGIN_USERNAME=Nom d'utilisateur +LOGIN_PASSWORD=Mot de passe +LOGIN_CANCEL=Annuler +LOGIN_SUBMIT=Se connecter Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-23 12:48:14 UTC (rev 10804) @@ -23,9 +23,17 @@ <%@ page pageEncoding="utf-8" %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<%@page import="org.jboss.portal.identity.UserStatus"%> +<%@page import="org.jboss.portal.common.i18n.ResourceBundleFactory"%> +<%@page import="java.util.ResourceBundle"%> + +<% + ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale()); +%> + <html xmlns="http://www.w3.org/1999/xhtml"> <head> - <title>Login</title> + <title><%= rb.getString("LOGIN_TITLE") %></title> <style type="text/css"> /* <![CDATA[ */ body { @@ -53,26 +61,42 @@ <div class="login-container"> + <div class="login-header"> - <h2>JBoss Portal Login</h2> + <h2><%= rb.getString("LOGIN_TITLE") %></h2> </div> <div class="login-content"> + <div class="error-message" - style="<%=(request.getAttribute("org.jboss.portal.loginError") != null ? "" : "display:none")%>;"><%= - (request.getAttribute("org.jboss.portal.loginError") == null ? "" : request.getAttribute("org.jboss.portal.loginError"))%> + style="<%=(request.getAttribute(!UserStatus.OK.equals("org.jboss.portal.userStatus") ? "" : "display:none"))%>;"> + <% + + if (UserStatus.DISABLE.equals(request.getAttribute("org.jboss.portal.userStatus"))) + { + out.println(rb.getString("ACCOUNT_DISABLED")); + } + else if (UserStatus.WRONGPASSWORD.equals(request.getAttribute("org.jboss.portal.userStatus")) || UserStatus.UNEXISTING.equals(request.getAttribute("org.jboss.portal.userStatus"))) + { + out.println(rb.getString("ACCOUNT_INEXISTING_OR_WRONG_PASSWORD")); + } + else if (UserStatus.NOTASSIGNEDTOROLE.equals(request.getAttribute("org.jboss.portal.userStatus"))) + { + out.println(rb.getString("ACCOUNT_NOTASSIGNEDTOROLE")); + } + %> </div> <form method="post" action="<%= response.encodeURL("j_security_check") %>" name="loginform" id="loginForm" target="_parent"> <div class="form-field"> - <label for="j_username">Username:</label> + <label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>:</label> <input type="text" name="j_username" id="j_username" value=""/> </div> <div class="form-field bottom-field"> - <label for="j_password">Password:</label> + <label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>:</label> <input type="password" name="j_password" id="j_password" value=""/> </div> - <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="Cancel" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> - <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="Login" class="login-button"/> + <input style="<%=(request.getParameter("loginheight") != null ? "" : "display:none")%>;" type="button" name="cancel" value="<%= rb.getString("LOGIN_CANCEL") %>" class="cancel-button" onclick="window.parent.hideContentModal('login-modal');"/> + <input style="<%=(request.getParameter("loginheight") != null ? "" : "right:10px")%>;" type="submit" name="login" value="<%= rb.getString("LOGIN_SUBMIT") %>" class="login-button"/> </form> </div> 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 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-05-23 12:48:14 UTC (rev 10804) @@ -175,4 +175,7 @@ # Example usage for dynamic values IDENTITY_DYNAMIC_VALUE_TEST=test label -IDENTITY_DYNAMIC_VALUE_TEST2=test label2 \ No newline at end of file +IDENTITY_DYNAMIC_VALUE_TEST2=test label2 + +javax.portlet.title=User profile +javax.portlet.keywords=management,user \ No newline at end of file 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 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-23 12:48:14 UTC (rev 10804) @@ -292,3 +292,5 @@ IDENTITY_XMMP = Identifiant XMMP IDENTITY_YIM = Identifiant Yahoo + +javax.portlet.title=Utilisateur Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-23 06:17:56 UTC (rev 10803) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-23 12:48:14 UTC (rev 10804) @@ -59,10 +59,7 @@ <supported-locale>fr</supported-locale> <supported-locale>en</supported-locale> <supported-locale>it</supported-locale> - <portlet-info> - <title>User portlet</title> - <keywords>management,user</keywords> - </portlet-info> + <resource-bundle>conf.bundles.Identity</resource-bundle> <portlet-preferences> <preference>

18 years

1
0
0 / 0

JBoss Portal SVN: r10803 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 02:17:56 -0400 (Fri, 23 May 2008) New Revision: 10803 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.3.1. Portal Policy Properties - revising table/changing xml markup Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 05:17:31 UTC (rev 10802) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 06:17:56 UTC (rev 10803) @@ -37,7 +37,7 @@ </listitem> <listitem> <para> - <emphasis>Resource not available</emphasis>: the resource was found, but it is not serviceable. + <emphasis>Resource unavailable</emphasis>: the resource was found, but it is not serviceable. </para> </listitem> </itemizedlist> @@ -108,7 +108,7 @@ </listitem> <listitem> <para> - Resource not available: <computeroutput>HTTP 404 Not Found</computeroutput> + Resource unavailable: <computeroutput>HTTP 404 Not Found</computeroutput> </para> </listitem> </itemizedlist> @@ -142,58 +142,57 @@ </sect2> </sect1> <sect1> - <title>Configuration using the XML descriptors</title> - <para>Since the different policies are configured using portal object properties it is possible to configure - the error handling policy in the XML descriptors of those objects (the <literal>*-object.xml</literal> files for - your Portal deployment).</para> + <title>Configuration using XML Descriptors</title> + <para> + Different policies are configured using portal object properties, allowing the error-handling policy for objects to be configured in XML descriptors, <filename>*-object.xml</filename> files, for a portal deployment. + </para> <sect2> - <title>Portal policy properties</title> - <para>A set of properties configure the the behavior of the portal policy. Those properties will only be - taken in account for objects of type portal.</para> + <title>Portal Policy Properties</title> + <para>A set of properties configure the the behavior of the portal policy. These properties are only taken into account for objects that use the <emphasis>portal</emphasis> type. The following table represents portal policy properties: + </para> <para> <table frame="all"> - <title>Portal policy properties</title> <tgroup cols="3" align="left" colsep="1" rowset="1"> <colspec colname='c1'/> <colspec colname='c2'/> <colspec colname='c3'/> <thead> <row> - <entry align="center">Property name</entry> + <entry align="center">Property Name</entry> <entry align="center">Description</entry> - <entry align="center">Possible values</entry> + <entry align="center">Possible Values</entry> </row> </thead> <tbody> <row> - <entry align="center">control.portal.access_denied</entry> - <entry align="center">On access denied</entry> - <entry align="center"><emphasis>ignore</emphasis> and <emphasis>jsp</emphasis></entry> - </row> + <entry align="center"><computeroutput>control.portal.access_denied</computeroutput></entry> + <entry align="center">when access is denied</entry> + <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry> + </row> <row> - <entry align="center">control.portal.unavailable</entry> - <entry align="center">On resource not available</entry> - <entry align="center"><emphasis>ignore</emphasis> and <emphasis>jsp</emphasis></entry> + <entry align="center"><computeroutput>control.portal.unavailable</computeroutput></entry> + <entry align="center">when a resource is unavailable</entry> + <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry> </row> <row> - <entry align="center">control.portal.error</entry> - <entry align="center">On an expected error</entry> - <entry align="center"><emphasis>ignore</emphasis> and <emphasis>jsp</emphasis></entry> + <entry align="center"><computeroutput>control.portal.error</computeroutput></entry> + <entry align="center">when an expected error occurs</entry> + <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry> </row> <row> - <entry align="center">control.portal.internal_error</entry> - <entry align="center">On an unexpected error</entry> - <entry align="center"><emphasis>ignore</emphasis> and <emphasis>jsp</emphasis></entry> + <entry align="center"><computeroutput>control.portal.internal_error</computeroutput></entry> + <entry align="center">when an unexpected error occurs</entry> + <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry> </row> <row> - <entry align="center">control.portal.not_found</entry> - <entry align="center">On resource not found</entry> - <entry align="center"><emphasis>ignore</emphasis> and <emphasis>jsp</emphasis></entry> + <entry align="center"><computeroutput>control.portal.not_found</computeroutput></entry> + <entry align="center">when a resource is not found</entry> + <entry align="center"><computeroutput>ignore</computeroutput> and <computeroutput>jsp</computeroutput></entry> </row> <row> - <entry align="center">control.portal.resource_uri</entry> - <entry align="center">The path of the JSP used for redirections</entry> - <entry align="center">A valid path to a JSP located in the portal-core.war file</entry> + <entry align="center"><computeroutput>control.portal.resource_uri</computeroutput></entry> + <entry align="center">the path of the JSP used for redirections</entry> + <entry align="center">a valid path to a JSP located in the <filename>portal-core.war/</filename> directory</entry> </row> </tbody> </tgroup>

18 years

1
0
0 / 0

JBoss Portal SVN: r10802 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 01:17:31 -0400 (Fri, 23 May 2008) New Revision: 10802 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.2.4. Page Policy - revising Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 05:03:26 UTC (rev 10801) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 05:17:31 UTC (rev 10802) @@ -121,14 +121,22 @@ </para> </sect2> <sect2> - <title>Page policy</title> - <para>The window error policy controls how the page reacts to aggregation errors. Indeed the page is most of the - time an aggregation of several portlet windows and the action to take when an error occurs is different than - the other policies. Whenever an error occurs, the policy can either handle it or ignore it. If the error is - ignored then it will be treated by the portal policy. The different actions that are possible upon an error are: + <title>Page Policy</title> + <para> + The window error-policy controls how pages react to aggregation errors. Most of the time, pages are an aggregation of several portlet windows, and the action to take when an error occurs differs from other policies. When an error occurs, the policy can either handle it, or ignore it. If the error is ignored, it is handled by the portal policy. Possible actions taken after such errors are: + </para> + <para> <itemizedlist> - <listitem>Remove the window from the aggregation</listitem> - <listitem>Replace the markup of the window by a redirection to a JSP page</listitem> + <listitem> + <para> + remove the window from the aggregation. + </para> + </listitem> + <listitem> + <para> + replace the markup of the window by a redirection to a JSP page. + </para> + </listitem> </itemizedlist> </para> </sect2>

18 years

1
0
0 / 0

JBoss Portal SVN: r10801 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 01:03:26 -0400 (Fri, 23 May 2008) New Revision: 10801 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.2.3. Portal Policy - revising Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 04:57:08 UTC (rev 10800) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 05:03:26 UTC (rev 10801) @@ -115,11 +115,10 @@ </para> </sect2> <sect2> - <title>Portal policy</title> - <para>The portal error policy controls the response that will be sent to the browser when an error occurs. There is a default - configuration and it is reconfigurable per portal. Whenever an error occurs, the policy can either handle a redirect to - a JSP page or ignore the error. If the error is ignored it will be handled by the default policy, otherwise a JSP page - will be invoked with appropriate request attributes to allow page customization.</para> + <title>Portal Policy</title> + <para> + The portal error-policy controls the response that is sent to the Web browser when an error occurs. A default error policy exists, which can be configured per portal. If an error occurs, the policy can either handle a redirect to a JSP page, or ignore the error. If the error is ignored, it is handled by the default policy, otherwise a JSP page is invoked with appropriate request attributes, allowing page customization. + </para> </sect2> <sect2> <title>Page policy</title>

18 years

1
0
0 / 0

JBoss Portal SVN: r10800 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 00:57:08 -0400 (Fri, 23 May 2008) New Revision: 10800 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.2.2. Default Policy - revising Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 04:35:49 UTC (rev 10799) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 04:57:08 UTC (rev 10800) @@ -17,27 +17,27 @@ <itemizedlist> <listitem> <para> - <computeroutput>Access denied</computeroutput>: the user does not have the security permissions to access the resource. + <emphasis>Access denied</emphasis>: the user does not have the security permissions to access the resource. </para> </listitem> <listitem> <para> - <computeroutput>Error</computeroutput>: an anticipated error, such as when a portlet throws an exception. + <emphasis>Error</emphasis>: an anticipated error, such as when a portlet throws an exception. </para> </listitem> <listitem> <para> - <computeroutput>Internal error</computeroutput>: an unexpected error. + <emphasis>Internal error</emphasis>: an unexpected error. </para> </listitem> <listitem> <para> - <computeroutput>Resource not found</computeroutput>: the resource was not found. + <emphasis>Resource not found</emphasis>: the resource was not found. </para> </listitem> <listitem> <para> - <computeroutput>Resource not available</computeroutput>: the resource was found, but it is not serviceable. + <emphasis>Resource not available</emphasis>: the resource was found, but it is not serviceable. </para> </listitem> </itemizedlist> @@ -80,15 +80,37 @@ </para> </sect2> <sect2> - <title>Default policy</title> - <para>The default policy applies when errors are not handled at other level. By default errors are translated + <title>Default Policy</title> + <para>The default policy applies when errors are not handled by another level. By default, errors are translated into the most appropriate HTTP response: + </para> + <para> <itemizedlist> - <listitem>Access denied: HTTP 403 Forbidden response</listitem> - <listitem>Error: HTTP 500 Internal Server Error response</listitem> - <listitem>Internal error: HTTP 500 Internal Server Error response</listitem> - <listitem>Resource not found: HTTP 404 Not Found response</listitem> - <listitem>Resource not available: HTTP 404 Not Found response</listitem> + <listitem> + <para> + Access denied: <computeroutput>HTTP 403 Forbidden</computeroutput> + </para> + </listitem> + <listitem> + <para> + Error: <computeroutput>HTTP 500 Internal Server Error</computeroutput> + </para> + </listitem> + <listitem> + <para> + Internal error: <computeroutput>HTTP 500 Internal Server Error</computeroutput> + </para> + </listitem> + <listitem> + <para> + Resource not found: <computeroutput>HTTP 404 Not Found</computeroutput> + </para> + </listitem> + <listitem> + <para> + Resource not available: <computeroutput>HTTP 404 Not Found</computeroutput> + </para> + </listitem> </itemizedlist> </para> </sect2>

18 years

1
0
0 / 0

JBoss Portal SVN: r10799 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-23 00:35:49 -0400 (Fri, 23 May 2008) New Revision: 10799 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.2.1. Policy Delegation and Cascading - revising Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 01:57:33 UTC (rev 10798) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 04:35:49 UTC (rev 10799) @@ -44,21 +44,38 @@ </para> </sect1> <sect1> - <title>Control policies</title> - <para>When an error occurs, the request control flow changes according to the configuration. The configuration - is also called <emphasis>control policy</emphasis>.</para> + <title>Control Policies</title> + <para>If an error occurs, the request control-flow changes according to the configuration. This configuration is known as the <emphasis>control policy</emphasis>.</para> <sect2> - <title>Policy delegation and cascading</title> - <para>Whenever a control policy is invoked it is possible to change the response sent - by the control flow. If the control policy ignores the error then the next policy will handle the error - at this turn. However if the control policy decides to provide a new response then the next policy - will not be invoked since the new response will not be of type error. For instance, if a portlet part of a - page produces an exception, the following reactions are possible: + <title>Policy Delegation and Cascading</title> + <para> + When the control policy is invoked, the response sent by the control flow can be changed. If the control policy ignores the error, the error is handled by the next policy. If the control policy provides a new response, the next policy is not invoked, since the new response will not be an error. + </para> + <para> + If a portlet in a page produces an exception, the following reactions are possible: + </para> + <para> <itemizedlist> - <listitem>The error is displayed in the window</listitem> - <listitem>The window is removed from the aggregation</listitem> - <listitem>An portal error page is displayed</listitem> - <listitem>An HTTP 500 error response is sent to the browser</listitem> + <listitem> + <para> + the error is displayed in the window. + </para> + </listitem> + <listitem> + <para> + the window is removed from the aggregation. + </para> + </listitem> + <listitem> + <para> + a portal error page is displayed. + </para> + </listitem> + <listitem> + <para> + a HTTP 500 error response is sent to the Web browser. + </para> + </listitem> </itemizedlist> </para> </sect2>

18 years

1
0
0 / 0

JBoss Portal SVN: r10798 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-22 21:57:33 -0400 (Thu, 22 May 2008) New Revision: 10798 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.1. Error Types - minor revisions, making list more compatible with standard Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 01:29:22 UTC (rev 10797) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-05-23 01:57:33 UTC (rev 10798) @@ -7,18 +7,39 @@ <email>julien.viet(a)jboss.com</email> </author> </chapterinfo> - <title>Error handling configuration</title> - <para>JBoss Portal's request pipeline allows for fine-grained, dynamic configuration of how Portal will behave when - an error occurs at runtime.</para> + <title>Error Handling Configuration</title> + <para> + The JBoss Portal request pipeline allows fine-grained, dynamic configuration of how JBoss Portal behaves when errors occur at runtime. + </para> <sect1> - <title>Error types</title> - <para>There are several kind of errors that can happen during a request: + <title>Error Types</title> + <para>There are several types of errors that can occur during a request: <itemizedlist> - <listitem>Access denied: the user does not have the security rights to access a resource</listitem> - <listitem>Error: an anticipated error as when a portlet throws an exception</listitem> - <listitem>Internal error: an unexpected error</listitem> - <listitem>Resource not found: a resource is not found</listitem> - <listitem>Resource not available: a resource is found but is not serviceable</listitem> + <listitem> + <para> + <computeroutput>Access denied</computeroutput>: the user does not have the security permissions to access the resource. + </para> + </listitem> + <listitem> + <para> + <computeroutput>Error</computeroutput>: an anticipated error, such as when a portlet throws an exception. + </para> + </listitem> + <listitem> + <para> + <computeroutput>Internal error</computeroutput>: an unexpected error. + </para> + </listitem> + <listitem> + <para> + <computeroutput>Resource not found</computeroutput>: the resource was not found. + </para> + </listitem> + <listitem> + <para> + <computeroutput>Resource not available</computeroutput>: the resource was found, but it is not serviceable. + </para> + </listitem> </itemizedlist> </para> </sect1>

18 years

1
0
0 / 0

JBoss Portal SVN: r10797 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-05-22 21:29:22 -0400 (Thu, 22 May 2008) New Revision: 10797 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml Log: Chapter 7. Portal URLs - minor revisions Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml 2008-05-22 14:41:22 UTC (rev 10796) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/urls.xml 2008-05-23 01:29:22 UTC (rev 10797) @@ -39,7 +39,7 @@ <sect1> <title>Accessing a Portal</title> <para> - The <computeroutput>default</computeroutput> portal is used when no portal is specified. The following examples detail how the selection is done: + The <computeroutput>default</computeroutput> portal is used when no portal is specified. How selection is done: </para> <para> <itemizedlist> @@ -59,7 +59,7 @@ <sect1> <title>Accessing a Page</title> <para> - Each portal can have multiple pages, and each portal has a default page. When a portal is selected, a page must be used, and all windows in that page are rendered. The page selection mechanism is as follows: + Each portal can have multiple pages, with each portal having a default page. When a portal is selected, a page must be used, and all windows in that page are rendered. The page selection mechanism is as follows: </para> <para> <computeroutput>/portal/default/<replaceable>page-name</replaceable></computeroutput> renders the <replaceable>page-name</replaceable> page. @@ -71,7 +71,7 @@ The <emphasis>CMSPortlet</emphasis> delivers content transparently, without modifying the displayed URL. It is desirable to display binary content, such as GIF, JPEG, PDF, ZIP, and so on, outside of the confines of the portal. For example, <computeroutput>/content/default/images/jboss_logo.gif</computeroutput> displays the <computeroutput>jboss_logo.gif</computeroutput> file outside of the portal. </para> <para> - To display content outside of the portal, the portal interprets any path beginning with <computeroutput>/content</computeroutput> as a request for CMS content. As long as the <computeroutput><mime-type></computeroutput> is not <computeroutput>text/html</computeroutput>, or <computeroutput>text/text</computeroutput>, and the path to the content begins with <computeroutput>/content</computeroutput>, the content will be rendered independently outside of the portal. + To display content outside of the portal, the portal interprets any path beginning with <computeroutput>/content</computeroutput> as a request for CMS content. As long as the <computeroutput><mime-type></computeroutput> is not <computeroutput>text/html</computeroutput>, or <computeroutput>text/text</computeroutput>, and the path to the content begins with <computeroutput>/content</computeroutput>, the content is rendered independently, outside of the portal. </para> </sect1> <!-- Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml =================================================================== --- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-05-22 14:41:22 UTC (rev 10796) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-05-23 01:29:22 UTC (rev 10797) @@ -1840,7 +1840,7 @@ <instance-name> </screen> <para> - The <computeroutput><instance-name></computeroutput> maps to the <computeroutput><instance-ref></computeroutput> element. + The <computeroutput><instance-name></computeroutput> element maps to the <computeroutput><instance-ref></computeroutput> element. </para> </listitem> <listitem>

18 years

1
0
0 / 0

JBoss Portal SVN: r10796 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/aspects/portlet and 9 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-22 10:41:22 -0400 (Thu, 22 May 2008) New Revision: 10796 Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/ branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/css/ branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/css/master.css branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/ branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-maximize.gif branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-minimize.gif branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-normal.gif Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/TestPortlet.java branches/JBoss_Portal_Branch_2_7/core/.classpath branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossActionResponse.java Log: - Fix portlet 2.0 samples portlet - Make the signOut event works - Started on portlet->portal events mechanism Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-05-22 14:41:22 UTC (rev 10796) @@ -53,8 +53,8 @@ <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet-2.0.0.CR2"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-controller-lib.jar" sourcepath="/module-portlet-2.0.0.CR2"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/portlet/SignOutInterceptor.java 2008-05-22 14:41:22 UTC (rev 10796) @@ -22,6 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.aspects.portlet; +import org.jboss.portal.core.controller.portlet.CoreEventControllerContext; import org.jboss.portal.core.controller.portlet.SignOutResponse; import org.jboss.portal.portlet.invocation.PortletInterceptor; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -41,12 +42,13 @@ protected Object invoke(PortletInvocation invocation) throws Exception { PortletInvocationResponse response = (PortletInvocationResponse)invocation.invokeNext(); + if (response instanceof UpdateNavigationalStateResponse) { UpdateNavigationalStateResponse unsr = (UpdateNavigationalStateResponse)response; for (UpdateNavigationalStateResponse.Event event : unsr.getEvents()) { - if (event.getName().equals(new QName("http://www.jboss.com/portal", "signOut"))) + if (event.getName().equals(new QName(CoreEventControllerContext.PORTAL_NAMESPACE, "signOut"))) { String location = (String)event.getPayload(); return new SignOutResponse(location); Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/response/SignOutResponse.java 2008-05-22 14:41:22 UTC (rev 10796) @@ -40,10 +40,6 @@ public SignOutResponse(String location) { - if (location == null) - { - throw new IllegalArgumentException(); - } this.location = location; } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/CoreEventControllerContext.java 2008-05-22 14:41:22 UTC (rev 10796) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.controller.portlet; +import java.util.LinkedList; + import org.jboss.portal.portlet.controller.event.EventControllerContext; import org.jboss.portal.portlet.controller.event.EventPhaseContext; import org.jboss.portal.portlet.controller.event.Event; @@ -36,15 +38,22 @@ public class CoreEventControllerContext implements EventControllerContext { + public final static String PORTAL_NAMESPACE = "urn:jboss:portal"; + /** . */ private final Logger log = Logger.getLogger(CoreEventControllerContext.class); /** . */ private final ControllerPortletControllerContext portletControllerContext; + + /** Events to be consumed by the portal, unused at the moment */ + private LinkedList<Event> toConsumeEvents; + public CoreEventControllerContext(ControllerPortletControllerContext portletControllerContext) { this.portletControllerContext = portletControllerContext; + this.toConsumeEvents = new LinkedList<Event>(); } public void eventProduced(EventPhaseContext context, Event producedEvent, Event sourceEvent) @@ -62,6 +71,12 @@ context.queueEvent(distributedEvent); } } + + // Portal events unused at the moment + if (PORTAL_NAMESPACE.equals(producedEvent.getName().getNamespaceURI())) + { + toConsumeEvents.addLast(producedEvent); + } } catch (Exception e) { Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/portlet/SignOutResponse.java 2008-05-22 14:41:22 UTC (rev 10796) @@ -42,10 +42,6 @@ public SignOutResponse(String location) { - if (location == null) - { - throw new IllegalArgumentException(); - } this.location = location; } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossActionResponse.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossActionResponse.java 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portlet/JBossActionResponse.java 2008-05-22 14:41:22 UTC (rev 10796) @@ -38,6 +38,7 @@ import org.jboss.portal.api.node.PortalNode; import org.jboss.portal.api.node.PortalNodeURL; import org.jboss.portal.core.aspects.controller.node.Navigation; +import org.jboss.portal.core.controller.portlet.CoreEventControllerContext; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -153,7 +154,8 @@ */ public void signOut() throws IllegalStateException { - setEvent(new QName("http://www.jboss.com/portal", "signOut"), null); + + setEvent(new QName(CoreEventControllerContext.PORTAL_NAMESPACE, "signOut"), null); /* if (!PortletRequest.FORM_AUTH.equals(preq.getAuthType())) { @@ -179,7 +181,7 @@ */ public void signOut(String location) throws IllegalStateException { - setEvent(new QName("http://www.jboss.com/portal", "signOut"), location); + setEvent(new QName(CoreEventControllerContext.PORTAL_NAMESPACE, "signOut"), location); // throw new NotYetImplemented(); /* Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-05-22 14:41:22 UTC (rev 10796) @@ -252,6 +252,7 @@  <copy todir="${build.resources}/portal-portlet-samples.war"> <fileset dir="${build.resources}/portal-portlet-samples-war"/> + <fileset dir="${source.bin}/portal-portlet-samples-war"/> </copy> <mkdir dir="${build.resources}/portal-portlet-samples.war/WEB-INF/lib/"/> <copy file="${jboss.portal/modules/portlet.lib}/portal-portlet-samples-lib.jar" todir="${build.resources}/portal-portlet-samples.war/WEB-INF/lib/"/> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/css/master.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/css/master.css (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/css/master.css 2008-05-22 14:41:22 UTC (rev 10796) @@ -0,0 +1,388 @@ +body, +div.container { + font: normal 12px Lucida Sans, Trebuchet, tahoma, sans-serif; +} + +.align-center { + text-align: center; +} + +.align-left { + text-align: left; +} + +.align-center-margin { + margin: 0 auto 0 auto; +} + +.float-left { + float: left; +} + +.float-right { + float: right; +} + +.align-left { + text-align: left; +} + +.align-right { + text-align: right; +} + +.half-width { + width: 49%; +} + +.quarter-width { + width: 24.9%; +} + +.three-quarter-width { + width: 74.9%; +} + +.full-width { + width: 100%; +} + +.third-width { + width: 32.9%; +} + +.two-third-width { + width: 65.5%; +} + +.tenpx-top-bottom { + margin: 10px 0 10px 0; +} + +.relative { + position: relative +} + +.absolute { + position: absolute +} + +p.white-padded { + color: #fff; + padding: 5px; +} + +.clear { + clear: both; +} + +img { + margin: 0; + padding: 0; + border: 0; +} + +.zero { + margin: 0; + padding: 0; + border: 0; +} + +body, + div, + form, + ul, + li { + margin: 0; + padding: 0; +} + +ul { + +} + +ul li { + list-style-position:inside; +} + +.hidden { + display: none; +} + +/*--------------------------------Decoration*/ + +h2 { + font-size: 1.9em; + color: #fff; + margin: 0; + padding: 0; +} + +h2.title { + font-size: 1.9em; + color: #fff; + margin: 0; + padding: 0; +} + +h3 { + font-size: 1.0em; + color: #fff; + margin: 0; + padding: 0; +} + +a { + color: #990000; +} + +p { + margin: 0; + padding: 0; +} + +/*-------------------------------Container Decoration*/ + +div#container>div.header { + height: 40px; + background-color: #000; +} + +div#container div.header div.logo { + background-image: url( /simple-portal/images/logo-header.gif ); + background-repeat: no-repeat; + background-position: top left; + height: 40px; +} + +div#container div.header div.pc20 { + text-align: right; +} + +div#container div.header div.secondary-nav { + font-size: 11px; + padding: 3px 5px 0 0; + text-align: right; +} + +div#container div.header div.pc20 img { + margin: 5px 10px 0 0; +} + +div#container div.nav { + background-image: url( /simple-portal/images/nav-bg.gif ); + background-repeat: repeat-x; + background-position: top left; + border-top: 1px solid #878787; + border-bottom: 1px solid #383838; + height: 24px; +} + +div#container div.nav ul { + height: 24px; + margin: 0 0 0 10px; +} + +div#container div.nav ul li { + display: inline; + float: left; + text-align: center; + height: 24px; /*border: 1px solid #929292;*/ +} + +div#container div.nav ul li a, + div#container div.nav ul li a:hover { + display: block; + height: 16px; + padding: 5px 14px 4px 14px; + background-repeat: repeat-x; + background-position: top left; + text-decoration: none; + font: bold 11px; +} + +div#container div.nav ul li a { + color: #fff; /*background-image: url( /simple-portal/images/inactive-button-bg.gif );*/ +} + +div#container div.nav ul li a:hover, + div#container div.nav ul li a.selected { + color: #fff; + background-image: url( /simple-portal/images/active-button2-bg.gif ); +} + +div#container div#content { + background-image: url( /simple-portal/images/portal-bg.gif ); + background-repeat: repeat-x; + background-position: top left; + min-height: 600px; + padding: 10px; +} + +/*-------------------------------Portlet Decoration*/ + +div#container div#content div.portlet { + border: 1px solid #969696; + background-color: #e2e2e2; + padding: 2px; + float: left; + margin: 10px; + width: 95%; +} + +div#container div#content div.portlet-frame { + background-color: #fff; + border: 1px solid #fff; +} + +div#container div#content div.portlet div.header { + background-image: url( /simple-portal/images/portlet-titlebg.gif ); + background-repeat: repeat-x; + background-position: top left; + height: 20px; +} + +div#container div#content div.portlet div.header div.header-layer { + background-image: url( /simple-portal/images/portlet-title-rt-bg.gif ); + background-repeat: no-repeat; + background-position: top right; + height: 20px; +} + +div#container div#content div.portlet div.header div.header-layer div.title h2 { + font: bold 12px Lucida Sans, Trebuchet, tahoma, sans-serif; + color: #fff; + padding: 2px; +} + +div#container div#content div.portlet div.header div.header-layer div.controls { + text-align: right; + padding: 3px 0 0 0; +} + +div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button { + text-align: right; + padding: 0 5px 0 0; +} + +div#container div#content div.portlet div.header div.header-layer div.controls span.mode-button a { + color: #e1d77e; + font: normal 11px; + text-decoration: none; +} + +/*----------------------------------Error portlet*/ + +div.error-container { + padding: 5px; + background-color: #fff; +} + +h3.error-header { + background-color: #cc1100; + color: #fff; + padding: 3px; +} + +div.error-container ul { + list-style: none; + list-style-position: inside; +} + +div.error-container ul li { + padding: 3px 0 3px 0; + border-bottom: 1px solid #777777; +} + +div.error-container ul li span { + font-weight: bold; + color: #cc1100 +} + +div.exception code { + color: #33ff00; +} + +/*-------------------------------------Remote Window*/ + +div.remote-container { + padding: 8px 0 0 0; +} + +div.remote-container ul { + list-style: none; + list-style-position: inside; + width: 90%; + margin: 0 auto 0 auto; +} + +div.remote-container ul li { + padding: 3px 0 3px 0; + border-bottom: 1px solid #777777; +} + +div.remote-container ul li a { + color: #332299 +} + +/*-------------------------------------Home page*/ + +div#container div#content div.main-content { + padding: 5px; + width: 950px; + border-bottom: 1px solid #777777; +} + +div#container div#content div.main-content p { + padding: 5px; +} + +div#container div#content div.content-box { + background-image: url( /simple-portal/images/content-box-bg.gif ); + background-repeat: repeat-x; + background-position: top right; + height: 200px ; + width: 300px; + margin: 0 13px 0 13px; +} + +div#container div#content div.content-box div.box-header { + position: relative; + height: 28px; + width: 100%; +} + +div#container div#content div.content-box div.box-header h3{ + padding: 4px 0 0 10px; + font-size:1.2em; +} + + +div#container div#content div.content-box div.box-header img.left { + position: absolute; + top: 0; + left: 0; +} + +div#container div#content div.content-box div.box-header img.right { + position: absolute; + top: 0; + right: 0; +} + +div#container div#content div.content-box div.box-content { + padding: 5px; +} + +/*-------------------------------------Wiki page*/ + +div#container div#content div.wiki-content { + padding: 5px; + border-bottom: 1px solid #777777; +} + +div#container div#content div.wiki-content p { + padding: 5px; +} + +/*-------------------------------------Debugger*/ Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-maximize.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-maximize.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-minimize.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-minimize.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-normal.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_7/core-samples/src/bin/portal-portlet-samples-war/images/icon-normal.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/TestPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/TestPortlet.java 2008-05-22 13:34:23 UTC (rev 10795) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/basic/TestPortlet.java 2008-05-22 14:41:22 UTC (rev 10796) @@ -37,6 +37,8 @@ import javax.portlet.PortletSecurityException; import javax.portlet.PortletURL; import javax.transaction.Transaction; +import javax.xml.namespace.QName; + import java.io.IOException; import java.io.PrintWriter; import java.util.Enumeration; @@ -73,6 +75,19 @@ resp.setRenderParameter("name", "value"); } + public void testsignout(JBossActionRequest req, JBossActionResponse resp) + { + resp.setEvent(new QName("urn:jboss:portal", "signOut"), ""); + } + public void testsignout2(JBossActionRequest req, JBossActionResponse resp) + { + resp.signOut(); + } + public void testsignout3(JBossActionRequest req, JBossActionResponse resp) + { + resp.signOut("http://www.redhat.com"); + } + protected void doView(JBossRenderRequest req, JBossRenderResponse resp) throws PortletException, PortletSecurityException, IOException { resp.setContentType("text/html"); @@ -245,6 +260,35 @@ writer.write("</p>"); // + actionURL = resp.createActionURL(); + + actionURL.setParameter("op", "testsignout"); + writer.write("<p>"); + writer.write("<div class=\"portlet-section-header\">Test sign out</div>"); + writer.write("<div class=\"portlet-section-body\">"); + writer.write("<div><a href=\"" + actionURL + "\">sign out with signout event</a></div>"); + writer.write("</div>"); + + actionURL = resp.createActionURL(); + actionURL.setParameter("op", "testsignout2"); + writer.write("<div class=\"portlet-section-body\">"); + writer.write("<div><a href=\"" + actionURL + "\">sign out with former API and no parameter</a></div>"); + writer.write("</div>"); + + writer.write("</p>"); + + // + + // + actionURL = resp.createActionURL(); + actionURL.setParameter("op", "testsignout3"); + writer.write("<p>"); + writer.write("<div class=\"portlet-section-header\">Test sign out 3</div>"); + writer.write("<div class=\"portlet-section-body\">"); + writer.write("<div><a href=\"" + actionURL + "\">sign out with former API and redirect to Red Hat</a></div>"); + writer.write("</div>"); + writer.write("</p>"); +// writer.close(); }

18 years

1
0
0 / 0

JBoss Portal SVN: r10795 - in modules/portlet/trunk: samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-22 09:34:23 -0400 (Thu, 22 May 2008) New Revision: 10795 Modified: modules/portlet/trunk/.classpath modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java Log: Modify the remote control to be pretty also in the whole portal. Modified: modules/portlet/trunk/.classpath =================================================================== --- modules/portlet/trunk/.classpath 2008-05-22 13:29:03 UTC (rev 10794) +++ modules/portlet/trunk/.classpath 2008-05-22 13:34:23 UTC (rev 10795) @@ -8,8 +8,8 @@ <classpathentry kind="src" path="test/src/main/java"/> <classpathentry kind="src" path="samples/src/main/java"/> <classpathentry kind="src" path="portlet/src/test/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/home/theute/Java/jdk1.5.0_08/lib/tools.jar"/> + <classpathentry kind="src" path="mc/src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_15"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java =================================================================== --- modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2008-05-22 13:29:03 UTC (rev 10794) +++ modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/remotecontroller/RemoteControllerPortlet.java 2008-05-22 13:34:23 UTC (rev 10795) @@ -37,7 +37,7 @@ ResourceURL resource = renderResponse.createResourceURL(); printWriter.print(resource); printWriter.print("')\">Open remote control!</a></p>"); - } +} @Override public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws PortletException, IOException @@ -46,17 +46,17 @@ PrintWriter writer = resourceResponse.getWriter(); String namespace = resourceResponse.getNamespace(); writer.print("<html><head><script type='text/javascript'>function openLinkInParent(url){window.open(url,'" - + namespace + "_parent');}</script>\n<link rel=\"stylesheet\" href='/simple-portal/css/master.css' type=\"text/css\"/></head><body>"); + + namespace + "_parent');}</script>\n<link rel=\"stylesheet\" href='" + resourceRequest.getContextPath() + "/css/master.css' type=\"text/css\"/></head><body>"); PortletURL url = resourceResponse.createRenderURL(); url.setWindowState(WindowState.MINIMIZED); writer.print("<div class=\"remote-container\"><ul><li><a href='#' onclick=\"" + createParentURL(url) + "\"><img\n" + - " src=\"/simple-portal/images/icon-minimize.gif\" alt=\"\"/> minimize parent portlet</a></li>"); + " src=\"" + resourceRequest.getContextPath() + "/images/icon-minimize.gif\" alt=\"\"/> minimize parent portlet</a></li>"); url.setWindowState(WindowState.MAXIMIZED); writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\"><img\n" + - " src=\"/simple-portal/images/icon-maximize.gif\" alt=\"\"/> maximize parent portlet</a></li>"); + " src=\"" + resourceRequest.getContextPath() + "/images/icon-maximize.gif\" alt=\"\"/> maximize parent portlet</a></li>"); url.setWindowState(WindowState.NORMAL); writer.print("<li><a href='#' onclick=\"" + createParentURL(url) + "\"><img\n" + - " src=\"/simple-portal/images/icon-normal.gif\" alt=\"\"/> make parent portlet normal</a></li></ul>"); + " src=\"" + resourceRequest.getContextPath() + "/images/icon-normal.gif\" alt=\"\"/> make parent portlet normal</a></li></ul>"); writer.print("<br/><ul><li><b>'zipcode'</b> public render parameter value: " + resourceRequest.getParameter(ZIPCODE) + "<br/>"); writer.print("Set value of <b>'zipcode'</b> public render parameter to:</li>"); url.setParameter(ZIPCODE, "80201");

18 years

1
0
0 / 0

JBoss Portal SVN: r10793 - in branches/JBoss_Portal_Branch_2_7: core-samples/src/resources/portal-basic-samples-war/WEB-INF and 1 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-22 08:56:37 -0400 (Thu, 22 May 2008) New Revision: 10793 Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java Log: - Fixed 2.0 sample portlets - Removed 2 out of 3 google map windows (Google map window requires a portlet module upgrade to work) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-05-21 14:11:59 UTC (rev 10792) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/navstate/PortalObjectNavigationalStateContext.java 2008-05-22 12:56:37 UTC (rev 10793) @@ -134,7 +134,10 @@ if (oldNS == null) { PortalObjectId id = (PortalObjectId)wantedKey.getId(); - oldNS = (WindowNavigationalState)store.getAttribute(id.toString()); + if (store.getAttribute(id.toString()) instanceof WindowNavigationalState) + { + oldNS = (WindowNavigationalState)store.getAttribute(id.toString()); + } } // Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-05-21 14:11:59 UTC (rev 10792) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-05-22 12:56:37 UTC (rev 10793) @@ -143,6 +143,10 @@ <security-role-ref> <role-name>Authenticated</role-name> </security-role-ref> + <supported-publishing-event> + <qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname> + </supported-publishing-event> + </portlet> <portlet> <description>Portlet displaying the number of it's action/render calls</description> @@ -467,4 +471,10 @@ <transport-guarantee>CONFIDENTIAL</transport-guarantee> </user-data-constraint> </security-constraint> + + <event-definition> + <qname xmlns:jbp="urn:jboss:portal">jbp:signOut</qname> + <value-type>java.lang.String</value-type> + </event-definition> + </portlet-app> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-05-21 14:11:59 UTC (rev 10792) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-portlet-samples-war/WEB-INF/default-object.xml 2008-05-22 12:56:37 UTC (rev 10793) @@ -61,25 +61,8 @@ <region>center</region> <height>1</height> </window> + <window> - <window-name>GoogleWeatherPortletWindow1</window-name> - <instance-ref>GoogleWeatherPortletInstance</instance-ref> - <region>center</region> - <height>2</height> - </window> - <window> - <window-name>GoogleWeatherPortletWindow2</window-name> - <instance-ref>GoogleWeatherPortletInstance</instance-ref> - <region>center</region> - <height>3</height> - </window> - <window> - <window-name>GoogleWeatherPortletWindow3</window-name> - <instance-ref>GoogleWeatherPortletInstance</instance-ref> - <region>center</region> - <height>4</height> - </window> - <window> <window-name>ShoppingCatalogPortletWindow</window-name> <instance-ref>ShoppingCatalogPortletInstance</instance-ref> <region>center</region>

18 years

1
0
0 / 0

JBoss Portal SVN: r10792 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/aspects/server and 5 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-21 10:11:59 -0400 (Wed, 21 May 2008) New Revision: 10792 Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/login-config.xml Log: LDAP performance improvements Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-05-21 13:27:04 UTC (rev 10791) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2008-05-21 14:11:59 UTC (rev 10792) @@ -51,7 +51,7 @@ <componentref name="jboss-portal/modules/web" version="1.1.0"/> <componentref name="jboss-portal/modules/test" version="1.0.1"/> <componentref name="jboss-portal/modules/portlet" version="1.0.3"/> - <componentref name="jboss-portal/modules/identity" version="1.0.3"/> + <componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/> <componentref name="antlr" version="2.7.6.ga"/> <componentref name="apache-ant" version="1.6.5"/> <componentref name="jackrabbit" version="1.1.1"/> Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/server/IdentityCacheInterceptor.java 2008-05-21 14:11:59 UTC (rev 10792) @@ -0,0 +1,88 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.aspects.server; + +import org.jboss.portal.core.identity.cache.IdentityCacheService; +import org.jboss.portal.server.ServerInterceptor; +import org.jboss.portal.server.ServerInvocation; +import org.jboss.portal.common.invocation.InvocationException; +import org.jboss.logging.Logger; + +import javax.naming.InitialContext; +import javax.naming.NamingException; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class IdentityCacheInterceptor extends ServerInterceptor +{ + + /** Our logger. */ + private static final Logger log = Logger.getLogger(IdentityCacheInterceptor.class); + + private IdentityCacheService identityCacheService; + + public IdentityCacheService getIdentityCacheService() + { + if (identityCacheService == null) + { + try + { + identityCacheService = (IdentityCacheService)new InitialContext().lookup(IdentityCacheService.JNDI_NAME); + } + catch (NamingException e) + { + log.debug("Could not obtain IdentityCacheService. Setting empty wrapper"); + identityCacheService = new EmptyIdentityCache(); + } + } + return identityCacheService; + } + + protected void invoke(ServerInvocation invocation) throws Exception, InvocationException + { + + try + { + invocation.invokeNext(); + } + finally + { + IdentityCacheService cache = getIdentityCacheService(); + if (cache != null) + { + cache.cleanup(); + } + } + + } + + private class EmptyIdentityCache extends IdentityCacheService + { + public void cleanup() + { + // Do nothing + } + } +} Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPRoleModuleWrapper.java 2008-05-21 14:11:59 UTC (rev 10792) @@ -0,0 +1,161 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.ldap.LDAPRoleModule; +import org.jboss.portal.identity.ldap.LDAPRoleImpl; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.IdentityException; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import java.util.Set; +import java.util.List; +import java.util.HashSet; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CachedLDAPRoleModuleWrapper extends LDAPRoleModule implements RoleModule +{ + private LDAPRoleModule ldapRoleModule; + + private IdentityCacheService cacheService; + + public CachedLDAPRoleModuleWrapper(LDAPRoleModule ldapRoleModule, IdentityCacheService cacheService) + { + this.ldapRoleModule = ldapRoleModule; + this.cacheService = cacheService; + } + + public Role findRoleByName(String name) throws IdentityException, IllegalArgumentException + { + Role role = cacheService.findRoleByName(name); + + if (role != null) + { + return role; + } + + return ldapRoleModule.findRoleByName(name); + } + + public Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException + { + + //Check if all roles needed are in cache. If not just delegate to the wrapped module + Set roles = new HashSet(); + + for (String name : names) + { + Role role = cacheService.findRoleByName(name); + if (role != null) + { + roles.add(role); + } + else + { + roles = ldapRoleModule.findRolesByNames(names); + break; + } + } + + return roles; + } + + public Role findRoleById(Object id) throws IdentityException, IllegalArgumentException + { + Role role = cacheService.findRoleById(id); + + if (role != null) + { + return role; + } + + return ldapRoleModule.findRoleById(id); + } + + public Role findRoleById(String id) throws IdentityException, IllegalArgumentException + { + return this.findRoleById((Object)id); + } + + public Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException + { + Role role = ldapRoleModule.createRole(name, displayName); + + cacheService.storeRole(role); + + return role; + } + + public void removeRole(Object id) throws IdentityException, IllegalArgumentException + { + ldapRoleModule.removeRole(id); + + // Invalidate this role in cache + Role role = cacheService.findRoleById(id); + if (role != null) + { + cacheService.invalidateRole(role); + } + } + + public int getRolesCount() throws IdentityException + { + return ldapRoleModule.getRolesCount(); + } + + public Set findRoles() throws IdentityException + { + return ldapRoleModule.findRoles(); + } + + public List searchRoles(String filter, Object[] filterArgs) throws NamingException, IdentityException + { + return ldapRoleModule.searchRoles(filter, filterArgs); + } + + // Methods of LDAPRoleModule - need to delegate for compatibility + + public void updateDisplayName(LDAPRoleImpl ldapr, String name) throws IdentityException + { + ldapRoleModule.updateDisplayName(ldapr, name); + + cacheService.invalidateRole(ldapr); + } + + public LDAPRoleImpl createRoleInstance(Attributes attrs, String dn) throws IdentityException + { + return ldapRoleModule.createRoleInstance(attrs, dn); + } + + public Role findRoleByDN(String dn) throws IdentityException, IllegalArgumentException + { + return ldapRoleModule.findRoleByDN(dn); + } + + +} Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedLDAPUserModuleWrapper.java 2008-05-21 14:11:59 UTC (rev 10792) @@ -0,0 +1,168 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.UserModule; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.NoSuchUserException; +import org.jboss.portal.identity.IdentityContext; +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.Role; +import org.jboss.portal.identity.ldap.LDAPUserModule; +import org.jboss.portal.identity.ldap.LDAPUserImpl; +import org.jboss.portal.identity.ldap.LDAPConnectionContext; +import org.jboss.portal.identity.service.IdentityModuleService; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import java.util.Set; +import java.util.List; +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CachedLDAPUserModuleWrapper extends LDAPUserModule implements UserModule +{ + private LDAPUserModule userModule; + + private IdentityCacheService cacheService; + + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(CachedLDAPUserModuleWrapper.class); + + public CachedLDAPUserModuleWrapper(LDAPUserModule userModule, IdentityCacheService cacheService) + { + this.userModule = userModule; + this.cacheService = cacheService; + } + + + public User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + if (userName == null) + { + throw new IllegalArgumentException("UserName cannot be null"); + } + + User user = cacheService.findUserByUserName(userName); + + if (user != null) + { + return user; + } + + user = userModule.findUserByUserName(userName); + + cacheService.storeUser(user); + + return user; + } + + public User findUserById(Object id) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + if (id == null) + { + throw new IllegalArgumentException("User id cannot be null"); + } + + User user = cacheService.findUserById(id); + + if (user != null) + { + return user; + } + + user = userModule.findUserById(id); + + cacheService.storeUser(user); + + return user; + } + + public User findUserById(String id) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + return findUserById((Object)id); + } + + public User createUser(String userName, String password) throws IdentityException, IllegalArgumentException + { + return userModule.createUser(userName, password); + } + + public void removeUser(Object id) throws IdentityException, IllegalArgumentException + { + userModule.removeUser(id); + + // Invalidate this user in cache + User user = cacheService.findUserById(id); + if (user != null) + { + cacheService.invalidateUser(user); + } + } + + public Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException + { + return userModule.findUsers(offset, limit); + } + + public Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException + { + return userModule.findUsersFilteredByUserName(filter, offset, limit); + } + + public int getUserCount() throws IdentityException, IllegalArgumentException + { + return userModule.getUserCount(); + } + + public List searchUsers(String filter, Object[] filterArgs) throws NamingException, IdentityException + { + return userModule.searchUsers(filter, filterArgs); + } + + public void updatePassword(LDAPUserImpl ldapu, String password) throws IdentityException + { + userModule.updatePassword(ldapu, password); + } + + public boolean validatePassword(LDAPUserImpl ldapu, String password) throws IdentityException + { + return userModule.validatePassword(ldapu, password); + } + + // Methods of LDAPUserModule - need to delegate for compatibility + public LDAPUserImpl createUserInstance(Attributes attrs, String dn) throws IdentityException + { + return userModule.createUserInstance(attrs, dn); + } + + public User findUserByDN(String dn) throws IdentityException, IllegalArgumentException, NoSuchUserException + { + return userModule.findUserByDN(dn); + } + + +} Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/CachedUserProfileModuleWrapper.java 2008-05-21 14:11:59 UTC (rev 10792) @@ -0,0 +1,95 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.info.ProfileInfo; +import org.jboss.logging.Logger; + +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class CachedUserProfileModuleWrapper implements UserProfileModule +{ + + private static final Logger log = Logger.getLogger(CachedUserProfileModuleWrapper.class); + + private UserProfileModule userProfileModule; + + private IdentityCacheService cacheService; + + public CachedUserProfileModuleWrapper(UserProfileModule userProfileModule, IdentityCacheService identityCacheService) + { + this.userProfileModule = userProfileModule; + this.cacheService = identityCacheService; + } + + public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException + { + // Just grab the whole profile and check if this property is there + + Map profile = this.getProperties(user); + + if (profile != null && profile.containsKey(propertyName)) + { + + return profile.get(propertyName); + } + + // else delegate to the wrapped implementation + + return userProfileModule.getProperty(user, propertyName); + + } + + public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException + { + userProfileModule.setProperty(user, name, property); + cacheService.invalidateProfile(user); + + } + + public Map getProperties(User user) throws IdentityException, IllegalArgumentException + { + Map profile = cacheService.findUserProfileById(user.getId()); + + if (profile != null) + { + return profile; + } + + profile = userProfileModule.getProperties(user); + cacheService.storeProfile(user, profile); + return profile; + } + + public ProfileInfo getProfileInfo() throws IdentityException + { + return userProfileModule.getProfileInfo(); + } +} Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/cache/IdentityCacheService.java 2008-05-21 14:11:59 UTC (rev 10792) @@ -0,0 +1,258 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, 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.core.identity.cache; + +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.Role; + +import java.util.Map; +import java.util.HashMap; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class IdentityCacheService +{ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(IdentityCacheService.class); + + public final static String JNDI_NAME = "java:portal/IdentityCacheService"; + + protected ThreadLocal<Map<String, User>> userNameCache = new ThreadLocal<Map<String, User>>(); + + protected ThreadLocal<Map<Object, User>> userIdCache = new ThreadLocal<Map<Object, User>>(); + + protected ThreadLocal<Map<Object, Map>> profileCache = new ThreadLocal<Map<Object, Map>>(); + + protected ThreadLocal<Map<String, Role>> roleNameCache = new ThreadLocal<Map<String, Role>>(); + + protected ThreadLocal<Map<Object, Role>> roleIdCache = new ThreadLocal<Map<Object, Role>>(); + + + public void cleanup() + { + userNameCache.set(null); + userIdCache.set(null); + profileCache.set(null); + roleNameCache.set(null); + roleIdCache.set(null); + + log.debug("Identity cache invalidated"); + } + + private Map<String, User> getUserNameCache() + { + if (userNameCache.get() == null) + { + userNameCache.set(new HashMap<String, User>()); + } + return userNameCache.get(); + } + + private Map<Object, User> getUserIdCache() + { + if (userIdCache.get() == null) + { + userIdCache.set(new HashMap<Object, User>()); + } + return userIdCache.get(); + } + + private Map<Object, Map> getProfileCache() + { + if (profileCache.get() == null) + { + profileCache.set(new HashMap<Object, Map>()); + } + return profileCache.get(); + } + + private Map<String, Role> getRoleNameCache() + { + if (roleNameCache.get() == null) + { + roleNameCache.set(new HashMap<String, Role>()); + } + return roleNameCache.get(); + } + + private Map<Object, Role> getRoleIdCache() + { + if (roleIdCache.get() == null) + { + roleIdCache.set(new HashMap<Object, Role>()); + } + return roleIdCache.get(); + } + + public void storeUser(User user) + { + // We want to be transparent so just ignore null argument + if (user != null) + { + getUserIdCache().put(user.getId(), user); + getUserNameCache().put(user.getUserName(), user); + + if (log.isDebugEnabled()) + { + log.debug("User cached for id=" + user.getId() + "; username=" + user.getUserName()); + } + } + } + + public void invalidateUser(User user) + { + // We want to be transparent so just ignore null argument + if (user != null) + { + getUserIdCache().put(user.getId(), null); + getUserNameCache().put(user.getUserName(), null); + + if (log.isDebugEnabled()) + { + log.debug("User invalidated in cache for id=" + user.getId() + "; username=" + user.getUserName()); + } + } + } + + public void storeProfile(User user, Map profile) + { + // We want to be transparent so just ignore null argument + if (user != null && profile != null) + { + getProfileCache().put(user.getId(), profile); + + if (log.isDebugEnabled()) + { + log.debug("User profile cached for id=" + user.getId()); + } + } + } + + + public void invalidateProfile(User user) + { + // We want to be transparent so just ignore null argument + if (user != null) + { + getProfileCache().put(user.getId(), null); + + if (log.isDebugEnabled()) + { + log.debug("User profile invalidated in cache for id=" + user.getId()); + } + } + } + + public void storeRole(Role role) + { + // We want to be transparent so just ignore null argument + if (role != null) + { + getRoleIdCache().put(role.getId(), role); + getRoleNameCache().put(role.getName(), role); + + if (log.isDebugEnabled()) + { + log.debug("Role cached for id=" + role.getId() + "; name=" + role.getName()); + } + } + } + + public void invalidateRole(Role role) + { + // We want to be transparent so just ignore null argument + if (role != null) + { + getRoleIdCache().put(role.getId(), null); + getRoleNameCache().put(role.getName(), null); + + if (log.isDebugEnabled()) + { + log.debug("Role invalidated in cache for id=" + role.getId() + "; name=" + role.getName()); + } + } + } + + public User findUserByUserName(String userName) + { + User user = getUserNameCache().get(userName); + + if (user != null && log.isDebugEnabled()) + { + log.debug("User retreived from cache for username=" + user.getUserName()); + } + + return user; + } + + public User findUserById(Object id) + { + User user = getUserIdCache().get(id); + + if (user != null && log.isDebugEnabled()) + { + log.debug("User retreived from cache for id=" + user.getId()); + } + + return user; + } + + public Map findUserProfileById(Object id) + { + Map profile = getProfileCache().get(id); + + if (profile != null && log.isDebugEnabled()) + { + log.debug("User profile retreived from cache for user id=" + id); + } + + return profile; + } + + public Role findRoleByName(String roleName) + { + Role role = getRoleNameCache().get(roleName); + + if (role != null && log.isDebugEnabled()) + { + log.debug("Role retreived from cache for name=" + role.getName()); + } + + return role; + } + + public Role findRoleById(Object id) + { + Role role = getRoleIdCache().get(id); + + if (role != null && log.isDebugEnabled()) + { + log.debug("Role retreived from cache for id=" + role.getId()); + } + + return role; + } + + +} Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2008-05-21 13:27:04 UTC (rev 10791) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/service/IdentityServiceControllerImpl.java 2008-05-21 14:11:59 UTC (rev 10792) @@ -30,16 +30,31 @@ import org.jboss.portal.identity.IdentityException; import org.jboss.portal.identity.IdentityServiceController; import org.jboss.portal.identity.ServiceJNDIBinder; +import org.jboss.portal.identity.UserModule; +import org.jboss.portal.identity.UserProfileModule; +import org.jboss.portal.identity.DelegatingUserProfileModuleImpl; +import org.jboss.portal.identity.RoleModule; +import org.jboss.portal.identity.ldap.LDAPUserModule; +import org.jboss.portal.identity.ldap.LDAPUserProfileModule; +import org.jboss.portal.identity.ldap.LDAPRoleModule; import org.jboss.portal.identity.boot.IdentityServiceLoader; import org.jboss.portal.identity.event.IdentityEvent; import org.jboss.portal.identity.event.IdentityEventBroadcaster; import org.jboss.portal.identity.metadata.service.IdentityServicesMetaData; +import org.jboss.portal.identity.metadata.service.ModuleServiceMetaData; +import org.jboss.portal.identity.metadata.config.ModuleMetaData; import org.jboss.portal.identity.service.IdentityConfigurationService; +import org.jboss.portal.identity.service.UserProfileModuleService; import org.jboss.portal.jems.as.JNDI; import org.jboss.portal.jems.as.system.AbstractJBossService; import org.jboss.portal.jems.as.system.JBossServiceModelMBean; +import org.jboss.portal.core.identity.cache.CachedLDAPUserModuleWrapper; +import org.jboss.portal.core.identity.cache.IdentityCacheService; +import org.jboss.portal.core.identity.cache.CachedUserProfileModuleWrapper; +import org.jboss.portal.core.identity.cache.CachedLDAPRoleModuleWrapper; import javax.management.ObjectName; +import java.util.List; /** * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> @@ -64,6 +79,8 @@ private IdentityEventBroadcaster identityEventBroadcaster; + private boolean ldapIdentityCache = true; + /** . */ protected Kernel kernel; @@ -154,6 +171,209 @@ serviceLoader.bootstrapModules(servicesMetaData.getModuleServices().getModulesList()); + UserModule userModule = (UserModule)identityContext.getObject(IdentityContext.TYPE_USER_MODULE); + + RoleModule roleModule = (RoleModule)identityContext.getObject(IdentityContext.TYPE_ROLE_MODULE); + + UserProfileModule userProfileModule = (UserProfileModule)identityContext.getObject(IdentityContext.TYPE_USER_PROFILE_MODULE); + + + // For performance reasons we inject a wrapper around some identity modules to cache the calls. This is optional + // and apply only to LDAP implementation of modules. Cache is request scoped and invalidated in server interceptor + // IdentityCacheInterceptor + + if (isLdapIdentityCache()) + { + ServiceJNDIBinder binder = new SimpleServiceJNDIBinder(); + + IdentityCacheService cacheService = new IdentityCacheService(); + + binder.bind(IdentityCacheService.JNDI_NAME, cacheService); + + List modules = servicesMetaData.getModuleServices().getModulesList(); + + if (userModule instanceof LDAPUserModule) + { + LDAPUserModule ldapUserModule = (LDAPUserModule)userModule; + + // Unregister in IdentityContext + + identityContext.unregister(IdentityContext.TYPE_USER_MODULE); + + // Unregister in JNDI + + binder.unbind(ldapUserModule.getJNDIName()); + + // Un/egister mbean + + String serviceName = null; + + // Discover serviceName for this module type + + for (Object moduleData : modules) + { + ModuleServiceMetaData moduleService = (ModuleServiceMetaData)moduleData; + ModuleMetaData module = moduleService.getModuleData(); + + if (module.getType().equals(ldapUserModule.getModuleType())) + { + serviceName = module.getServiceName(); + break; + } + } + + // If we have the service name then follow with registration + + if (serviceName != null) + { + // Unregister + + ObjectName on = new ObjectName(serviceName); + if (getServer().isRegistered(on)) + { + getServer().unregisterMBean(on); + } + } + + + CachedLDAPUserModuleWrapper userModuleWrapper = new CachedLDAPUserModuleWrapper((LDAPUserModule)userModule, cacheService); + + // Register wrapper + identityContext.register(userModuleWrapper, ldapUserModule.getModuleType()); + binder.bind(ldapUserModule.getJNDIName(), userModuleWrapper); + + if (serviceName != null) + { + // Register + + JBossServiceModelMBean mbean = new JBossServiceModelMBean(userModuleWrapper); + getServer().registerMBean(mbean, new ObjectName(serviceName)); + } + + } + + if (roleModule instanceof LDAPRoleModule) + { + LDAPRoleModule ldapRoleModule = (LDAPRoleModule)roleModule; + + // Unregister in IdentityContext + + identityContext.unregister(IdentityContext.TYPE_ROLE_MODULE); + + // Unregister in JNDI + + binder.unbind(ldapRoleModule.getJNDIName()); + + // Un/egister mbean + + String serviceName = null; + + // Discover serviceName for this module type + + for (Object moduleData : modules) + { + ModuleServiceMetaData moduleService = (ModuleServiceMetaData)moduleData; + ModuleMetaData module = moduleService.getModuleData(); + + if (module.getType().equals(ldapRoleModule.getModuleType())) + { + serviceName = module.getServiceName(); + break; + } + } + + // If we have the service name then follow with registration + + if (serviceName != null) + { + // Unregister + + ObjectName on = new ObjectName(serviceName); + if (getServer().isRegistered(on)) + { + getServer().unregisterMBean(on); + } + } + + + CachedLDAPRoleModuleWrapper roleModuleWrapper = new CachedLDAPRoleModuleWrapper((LDAPRoleModule)roleModule, cacheService); + + // Register wrapper + identityContext.register(roleModuleWrapper, ldapRoleModule.getModuleType()); + binder.bind(ldapRoleModule.getJNDIName(), roleModuleWrapper); + + if (serviceName != null) + { + // Register + + JBossServiceModelMBean mbean = new JBossServiceModelMBean(roleModuleWrapper); + getServer().registerMBean(mbean, new ObjectName(serviceName)); + } + + } + + if (userProfileModule instanceof LDAPUserProfileModule || + userProfileModule instanceof DelegatingUserProfileModuleImpl) + { + UserProfileModuleService profileModuleService = (UserProfileModuleService)userProfileModule; + + // Unregister in IdentityContext + + identityContext.unregister(IdentityContext.TYPE_USER_PROFILE_MODULE); + + // Unregister in JNDI + + binder.unbind(profileModuleService.getJNDIName()); + + // Un/egister mbean + + String serviceName = null; + + // Discover serviceName for this module type + + for (Object moduleData : modules) + { + ModuleServiceMetaData moduleService = (ModuleServiceMetaData)moduleData; + ModuleMetaData module = moduleService.getModuleData(); + + if (module.getType().equals(profileModuleService.getModuleType())) + { + serviceName = module.getServiceName(); + break; + } + } + + // If we have the service name then follow with registration + + if (serviceName != null) + { + // Unregister + + ObjectName on = new ObjectName(serviceName); + if (getServer().isRegistered(on)) + { + getServer().unregisterMBean(on); + } + } + + CachedUserProfileModuleWrapper userProfileModuleWrapper = new CachedUserProfileModuleWrapper(userProfileModule, cacheService); + + // Register wrapper + + identityContext.register(userProfileModuleWrapper, profileModuleService.getModuleType()); + binder.bind(profileModuleService.getJNDIName(), userProfileModuleWrapper); + + if (serviceName != null) + { + // Register + + JBossServiceModelMBean mbean = new JBossServiceModelMBean(userProfileModuleWrapper); + getServer().registerMBean(mbean, new ObjectName(serviceName)); + } + + } + } + } catch (Throwable e) { @@ -257,4 +477,14 @@ { this.identityEventBroadcaster = identityEventBroadcaster; } + + public boolean isLdapIdentityCache() + { + return ldapIdentityCache; + } + + public void setLdapIdentityCache(boolean ldapIdentityCache) + { + this.ldapIdentityCache = ldapIdentityCache; + } } Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-05-21 13:27:04 UTC (rev 10791) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-05-21 14:11:59 UTC (rev 10792) @@ -155,6 +155,13 @@ <xmbean/> </mbean> <mbean + code="org.jboss.portal.core.aspects.server.IdentityCacheInterceptor" + name="portal:service=Interceptor,type=Server,name=IdentityCache" + xmbean-dd="" + xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> + <xmbean/> + </mbean> + <mbean code="org.jboss.portal.server.impl.invocation.JBossInterceptorStackFactory" name="portal:service=InterceptorStackFactory,type=Server" xmbean-dd="" @@ -163,6 +170,7 @@ <depends-list optional-attribute-name="InterceptorNames"> <depends-list-element>portal:service=Interceptor,type=Server,name=SessionLock</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=Transaction</depends-list-element> + <depends-list-element>portal:service=Interceptor,type=Server,name=IdentityCache</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=UserEvent</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=SessionInvalidator</depends-list-element> <depends-list-element>portal:service=Interceptor,type=Server,name=User</depends-list-element> Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/login-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/login-config.xml 2008-05-21 13:27:04 UTC (rev 10791) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/login-config.xml 2008-05-21 14:11:59 UTC (rev 10792) @@ -33,20 +33,19 @@ </authentication> </application-policy> - <application-policy name="portal"> - <authentication> + <application-policy name="portal"> + <authentication> -  - <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required"> - <module-option name="unauthenticatedIdentity">guest</module-option> - <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> - <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option> - <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option> - <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option> - <module-option name="additionalRole">Authenticated</module-option> - <module-option name="password-stacking">useFirstPass</module-option> - </login-module> +  + <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required"> + <module-option name="unauthenticatedIdentity">guest</module-option> + <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option> + <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option> + <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option> + <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option> + <module-option name="additionalRole">Authenticated</module-option> + </login-module> <!--Use can use this module instead of IdentityLoginModule to bind to LDAP. It simply extends JBossSX LdapExtLoginModule so all configuration that can be applied to LdapExtLoginModule also can be applied here. For user that

18 years

1
0
0 / 0

JBoss Portal SVN: r10791 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-21 09:27:04 -0400 (Wed, 21 May 2008) New Revision: 10791 Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java Log: Small API change to be able to wrap this object Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java 2008-05-21 08:46:06 UTC (rev 10790) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPRoleModule.java 2008-05-21 13:27:04 UTC (rev 10791) @@ -104,7 +104,7 @@ - protected LDAPRoleImpl createRoleInstance(Attributes attrs, String dn) throws IdentityException + public LDAPRoleImpl createRoleInstance(Attributes attrs, String dn) throws IdentityException { LDAPRoleImpl ldapr = null; try

18 years

1
0
0 / 0

JBoss Portal SVN: r10790 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-war/WEB-INF and 11 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-21 04:46:06 -0400 (Wed, 21 May 2008) New Revision: 10790 Added: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/catalog/ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/catalog/CatalogPortlet.java branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog/ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portal-lib.tld branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/web.xml Removed: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/portlet/catalog/ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/portlet/role/ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/portlet/user/ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/ Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java branches/JBoss_Portal_Branch_2_7/core-samples/.classpath branches/JBoss_Portal_Branch_2_7/core-samples/build.xml branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml Log: - Removed obsolete User and Role portlets - Move Catalog portlet in core-samples Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jboss-portlet.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -27,50 +27,6 @@ <portlet-app> <portlet> - <portlet-name>UserPortlet</portlet-name> - <transaction> - <trans-attribute>Required</trans-attribute> - </transaction> - <portlet-info> - <icon> - <small-icon>/images/portletIcon_Users.gif</small-icon> - <large-icon>/images/portletIcon_Users.gif</large-icon> - </icon> - </portlet-info> - </portlet> - <portlet> - <portlet-name>RolePortlet</portlet-name> - <transaction> - <trans-attribute>Required</trans-attribute> - </transaction> - <header-content> - <script type="text/javascript" language="javascript"> - function hideShow(id) - { - var navpoint = document.getElementById(id); - if (navpoint.className == 'hidden') { - navpoint.className = 'shown'; - } else { - navpoint.className = 'hidden'; - } - } - </script> - </header-content> - <portlet-info> - <icon> - <small-icon>/images/portletIcon_Users.gif</small-icon> - <large-icon>/images/portletIcon_Users.gif</large-icon> - </icon> - </portlet-info> - </portlet> - - <portlet> - <portlet-name>CatalogPortlet</portlet-name> - <transaction> - <trans-attribute>Required</trans-attribute> - </transaction> - </portlet> - <portlet> <portlet-name>PortletContentEditorPortlet</portlet-name> <transaction> <trans-attribute>RequiresNew</trans-attribute> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet-instances.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -29,30 +29,6 @@ <deployments> <deployment> <instance> - <display-name xml:lang="en">User portlet</display-name> - <display-name xml:lang="fr">Portlet utilisateur</display-name> - <instance-id>UserPortletInstance</instance-id> - <portlet-ref>UserPortlet</portlet-ref> - </instance> - </deployment> - <deployment> - <instance> - <display-name xml:lang="en">Role portlet</display-name> - <display-name xml:lang="fr">Portlet role</display-name> - <instance-id>RolePortletInstance</instance-id> - <portlet-ref>RolePortlet</portlet-ref> - </instance> - </deployment> - <deployment> - <instance> - <display-name xml:lang="en">Catalog portlet</display-name> - <display-name xml:lang="fr">Portlet catalogue</display-name> - <instance-id>CatalogPortletInstance</instance-id> - <portlet-ref>CatalogPortlet</portlet-ref> - </instance> - </deployment> - <deployment> - <instance> <instance-id>PortletContentEditorInstance</instance-id> <portlet-ref>PortletContentEditorPortlet</portlet-ref> <security-constraint> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -28,89 +28,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0"> <portlet> - <description>Portlet providing user login/logout and profile management</description> - <portlet-name>UserPortlet</portlet-name> - <display-name>User Portlet</display-name> - <portlet-class>org.jboss.portal.core.ui.portlet.user.UserPortlet</portlet-class> - <init-param> - <description>Whether we should use ssl on login and throughout the Portal. 1=yes;0=no</description> - <name>useSSL</name> - <value>0</value> - </init-param> - <init-param> - <description>Subscription mode</description> - <name>subscriptionMode</name> - <value>automatic</value> -  - </init-param> - <init-param> - <description>Domain of your website for email verification.</description> - <name>emailDomain</name> - <value>JBoss.com</value> - </init-param> - <init-param> - <description>Email displayed in the TO field</description> - <name>emailFrom</name> - <value>jbossportal(a)example.com</value> - </init-param> - <init-param> - <description>Default role of registered users</description> - <name>defaultRole</name> - <value>User</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>es</supported-locale> - <resource-bundle>Resource</resource-bundle> - <portlet-info> - <title>User portlet</title> - <keywords>management,admin</keywords> - </portlet-info> - <security-role-ref> - <role-name>Admin</role-name> - </security-role-ref> - </portlet> - <portlet> - <description>Portlet for managing user roles</description> - <portlet-name>RolePortlet</portlet-name> - <display-name>User Roles Portlet</display-name> - <portlet-class>org.jboss.portal.core.ui.portlet.role.RolePortlet</portlet-class> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <supported-locale>es</supported-locale> - <resource-bundle>Resource</resource-bundle> - <portlet-info> - <title>Role management</title> - <keywords>management,admin</keywords> - </portlet-info> - <security-role-ref> - <role-name>Admin</role-name> - </security-role-ref> - </portlet> - <portlet> - <description>Portlet providing navigable list of portal pages</description> - <portlet-name>CatalogPortlet</portlet-name> - <display-name>Portal Pages Catalog Portlet</display-name> - <portlet-class>org.jboss.portal.core.ui.portlet.catalog.CatalogPortlet</portlet-class> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <portlet-info> - <title>Catalog</title> - </portlet-info> - </portlet> - <portlet> <description>Portlet Content Editor</description> <portlet-name>PortletContentEditorPortlet</portlet-name> <display-name>Portlet Content Editor</display-name> Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java (from rev 10789, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortletConstants.java) =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/UserPortletConstants.java 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,119 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.core.identity; + +/** @author <a href="theute(a)jboss.org">Thomas Heute</a> $Revision$ */ +public class UserPortletConstants +{ + + public static final String SALT = "14m1r0nm4n"; + + public static final String INFOMESSAGE = "infomessage"; + public static final String ERRORMESSAGE = "errormessage"; + + // Cookie names + public static String CK_USERNAME = "username"; + public static String CK_PASS = "password"; + + // Default values + public static int DEFAULT_USERSPERPAGE = 10; + + // Status return codes for the login. + public static final int LOGIN_STATUS_OK = 0; + public static final int LOGIN_STATUS_BAD_PASSWORD = 1; + public static final int LOGIN_STATUS_NO_SUCH_USER = 2; + public static final int LOGIN_STATUS_USER_DISABLED = 3; + public static final int LOGIN_STATUS_INVALID_NAME = 4; + public static final int LOGIN_STATUS_UNEXPECTED_ERROR = 5; + + public static final int PERMANENT_USER_MAX_INACTIVE = 60 * 60 * 24 * 5 * 1000; // 5 days in ms + public static final int TRANSIENT_USER_MAX_INACTIVE = 60 * 60; // 1 hours in seconds + + public static final String HASH = "hash"; + public static final String USERID = "userid"; + + // Portlet configuration + + public static final String EMAILFROM = "emailFrom"; + public static final String SUBSCRIPTIONMODE = "subscriptionMode"; + public static final String SUBSCRIPTIONMODE_AUTOMATIC = "automatic"; + public static final String SUBSCRIPTIONMODE_EMAILVERIFICATION = "emailVerification"; + public static final String DEFAULT_ROLE = "defaultRole"; + + /** Timezone information : ((value + 1) * 2) - 1 = 2 * value + 1 */ + public static final String[] TIME_ZONE_OFFSETS = + { + "(GMT -12:00 hours) Eniwetok, Kwajalein", + null, + "(GMT -11:00 hours) Midway Island, Samoa", + null, + "(GMT -10:00 hours) Hawaii", + null, + "(GMT -9:00 hours) Alaska", + null, + "(GMT -8:00 hours) Pacific Time (US & Canada)", + null, + "(GMT -7:00 hours) Mountain Time (US & Canada)", + null, + "(GMT -6:00 hours) Central Time (US & Canada), Mexico City", + null, + "(GMT -5:00 hours) Eastern Time (US & Canada), Bogota, Lima, Quito", + null, + "(GMT -4:00 hours) Atlantic Time (Canada), Caracas, La Paz", + "(GMT -3:30 hours) Newfoundland", + "(GMT -3:00 hours) Brazil, Buenos Aires, Georgetown", + null, + "(GMT -2:00 hours) Mid-Atlantic", + null, + "(GMT -1:00 hours) Azores, Cape Verde Islands", + null, + "(GMT) Western Europe Time, London, Lisbon, Casablanca, Monrovia", + null, + "(GMT +1:00 hours) CET(Central Europe Time), Brussels, Copenhagen, Madrid, Paris", + null, + "(GMT +2:00 hours) EET(Eastern Europe Time), Kaliningrad, South Africa", + null, + "(GMT +3:00 hours) Baghdad, Kuwait, Riyadh, Moscow, St. Petersburg", + "(GMT +3:30 hours) Tehran", + "(GMT +4:00 hours) Abu Dhabi, Muscat, Baku, Tbilisi", + "(GMT +4:30 hours) Kabul", + "(GMT +5:00 hours) Ekaterinburg, Islamabad, Karachi, Tashkent", + "(GMT +5:30 hours) Bombay, Calcutta, Madras, New Delhi", + "(GMT +6:00 hours) Almaty, Dhaka, Colombo", + null, + "(GMT +7:00 hours) Bangkok, Hanoi, Jakarta", + null, + "(GMT +8:00 hours) Beijing, Perth, Singapore, Hong Kong, Chongqing, Urumqi, Taipei", + null, + "(GMT +9:00 hours) Tokyo, Seoul, Osaka, Sapporo, Yakutsk", + "(GMT +9:30 hours) Adelaide, Darwin", + "(GMT +10:00 hours) EAST(East Australian Standard)", + null, + "(GMT +11:00 hours) Magadan, Solomon Islands, New Caledonia", + null, + "(GMT +12:00 hours) Auckland, Wellington, Fiji, Kamchatka, Marshall Island", + null + }; + + public static final String DEFAULT_IMAGES_PATH = "images/user"; +} Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/faces/components/StaticValues.java 2008-05-21 08:46:06 UTC (rev 10790) @@ -34,7 +34,7 @@ import javax.portlet.PortletContext; import org.jboss.portal.common.i18n.LocaleManager; -import org.jboss.portal.core.ui.portlet.user.UserPortletConstants; +import org.jboss.portal.core.identity.UserPortletConstants; import org.jboss.portal.theme.PortalTheme; import org.jboss.portal.theme.ThemeInfo; import org.jboss.portal.theme.ThemeService; Modified: branches/JBoss_Portal_Branch_2_7/core-samples/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/.classpath 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core-samples/.classpath 2008-05-21 08:46:06 UTC (rev 10790) @@ -16,5 +16,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7/core-samples/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core-samples/build.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -126,6 +126,7 @@ <path refid="jboss.portal-core.classpath"/> <path refid="jboss.portal-format.classpath"/> <path refid="jboss.portal-api.classpath"/> + <path refid="jboss.portal-security.classpath"/> </path>  @@ -219,6 +220,15 @@ <fileset dir="${build.classes}" includes="org/jboss/portal/core/samples/jsp/**"/> </jar> +  + <copy todir="${build.resources}/portal-catalog-samples.war"> + <fileset dir="${build.resources}/portal-catalog-samples-war"/> + </copy> + <mkdir dir="${build.resources}/portal-catalog-samples.war/WEB-INF/lib/"/> + <jar jarfile="${build.resources}/portal-catalog-samples.war/WEB-INF/lib/portal-catalog-samples-lib.jar"> + <fileset dir="${build.classes}" includes="org/jboss/portal/core/samples/catalog/**"/> + </jar> +  <copy todir="${build.resources}/portal-news-samples.war"> <fileset dir="${source.bin}/portal-news-samples-war"/> @@ -272,6 +282,9 @@ dir="${build.resources}/portal-jsp-samples.war" tofile="${build.lib}/portal-jsp-samples.war"/> <implode + dir="${build.resources}/portal-catalog-samples.war" + tofile="${build.lib}/portal-catalog-samples.war"/> + <implode dir="${build.resources}/portal-news-samples.war" tofile="${build.lib}/portal-news-samples.war"/> <implode @@ -333,6 +346,8 @@ overwrite="true"/> <copy file="${build.lib}/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> + <copy file="${build.lib}/portal-catalog-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" + overwrite="true"/> <copy file="${build.lib}/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> <copy file="${build.lib}/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" @@ -349,9 +364,10 @@ <target name="undeploy" description="Undeploy." depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/> + <require file="${jboss.home}/server/${portal.deploy.dir}"/> + <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/> + <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-catalog-samples.war"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-users-samples.sar"/> Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/catalog/CatalogPortlet.java (from rev 10779, branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/portlet/catalog/CatalogPortlet.java) =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/catalog/CatalogPortlet.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/catalog/CatalogPortlet.java 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,201 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, 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.core.samples.catalog; + +import org.jboss.portal.api.node.PortalNode; +import org.jboss.portal.api.node.PortalNodeURL; +import org.jboss.portal.core.impl.api.node.PortalNodeImpl; +import org.jboss.portal.core.model.portal.PortalObjectPermission; +import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory; +import org.jboss.portlet.JBossPortlet; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossRenderResponse; + +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class CatalogPortlet + extends JBossPortlet +{ + /** . */ + private static final String RESOURCE_PREFIX = "PAGENAME_"; + + private PortalAuthorizationManagerFactory portalAuthorizationManagerFactory; + + public void init() throws PortletException + { + portalAuthorizationManagerFactory = (PortalAuthorizationManagerFactory)getPortletContext().getAttribute("PortalAuthorizationManagerFactory"); + + if (portalAuthorizationManagerFactory == null) + { + throw new PortletException("No portal authorization manager factory"); + } + } + + public void destroy() + { + super.destroy(); + + portalAuthorizationManagerFactory = null; + } + + public void render(JBossRenderRequest req, JBossRenderResponse resp) throws IOException + { + resp.setContentType("text/html"); + + PortalNode current = req.getPortalNode(); +// WindowState ws = req.getWindowState(); +// if(WindowState.MAXIMIZED.equals(ws)) +// { +// resp.setTitle("Sitemap"); +// PortalNode parent = current.getParent(); +// req.setAttribute("parentNode", parent); +// try +// { +// PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/catalog/sitemap.jsp"); +// prd.include(req, resp); +// } +// catch(Exception e) +// { +// e.printStackTrace(); +// } +// } +// else +// { + resp.setTitle("Pages"); + PortalNode parent = current.getParent(); + + HashMap parentsMap = new HashMap(); + PortalNode node = parent.getParent(); + while (node.getType() != PortalNode.TYPE_PORTAL) + { + parentsMap.put(localize(req.getLocale(), node.getName()), resp.createRenderURL(node)); + node = node.getParent(); + } + req.setAttribute("parents", parentsMap); + + try + { + req.setAttribute("parentNode", localize(req.getLocale(), parent.getName())); + + HashMap parentChildMap = new HashMap(); + HashMap parentSiblingMap = new HashMap(); + for (Iterator i = parent.getParent().getChildren().iterator(); i.hasNext();) + { + PortalNode parentSibling = (PortalNode)i.next(); + + // Display only sibling pages + if (parentSibling.getType() == PortalNode.TYPE_PAGE) + { + if (parentSibling.equals(parent)) + { + for (Iterator j = parent.getChildren().iterator(); j.hasNext();) + { + PortalNode child = (PortalNode)j.next(); + if (child.getType() == PortalNode.TYPE_PAGE) + { + boolean allowed = false; + // check if the current user is allowed to access this page + if (child instanceof PortalNodeImpl) + { + PortalNodeImpl pn = (PortalNodeImpl)child; + PortalObjectPermission perm = new PortalObjectPermission(pn.getObjectId(), PortalObjectPermission.VIEW_MASK); + if (portalAuthorizationManagerFactory.getManager().checkPermission(perm)) + { + allowed = true; + } + else + { + allowed = false; + } + } + if (allowed) + { + PortalNodeURL childURL = resp.createRenderURL(child); + parentChildMap.put(localize(req.getLocale(), child.getName()), childURL); + } + } + } + } + else + { + boolean allowed = false; + // check if the current user is allowed to access this page + if (parentSibling instanceof PortalNodeImpl) + { + PortalNodeImpl pn = (PortalNodeImpl)parentSibling; + PortalObjectPermission perm = new PortalObjectPermission(pn.getObjectId(), PortalObjectPermission.VIEW_MASK); + if (portalAuthorizationManagerFactory.getManager().checkPermission(perm)) + { + allowed = true; + } + else + { + allowed = false; + } + } + if (allowed) + { + PortalNodeURL parentSiblingURL = resp.createRenderURL(parentSibling); + parentSiblingMap.put(localize(req.getLocale(), parentSibling.getName()), parentSiblingURL); + } + } + } + } + req.setAttribute("pchild", parentChildMap); + req.setAttribute("psib", parentSiblingMap); + + PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/catalog/index.jsp"); + prd.include(req, resp); + } + catch (Exception e) + { + e.printStackTrace(); + } +// } + } + + private String localize(Locale locale, String name) + { + try + { + ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", locale, Thread.currentThread().getContextClassLoader()); + name = rb.getString(RESOURCE_PREFIX + name); + } + catch (MissingResourceException e) + { + } + return name; + } +} Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-05-21 07:02:16 UTC (rev 10789) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -26,6 +26,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="2.0"> + + <filter> + <filter-name>JBoss Portlet Filter</filter-name> + <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class> + <lifecycle>ACTION_PHASE</lifecycle> + <lifecycle>RENDER_PHASE</lifecycle> + </filter> + + <filter-mapping> + <filter-name>JBoss Portlet Filter</filter-name> + <portlet-name>TestPortlet</portlet-name> + <portlet-name>ModePortlet</portlet-name> + </filter-mapping> + <portlet> <description>Mode Portlet</description> <portlet-name>ModePortlet</portlet-name> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jboss-portlet.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jboss-portlet.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,42 @@ + + +<!DOCTYPE portlet-app PUBLIC + "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> + +<portlet-app> + <portlet> + <portlet-name>CatalogPortlet</portlet-name> + <transaction> + <trans-attribute>Required</trans-attribute> + </transaction> + </portlet> + + <service> + <service-name>PortalAuthorizationManagerFactory</service-name> + <service-class>org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory</service-class> + <service-ref>:service=PortalAuthorizationManagerFactory</service-ref> + </service> + +</portlet-app> \ No newline at end of file Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/jsp/catalog (from rev 10779, branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/catalog) Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portal-lib.tld =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portal-lib.tld (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portal-lib.tld 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,104 @@ + + +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" + version="2.0"> + <tlib-version>1.1</tlib-version> + <short-name>JBoss-Portal-tags</short-name> + + <tag> + <name>if</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IfTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>ctx</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>iterate</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IterateTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>ctx</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>include</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.IncludeTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>page</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>error</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <name>key</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>errors</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.ErrorsTag</tag-class> + <body-content>JSP</body-content> + </tag> + + <tag> + <name>success</name> + <tag-class>org.jboss.portal.core.servlet.jsp.taglib.SuccessTag</tag-class> + <body-content>JSP</body-content> + </tag> + <function> + <name>i18n</name> + <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class> + <function-signature>java.lang.String getMessage(java.lang.String)</function-signature> + </function> + + <function> + <name>out</name> + <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class> + <function-signature>java.lang.String out(java.lang.String)</function-signature> + </function> + + <function> + <name>i18nout</name> + <function-class>org.jboss.portal.core.servlet.jsp.taglib.PortalLib</function-class> + <function-signature>java.lang.String i18nOut(java.lang.String)</function-signature> + </function> + +</taglib> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet-instances.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,38 @@ +<?xml version="1.0" standalone="yes"?> + + +<!DOCTYPE deployments PUBLIC + "-//JBoss Portal//DTD Portlet Instances 2.6//EN" + "http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd"> + +<deployments> + <deployment> + <instance> + <display-name xml:lang="en">Catalog portlet</display-name> + <display-name xml:lang="fr">Portlet catalogue</display-name> + <instance-id>CatalogPortletInstance</instance-id> + <portlet-ref>CatalogPortlet</portlet-ref> + </instance> + </deployment> +</deployments> \ No newline at end of file Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/portlet.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<portlet-app + xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + + <filter> + <filter-name>JBoss Portlet Filter</filter-name> + <filter-class>org.jboss.portlet.filter.JBossPortletFilter</filter-class> + <lifecycle>ACTION_PHASE</lifecycle> + <lifecycle>RENDER_PHASE</lifecycle> + </filter> + + <filter-mapping> + <filter-name>JBoss Portlet Filter</filter-name> + <portlet-name>CatalogPortlet</portlet-name> + </filter-mapping> + + <portlet> + <description>Portlet providing navigable list of portal pages</description> + <portlet-name>CatalogPortlet</portlet-name> + <display-name>Portal Pages Catalog Portlet</display-name> + <portlet-class>org.jboss.portal.core.samples.catalog.CatalogPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + <portlet-info> + <title>Catalog</title> + </portlet-info> + </portlet> + </portlet-app> Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/web.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/web.xml 2008-05-21 08:46:06 UTC (rev 10790) @@ -0,0 +1,28 @@ +<?xml version="1.0"?> + + +<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" + "http://java.sun.com/dtd/web-app_2_3.dtd"> +<web-app> +</web-app> Property changes on: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-catalog-samples-war/WEB-INF/web.xml ___________________________________________________________________ Name: svn:executable + *

18 years

1
0
0 / 0

JBoss Portal SVN: r10789 - branches/JBoss_Portal_Branch_2_7/core.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-21 03:02:16 -0400 (Wed, 21 May 2008) New Revision: 10789 Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml Log: Oups Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-05-20 23:05:27 UTC (rev 10788) +++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-05-21 07:02:16 UTC (rev 10789) @@ -129,7 +129,6 @@  <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-format.classpath"/> <path refid="jboss.portal-server.classpath"/> <path refid="jboss.portal-registration.classpath"/> <path refid="jboss.portal-portlet-server.classpath"/> @@ -318,7 +317,6 @@ <copy todir="${build.resources}/jboss-portal/lib"> <fileset dir="${build.lib}" includes="portal-core-lib.jar"/> <fileset dir="${build.lib}" includes="jboss-portlet-api-lib.jar"/> - <fileset dir="${jboss.portal-format.root}/lib" includes="portal-format-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar,portal-common-portal-lib.jar"/> <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>

18 years

1
0
0 / 0

JBoss Portal SVN: r10788 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-war/WEB-INF/jsp/content and 3 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2008-05-20 19:05:27 -0400 (Tue, 20 May 2008) New Revision: 10788 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp Log: - Content integration: + Use content.uri again (not sure why it was changed) + Add namespace bound variable so that it can be accessed from JSF + Check the event name (though it doesn't seem to be properly called) + Use namespace in javascript in editPageLayout (there seems to be discrepancies with JSF and namespacing)... :( - Generification Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-05-20 22:12:48 UTC (rev 10787) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/ui/content/portlet/PortletContentEditorPortlet.java 2008-05-20 23:05:27 UTC (rev 10788) @@ -40,7 +40,6 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; import javax.xml.namespace.QName; - import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; @@ -65,6 +64,8 @@ /** . */ private InstanceContainer instanceContainer; + private static final QName CONTENT_SELECT = new QName("urn:jboss:portal:content", "select"); + private static final String CONTENT_URI = "content.uri"; public void init() throws PortletException { @@ -75,11 +76,11 @@ { if ((req.getPortletMode().equals(EDIT_CONTENT))) { - String uri = req.getParameter("content_uri"); + String uri = req.getParameter(CONTENT_URI); if (uri != null) { - resp.setRenderParameter("content_uri", uri); - resp.setEvent(new QName("urn:jboss:portal:content", "select"), uri); + resp.setRenderParameter(CONTENT_URI, uri); + resp.setEvent(CONTENT_SELECT, uri); } } } @@ -103,7 +104,7 @@ protected void getContent(RenderRequest req, RenderResponse resp, boolean newContent) throws PortletException, PortletSecurityException, IOException { - String selectedURI = req.getParameter("content_uri"); + String selectedURI = req.getParameter(CONTENT_URI); // resp.setContentType("text/html"); Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-20 22:12:48 UTC (rev 10787) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-20 23:05:27 UTC (rev 10788) @@ -133,7 +133,7 @@ %> <portlet:actionURL var="url"> <portlet:param name="content.action.select" value="true"/> - <portlet:param name="content_uri" value="<%= instance.getId() %>"/> + <portlet:param name="content.uri" value="<%= instance.getId() %>"/> </portlet:actionURL> <div style="display:none"> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java 2008-05-20 22:12:48 UTC (rev 10787) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/WindowComparator.java 2008-05-20 23:05:27 UTC (rev 10788) @@ -31,13 +31,11 @@ * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ */ -public class WindowComparator implements Comparator +public class WindowComparator implements Comparator<Window> { - public int compare(Object o1, Object o2) + public int compare(Window w1, Window w2) { - Window w1 = (Window)o1; - Window w2 = (Window)o2; int sign = getOrder(w1) - getOrder(w2); if (sign == 0) { Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2008-05-20 22:12:48 UTC (rev 10787) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2008-05-20 23:05:27 UTC (rev 10788) @@ -50,7 +50,9 @@ import javax.faces.event.AbortProcessingException; import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; +import javax.xml.namespace.QName; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.Iterator; @@ -80,6 +82,8 @@ /** . */ private static final int CONTENT_PARAM_PREFIX_LENGTH = CONTENT_PARAM_PREFIX.length(); + private static final QName CONTENT_SELECT = new QName("urn:jboss:portal:content", "select"); + /** . */ private static final int MOVE_UP = 'u'; @@ -91,6 +95,7 @@ /** . */ private static final int ADD_ACTION = 'a'; + private static final String VIEW_ROOT = ":_viewRoot"; public PageManagerBean(LayoutService layoutService, PortletInvoker portletInvoker) { @@ -124,12 +129,17 @@ /** . */ public Map selectedRenderParameters; + public String getNamespace() + { + return FacesContext.getCurrentInstance().getExternalContext().encodeNamespace("") + VIEW_ROOT; + } + public List getContentTypeItems() - { - LinkedList types = new LinkedList(); - for (Iterator i = ContentProviderRegistryService.getInstance().getContentTypes().iterator(); i.hasNext();) + { + LinkedList<SelectItem> types = new LinkedList<SelectItem>(); + for (Object o : ContentProviderRegistryService.getInstance().getContentTypes()) { - ContentType contentType = (ContentType)i.next(); + ContentType contentType = (ContentType)o; SelectItem item = new SelectItem(); item.setValue(contentType); item.setLabel(contentType.toString()); @@ -147,7 +157,7 @@ public ContentType getSelectedContentType() { - return selectedContentType; + return selectedContentType; } public void setSelectedContentType(ContentType selectedContentType) @@ -172,14 +182,14 @@ protected String createWindowName(String contentType, String contentURI, boolean appendNumber) { - String windowName = null; + String windowName; ContentProvider contentProvider = ContentProviderRegistryService.getInstance().getContentProvider(ContentType.create(contentType)); String instanceName = contentProvider.getPortletInfo().getPortletName(Mode.VIEW); - if(instanceName == null) + if (instanceName == null) { - // Content type portlet: use URI (PortletInstance) - windowName = contentURI; + // Content type portlet: use URI (PortletInstance) + windowName = contentURI; } else { @@ -188,9 +198,9 @@ appendNumber = true; windowName = instanceName; } - + // - if(windowName.indexOf("Instance") != -1) + if (windowName.indexOf("Instance") != -1) { // Replace the instance with window windowName = windowName.replace("Instance", "Window"); @@ -200,16 +210,16 @@ // Or just append window windowName = windowName + "Window"; } - + // if (appendNumber) { - // if the window already exists add a random number + // if the window already exists add a random number return windowName + "_" + (int)(100 * Math.random()); } else { - // Just the window without any number + // Just the window without any number return windowName; } } @@ -219,144 +229,149 @@ String id = event.getComponent().getId(); char direction = id.charAt(0); String regionName = id.substring(2); - + // Contains the names selected window in the UI List selectedWindows = (List)assignedWindows.values.get(regionName); - // Get the windows belonging to the selected region sorted by order - List windows = new ArrayList(); - for (Iterator i = page.getChildren(PortalObject.WINDOW_MASK).iterator(); i.hasNext();) + Collection<PortalObject> children = page.getChildren(PortalObject.WINDOW_MASK); + if (children != null) { - Window window = (Window)i.next(); - if (regionName.equals(window.getProperty(ThemeConstants.PORTAL_PROP_REGION))) - { - windows.add(window); - } - } - Collections.sort(windows, new WindowComparator()); - // - if (direction == MOVE_UP || direction == MOVE_DOWN) - { - // - int index = direction == MOVE_UP ? 1 : windows.size() - 2; - int length = windows.size() - 1; - int step = direction == MOVE_UP ? 1 : -1; - - // Perform swaps - while (length-- > 0) + // Get the windows belonging to the selected region sorted by order + List<Window> windows = new ArrayList<Window>(children.size()); + for (Object o : children) { - Window window = (Window)windows.get(index); - if (selectedWindows.contains(window.getName())) + Window window = (Window)o; + if (regionName.equals(window.getProperty(ThemeConstants.PORTAL_PROP_REGION))) { - Collections.swap(windows, index - step, index); + windows.add(window); } - index += step; } - } - else if (direction == ADD_ACTION) - { - if (selectedContentURI != null) + Collections.sort(windows, new WindowComparator()); + + // + if (direction == MOVE_UP || direction == MOVE_DOWN) { // - String selectedContentURI = this.selectedContentURI; - Map selectedContentParams = this.selectedContentParameters; + int index = direction == MOVE_UP ? 1 : windows.size() - 2; + int length = windows.size() - 1; + int step = direction == MOVE_UP ? 1 : -1; - // Reset to new state - this.selectedContentURI = null; - this.selectedContentParameters = null; - this.selectedRenderParameters = new HashMap(); - - // Obtain a window name - String windowName = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("blah"); - if (windowName.trim().length() == 0) + // Perform swaps + while (length-- > 0) { - windowName = createWindowName(selectedContentType.toString(), selectedContentURI, false); - while (page.getWindow(windowName) != null) + Window window = windows.get(index); + if (selectedWindows.contains(window.getName())) { - windowName = createWindowName(selectedContentType.toString(), selectedContentURI, true); + Collections.swap(windows, index - step, index); } + index += step; } - - // Check for duplicate window name - if (page.getWindow(windowName) != null) + } + else if (direction == ADD_ACTION) + { + if (selectedContentURI != null) { - FacesContext faces = FacesContext.getCurrentInstance(); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); - faces.addMessage("windowName", message); - throw new AbortProcessingException(); - } + // + String selectedContentURI = this.selectedContentURI; + Map selectedContentParams = this.selectedContentParameters; - // - try - { - Window window = page.createWindow(windowName, selectedContentType, selectedContentURI); - Content content = window.getContent(); - for (Iterator i = selectedContentParams.entrySet().iterator(); i.hasNext();) + // Reset to new state + this.selectedContentURI = null; + this.selectedContentParameters = null; + this.selectedRenderParameters = new HashMap(); + + // Obtain a window name + String windowName = (String)FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("blah"); + if (windowName.trim().length() == 0) { - Map.Entry entry = (Map.Entry)i.next(); - String paramName = (String)entry.getKey(); - String paramValue = (String)entry.getValue(); - content.setParameter(paramName, paramValue); + windowName = createWindowName(selectedContentType.toString(), selectedContentURI, false); + while (page.getWindow(windowName) != null) + { + windowName = createWindowName(selectedContentType.toString(), selectedContentURI, true); + } } + // Check for duplicate window name + if (page.getWindow(windowName) != null) + { + FacesContext faces = FacesContext.getCurrentInstance(); + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "Duplicate window name found on this page!", null); + faces.addMessage("windowName", message); + throw new AbortProcessingException(); + } + // - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, regionName); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); + try + { + Window window = page.createWindow(windowName, selectedContentType, selectedContentURI); + Content content = window.getContent(); + for (Object o : selectedContentParams.entrySet()) + { + Map.Entry<String,String> entry = (Map.Entry<String,String>)o; + String paramName = entry.getKey(); + String paramValue = entry.getValue(); + content.setParameter(paramName, paramValue); + } - // Sort windows - Collections.sort(windows, new WindowComparator()); + // + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_REGION, regionName); + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + Integer.MAX_VALUE); - // Add the created one - windows.add(window); + // Sort windows + Collections.sort(windows, new WindowComparator()); - // Update the order states - for (int i = 0; i < windows.size(); i++) + // Add the created one + windows.add(window); + + // Update the order states + for (int i = 0; i < windows.size(); i++) + { + Window tmp = windows.get(i); + tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); + } + + this.windowName = ""; + } + catch (DuplicatePortalObjectException unexpected) { - Window tmp = (Window)windows.get(i); - tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); + unexpected.printStackTrace(); } - - this.windowName = ""; } - catch (DuplicatePortalObjectException unexpected) + else { - unexpected.printStackTrace(); + FacesContext faces = FacesContext.getCurrentInstance(); + FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No content was selected!", null); + faces.addMessage("layoutForm", message); + throw new AbortProcessingException(); } } - else + else if (direction == MOVE_LEFT) { - FacesContext faces = FacesContext.getCurrentInstance(); - FacesMessage message = new FacesMessage(FacesMessage.SEVERITY_ERROR, "No content was selected!", null); - faces.addMessage("layoutForm", message); - throw new AbortProcessingException(); - } - } - else if (direction == MOVE_LEFT) - { - for (Iterator i = windows.iterator(); i.hasNext();) - { - Window window = (Window)i.next(); - if (selectedWindows.contains(window.getName())) + for (Iterator i = windows.iterator(); i.hasNext();) { - i.remove(); - try + Window window = (Window)i.next(); + if (selectedWindows.contains(window.getName())) { - page.destroyChild(window.getName()); + i.remove(); + try + { + page.destroyChild(window.getName()); + } + catch (NoSuchPortalObjectException ignore) + { + ignore.printStackTrace(); + } } - catch (NoSuchPortalObjectException ignore) - { - ignore.printStackTrace(); - } } } - } - // Update the order states - for (int i = 0; i < windows.size(); i++) - { - Window window = (Window)windows.get(i); - window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); + // Update the order states + for (int i = 0; i < windows.size(); i++) + { + Window window = windows.get(i); + window.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i); + } } // @@ -389,12 +404,17 @@ else if (event instanceof PortletEventEvent) { PortletEventEvent eventEvent = (PortletEventEvent)event; - // TODO: Check the QName of the event Event portletEvent = eventEvent.getEvent(); - String uri = (String)portletEvent.getPayload(); - this.selectedContentURI = uri; - // TODO: Get params from the payload (for widgets) - this.selectedContentParameters = new HashMap(); + QName name = portletEvent.getName(); + // only react to content selection events + if(CONTENT_SELECT.equals(name)) + { + String uri = (String)portletEvent.getPayload(); + this.selectedContentURI = uri; + + // TODO: Get params from the payload (for widgets) + this.selectedContentParameters = new HashMap(); + } } else if (event instanceof PortletActionEvent) { Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-05-20 22:12:48 UTC (rev 10787) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2008-05-20 23:05:27 UTC (rev 10788) @@ -38,7 +38,7 @@ </tr> <tr> <td> - <h:form id="abc"> + <h:form id="contentTypesForm"> <label for="instanceId" class="portlet-form-field-label-container"> <span class="portlet-form-field-label admin-label">Content Type:</span> <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/> @@ -46,8 +46,8 @@ id="instanceId" value="#{pageManager.selectedContentType}" styleClass="portlet-form-field contentType" - onchange="document.getElementById('abc:windowNameCopy').value = document.getElementsByClassName('id-window-name')[0].value; - document.getElementById('abc').submit(); "> + onchange="document.getElementById('#{pageManager.namespace}:contentTypesForm:windowNameCopy').value = document.getElementById('#{pageManager.namespace}:windowForm:windowName').value; + document.getElementById('#{pageManager.namespace}:contentTypesForm').submit(); "> <f:selectItems value="#{pageManager.contentTypeItems}"/> </h:selectOneMenu> </label> @@ -73,7 +73,7 @@ initialMode="edit_content" initialWindowState="normal" renderParameters="#{pageManager.selectedRenderParameters}" - onClick="url.setParameter('windowName', document.getElementsByClassName('id-window-name')[0].value);"/> + onClick="url.setParameter('windowName', document.getElementById('#{pageManager.namespace}:windowForm:windowName').value);"/> </td> </tr> </table> @@ -102,7 +102,7 @@ <tr> <td valign="top"> <h:commandButton - onclick="document.getElementById('blah').value=document.getElementsByClassName('id-window-name')[0].value" + onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}:windowForm:windowName').value" value="Add" id="a_#{regionName}" actionListener="#{pageManager.assignWindows}" styleClass="portlet-form-button layout-button"/>

18 years

1
0
0 / 0

JBoss Portal SVN: r10787 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-20 18:12:48 -0400 (Tue, 20 May 2008) New Revision: 10787 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java Log: reformatted using jboss formatter for eclipse Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2008-05-20 22:10:24 UTC (rev 10786) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UserActivity.java 2008-05-20 22:12:48 UTC (rev 10787) @@ -43,7 +43,7 @@ private long timestamp; private final int type; - + public final static String GUEST = "guest"; private UserActivity() @@ -96,7 +96,6 @@ return type; } - public boolean equals(Object o) { if (this == o) @@ -108,7 +107,7 @@ return false; } - UserActivity that = (UserActivity)o; + UserActivity that = (UserActivity) o; if (!id.equals(that.id) || !sessionId.equals(that.sessionId)) { @@ -121,7 +120,7 @@ public int hashCode() { int result; - result = id.hashCode()+sessionId.hashCode(); + result = id.hashCode() + sessionId.hashCode(); return result; } Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2008-05-20 22:10:24 UTC (rev 10786) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsService.java 2008-05-20 22:12:48 UTC (rev 10787) @@ -32,7 +32,7 @@ { public Set getActiveUsersIds(long period); - + public int getActiveSessionCount(long period); public Set getActiveUsersNames(long period); Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-05-20 22:10:24 UTC (rev 10786) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-05-20 22:12:48 UTC (rev 10787) @@ -48,243 +48,286 @@ * @version $Revision$ */ public class UsersActivityStatsServiceImpl extends AbstractJBossService - implements UsersActivityStatsService, NotificationListener { - /** Our logger. */ - private static final Logger log = Logger - .getLogger(UsersActivityStatsServiceImpl.class); + implements + UsersActivityStatsService, + NotificationListener +{ + /** Our logger. */ + private static final Logger log = Logger.getLogger(UsersActivityStatsServiceImpl.class); - // TODO: some value just to begin - find some good default - private int userTrackerThreadsNumber = 10; + // TODO: some value just to begin - find some good default + private int userTrackerThreadsNumber = 10; - private int updaterThreadsNumber = 1; + private int updaterThreadsNumber = 1; - private int updaterInterval = 1000; + private int updaterInterval = 1000; - private int activityQueueLimit = 1000; + private int activityQueueLimit = 1000; - private long activityTimeout = 1800000; + private long activityTimeout = 1800000; - private Executor userTrackerExecutor; + private Executor userTrackerExecutor; - private ScheduledExecutorService updaterExecutor; + private ScheduledExecutorService updaterExecutor; - private Queue activityQueue; + private Queue activityQueue; - private volatile Set activityResults = new HashSet(); + private volatile Set activityResults = new HashSet(); - private String activityBroadcasterName; + private String activityBroadcasterName; - public UsersActivityStatsServiceImpl() { - } + public UsersActivityStatsServiceImpl() + { + } - protected void startService() throws Exception { - super.startService(); + protected void startService() throws Exception + { + super.startService(); - activityQueue = new LinkedBlockingQueue(getActivityQueueLimit()); + activityQueue = new LinkedBlockingQueue(getActivityQueueLimit()); - userTrackerExecutor = Executors - .newFixedThreadPool(getUserTrackerThreadsNumber()); + userTrackerExecutor = Executors.newFixedThreadPool(getUserTrackerThreadsNumber()); - updaterExecutor = Executors - .newScheduledThreadPool(getUpdaterThreadsNumber()); + updaterExecutor = Executors.newScheduledThreadPool(getUpdaterThreadsNumber()); - updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), - getUpdaterInterval(), getUpdaterInterval(), - TimeUnit.MILLISECONDS); + updaterExecutor.scheduleWithFixedDelay(new Updater(activityQueue), getUpdaterInterval(), getUpdaterInterval(), + TimeUnit.MILLISECONDS); - if (activityBroadcasterName != null) { - server.addNotificationListener(new ObjectName( - activityBroadcasterName), this, null, null); - } else { - addNotificationListener(this, null, null); - } + if (activityBroadcasterName != null) + { + server.addNotificationListener(new ObjectName(activityBroadcasterName), this, null, null); + } + else + { + addNotificationListener(this, null, null); + } - } + } - protected void stopService() throws Exception { - super.stopService(); + protected void stopService() throws Exception + { + super.stopService(); - // /TODO: stop all the threads - } + // /TODO: stop all the threads + } - public Set getActiveUsersIds(long period) { - long currentTime = System.currentTimeMillis(); + public Set getActiveUsersIds(long period) + { + long currentTime = System.currentTimeMillis(); - Set results = new HashSet(); - for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity) iterator.next(); - if (currentTime - ua.getTimestamp() < period - && !ua.getId().equals(UserActivity.GUEST)) { - results.add(ua.getSessionId()); - } - } - return results; - } + Set results = new HashSet(); + for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) + { + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period && !ua.getId().equals(UserActivity.GUEST)) + { + results.add(ua.getSessionId()); + } + } + return results; + } - public int getActiveSessionCount(long period) { - long currentTime = System.currentTimeMillis(); + public int getActiveSessionCount(long period) + { + long currentTime = System.currentTimeMillis(); - int results = 0; - for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity) iterator.next(); - if (currentTime - ua.getTimestamp() < period - && ua.getId().equals(UserActivity.GUEST)) { - results++; - } - } - return results; - } + int results = 0; + for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) + { + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period && ua.getId().equals(UserActivity.GUEST)) + { + results++; + } + } + return results; + } - public Set getActiveUsersNames(long period) { - long currentTime = System.currentTimeMillis(); - Set results = new HashSet(); - for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity) iterator.next(); - if (currentTime - ua.getTimestamp() < period - && !ua.getId().equals(UserActivity.GUEST)) { - results.add(ua.getId()); - } - } - return results; - } + public Set getActiveUsersNames(long period) + { + long currentTime = System.currentTimeMillis(); + Set results = new HashSet(); + for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) + { + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period && !ua.getId().equals(UserActivity.GUEST)) + { + results.add(ua.getId()); + } + } + return results; + } - public Set getUsersActivities(long period) { - long currentTime = System.currentTimeMillis(); - Set results = new HashSet(); - for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) { - UserActivity ua = (UserActivity) iterator.next(); - if (currentTime - ua.getTimestamp() < period) { - results.add(ua); - } - } - return results; - } + public Set getUsersActivities(long period) + { + long currentTime = System.currentTimeMillis(); + Set results = new HashSet(); + for (Iterator iterator = activityResults.iterator(); iterator.hasNext();) + { + UserActivity ua = (UserActivity) iterator.next(); + if (currentTime - ua.getTimestamp() < period) + { + results.add(ua); + } + } + return results; + } - public void registerActivity(final UserActivity userActivity) { - try { - Notification notification = new Notification(Integer - .toString(userActivity.getType()), this.getServiceName(), - userActivity.getTimestamp(), userActivity.getTimestamp(), - userActivity.getId() + "_" + userActivity.getSessionId()); + public void registerActivity(final UserActivity userActivity) + { + try + { + Notification notification = new Notification(Integer.toString(userActivity.getType()), this.getServiceName(), + userActivity.getTimestamp(), userActivity.getTimestamp(), userActivity.getId() + "_" + + userActivity.getSessionId()); - if (activityBroadcasterName != null) { - log.debug("Broadcasting user activity notification "); + if (activityBroadcasterName != null) + { + log.debug("Broadcasting user activity notification "); - server.invoke(new ObjectName(activityBroadcasterName), - "sendNotification", new Object[] { notification }, - new String[] { Notification.class.getName() }); - } else { - log.debug("Sending local user activity notification "); - sendNotification(notification); - } + server.invoke(new ObjectName(activityBroadcasterName), "sendNotification", new Object[] + {notification}, new String[] + {Notification.class.getName()}); + } + else + { + log.debug("Sending local user activity notification "); + sendNotification(notification); + } - } catch (Exception e) { - log.error("Failed to send user activity notification: ", e); - } + } + catch (Exception e) + { + log.error("Failed to send user activity notification: ", e); + } - } + } - public void handleNotification(Notification notification, Object object) { - log.debug("Handling user activity notification "); - final UserActivity ac = new UserActivity(notification); + public void handleNotification(Notification notification, Object object) + { + log.debug("Handling user activity notification "); + final UserActivity ac = new UserActivity(notification); - FutureTask task = new FutureTask(new Callable() { - public Object call() throws Exception { + FutureTask task = new FutureTask(new Callable() + { + public Object call() throws Exception + { - boolean success = activityQueue.offer(ac); - if (log.isTraceEnabled()) { - if (!success) { - log - .trace("Failed track user activity - activityQueue is full "); - } - } - return null; - } - }); + boolean success = activityQueue.offer(ac); + if (log.isTraceEnabled()) + { + if (!success) + { + log.trace("Failed track user activity - activityQueue is full "); + } + } + return null; + } + }); - userTrackerExecutor.execute(task); - } + userTrackerExecutor.execute(task); + } - public int getUserTrackerThreadsNumber() { - return userTrackerThreadsNumber; - } + public int getUserTrackerThreadsNumber() + { + return userTrackerThreadsNumber; + } - public void setUserTrackerThreadsNumber(int userTrackerThreadsNumber) { - this.userTrackerThreadsNumber = userTrackerThreadsNumber; - } + public void setUserTrackerThreadsNumber(int userTrackerThreadsNumber) + { + this.userTrackerThreadsNumber = userTrackerThreadsNumber; + } - public int getUpdaterThreadsNumber() { - return updaterThreadsNumber; - } + public int getUpdaterThreadsNumber() + { + return updaterThreadsNumber; + } - public void setUpdaterThreadsNumber(int updaterThreadsNumber) { - this.updaterThreadsNumber = updaterThreadsNumber; - } + public void setUpdaterThreadsNumber(int updaterThreadsNumber) + { + this.updaterThreadsNumber = updaterThreadsNumber; + } - public int getUpdaterInterval() { - return updaterInterval; - } + public int getUpdaterInterval() + { + return updaterInterval; + } - public void setUpdaterInterval(int updaterInterval) { - this.updaterInterval = updaterInterval; - } + public void setUpdaterInterval(int updaterInterval) + { + this.updaterInterval = updaterInterval; + } - public int getActivityQueueLimit() { - return activityQueueLimit; - } + public int getActivityQueueLimit() + { + return activityQueueLimit; + } - public void setActivityQueueLimit(int activityQueueLimit) { - this.activityQueueLimit = activityQueueLimit; - } + public void setActivityQueueLimit(int activityQueueLimit) + { + this.activityQueueLimit = activityQueueLimit; + } - public long getActivityTimeout() { - return activityTimeout; - } + public long getActivityTimeout() + { + return activityTimeout; + } - public void setActivityTimeout(long activityTimeout) { - this.activityTimeout = activityTimeout; - } + public void setActivityTimeout(long activityTimeout) + { + this.activityTimeout = activityTimeout; + } - public String getActivityBroadcasterName() { - return activityBroadcasterName; - } + public String getActivityBroadcasterName() + { + return activityBroadcasterName; + } - public void setActivityBroadcasterName(String activityBroadcasterName) { - this.activityBroadcasterName = activityBroadcasterName; - } + public void setActivityBroadcasterName(String activityBroadcasterName) + { + this.activityBroadcasterName = activityBroadcasterName; + } - private class Updater implements Runnable { - private final Queue activityQueue; + private class Updater implements Runnable + { + private final Queue activityQueue; - public Updater(Queue activityQueue) { - this.activityQueue = activityQueue; - } + public Updater(Queue activityQueue) + { + this.activityQueue = activityQueue; + } - // never run - private Updater() { - this.activityQueue = null; - } + // never run + private Updater() + { + this.activityQueue = null; + } - public void run() { - long currentTime = System.currentTimeMillis(); + public void run() + { + long currentTime = System.currentTimeMillis(); - Set stillActive = getUsersActivities(activityTimeout); + Set stillActive = getUsersActivities(activityTimeout); - while (!activityQueue.isEmpty()) { - UserActivity activity = (UserActivity) activityQueue.poll(); - if (activity != null - && ((currentTime - activity.getTimestamp()) < activityTimeout)) { - if (activity.getType() != UserActivity.EXIT) { - stillActive.add(activity); - } else { - stillActive.remove(activity); - } - } - } + while (!activityQueue.isEmpty()) + { + UserActivity activity = (UserActivity) activityQueue.poll(); + if (activity != null && ((currentTime - activity.getTimestamp()) < activityTimeout)) + { + if (activity.getType() != UserActivity.EXIT) + { + stillActive.add(activity); + } + else + { + stillActive.remove(activity); + } + } + } - activityResults = Collections.unmodifiableSet(stillActive); + activityResults = Collections.unmodifiableSet(stillActive); - } - } + } + } }

18 years

1
0
0 / 0

JBoss Portal SVN: r10786 - branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-20 18:10:24 -0400 (Tue, 20 May 2008) New Revision: 10786 Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java Log: reformatting using jboss formatter for eclipse Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java 2008-05-20 21:57:39 UTC (rev 10785) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java 2008-05-20 22:10:24 UTC (rev 10786) @@ -41,12 +41,12 @@ PortalSessionEvent portalEvent = (PortalSessionEvent) event; UserActivity userActivity = null; - if (portalEvent.getType() == portalEvent.SESSION_CREATED) + if (portalEvent.getType() == PortalSessionEvent.SESSION_CREATED) { userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession() .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION); } - else if (portalEvent.getType() == portalEvent.SESSION_DESTROYED) + else if (portalEvent.getType() == PortalSessionEvent.SESSION_DESTROYED) { userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession() .getId(), System.currentTimeMillis(), UserActivity.EXIT);

18 years

1
0
0 / 0

JBoss Portal SVN: r10785 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users: event and 1 other directory.

by portal-commits＠lists.jboss.org

Author: sviluppatorefico Date: 2008-05-20 17:57:39 -0400 (Tue, 20 May 2008) New Revision: 10785 Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java Log: reformatting the code using jboss formatter for eclipse Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-20 15:13:28 UTC (rev 10784) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2008-05-20 21:57:39 UTC (rev 10785) @@ -48,22 +48,22 @@ /** Logger */ public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); - protected void doView(JBossRenderRequest rRequest, JBossRenderResponse rResponse) - throws PortletException, IOException, UnavailableException + protected void doView(JBossRenderRequest rRequest, JBossRenderResponse rResponse) throws PortletException, + IOException, UnavailableException { - UsersActivityStatsService uass = (UsersActivityStatsService)this - .getPortletContext().getAttribute("UsersActivityStats"); + UsersActivityStatsService uass = (UsersActivityStatsService) this.getPortletContext().getAttribute( + "UsersActivityStats"); rResponse.setContentType("text/html"); PrintWriter writer = rResponse.getWriter(); - + long currentTime = System.currentTimeMillis(); //TODO: this is wrong - should pass period instead of current time - actually it works by a coincedence... Set users = uass.getActiveUsersNames(currentTime); - + int sessionCount = uass.getActiveSessionCount(currentTime); - + int allLoggedSessions = uass.getUsersActivities(currentTime).size(); if (sessionCount == 1) @@ -91,7 +91,6 @@ rd.include(rRequest, rResponse); } - writer.close(); } } Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java 2008-05-20 15:13:28 UTC (rev 10784) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/PortalSessionEventListener.java 2008-05-20 21:57:39 UTC (rev 10785) @@ -24,37 +24,34 @@ import org.jboss.portal.api.event.PortalEvent; import org.jboss.portal.api.event.PortalEventContext; -import org.jboss.portal.api.event.PortalEventListener; import org.jboss.portal.api.session.event.PortalSessionEvent; -import org.jboss.portal.api.user.event.UserAuthenticationEvent; import org.jboss.portal.core.identity.UserActivity; -import EDU.oswego.cs.dl.util.concurrent.SynchronizedLong; - /** * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> * @version $Revision: 1.1 $ */ -public class PortalSessionEventListener extends StatsListener { +public class PortalSessionEventListener extends StatsListener +{ - public void onEvent(PortalEventContext eventContext, PortalEvent event) { - if (event instanceof PortalSessionEvent) { - PortalSessionEvent portalEvent = (PortalSessionEvent) event; - UserActivity userActivity = null; + public void onEvent(PortalEventContext eventContext, PortalEvent event) + { + if (event instanceof PortalSessionEvent) + { + PortalSessionEvent portalEvent = (PortalSessionEvent) event; + UserActivity userActivity = null; - if (portalEvent.getType() == portalEvent.SESSION_CREATED) - { - userActivity = new UserActivity(UserActivity.GUEST, - eventContext.getPortalRuntimeContext().getSession().getId(), System - .currentTimeMillis(), UserActivity.NAVIGATION); - } - else if (portalEvent.getType() == portalEvent.SESSION_DESTROYED) - { - userActivity = new UserActivity(UserActivity.GUEST, - eventContext.getPortalRuntimeContext().getSession().getId(), System - .currentTimeMillis(), UserActivity.EXIT); - } - getStatsService().registerActivity(userActivity); - } - } + if (portalEvent.getType() == portalEvent.SESSION_CREATED) + { + userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION); + } + else if (portalEvent.getType() == portalEvent.SESSION_DESTROYED) + { + userActivity = new UserActivity(UserActivity.GUEST, eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.EXIT); + } + getStatsService().registerActivity(userActivity); + } + } } Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java 2008-05-20 15:13:28 UTC (rev 10784) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/StatsListener.java 2008-05-20 21:57:39 UTC (rev 10785) @@ -11,36 +11,34 @@ import org.jboss.portal.api.event.PortalEventListener; import org.jboss.portal.core.identity.UsersActivityStatsService; -public abstract class StatsListener implements PortalEventListener { +public abstract class StatsListener implements PortalEventListener +{ - /** Our logger. */ - private static final Logger log = Logger.getLogger(StatsListener.class); + /** Our logger. */ + private static final Logger log = Logger.getLogger(StatsListener.class); - private UsersActivityStatsService activityService; + private UsersActivityStatsService activityService; - public UsersActivityStatsService getStatsService() { - if (activityService == null) { - try { - MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); - activityService = (UsersActivityStatsService) MBeanProxy - .get( - UsersActivityStatsService.class, - new ObjectName( - "portal:service=Module,type=UsersActivityStatsService"), - mbeanServer); - } catch (MBeanProxyCreationException e) { - log - .error( - "could not obtain a proxy for User Activity Statistics Service", - e); - } catch (MalformedObjectNameException e2) { - log - .error( - "object name to obtain User Activity Statistics Service is wrong", - e2); - } - } - return activityService; - } + public UsersActivityStatsService getStatsService() + { + if (activityService == null) + { + try + { + MBeanServer mbeanServer = MBeanServerLocator.locateJBoss(); + activityService = (UsersActivityStatsService) MBeanProxy.get(UsersActivityStatsService.class, + new ObjectName("portal:service=Module,type=UsersActivityStatsService"), mbeanServer); + } + catch (MBeanProxyCreationException e) + { + log.error("could not obtain a proxy for User Activity Statistics Service", e); + } + catch (MalformedObjectNameException e2) + { + log.error("object name to obtain User Activity Statistics Service is wrong", e2); + } + } + return activityService; + } } Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java 2008-05-20 15:13:28 UTC (rev 10784) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/UserEventListener.java 2008-05-20 21:57:39 UTC (rev 10785) @@ -31,27 +31,29 @@ * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> * @version $Revision: 1.1 $ */ -public class UserEventListener extends StatsListener { +public class UserEventListener extends StatsListener +{ - public void onEvent(PortalEventContext eventContext, PortalEvent event) { - if (event instanceof UserAuthenticationEvent) { + public void onEvent(PortalEventContext eventContext, PortalEvent event) + { + if (event instanceof UserAuthenticationEvent) + { - UserAuthenticationEvent userEvent = (UserAuthenticationEvent) event; + UserAuthenticationEvent userEvent = (UserAuthenticationEvent) event; - UserActivity userActivity = null; + UserActivity userActivity = null; - if (userEvent.getType() == UserAuthenticationEvent.SIGN_IN) { - userActivity = new UserActivity(userEvent.getUserId(), - eventContext.getPortalRuntimeContext().getSession().getId() - , System.currentTimeMillis(), - UserActivity.NAVIGATION); - } else if (userEvent.getType() == UserAuthenticationEvent.SIGN_OUT) { - userActivity = new UserActivity(userEvent.getUserId(), - eventContext.getPortalRuntimeContext().getSession().getId() - , System.currentTimeMillis(), - UserActivity.EXIT); - } - getStatsService().registerActivity(userActivity); - } - } + if (userEvent.getType() == UserAuthenticationEvent.SIGN_IN) + { + userActivity = new UserActivity(userEvent.getUserId(), eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.NAVIGATION); + } + else if (userEvent.getType() == UserAuthenticationEvent.SIGN_OUT) + { + userActivity = new UserActivity(userEvent.getUserId(), eventContext.getPortalRuntimeContext().getSession() + .getId(), System.currentTimeMillis(), UserActivity.EXIT); + } + getStatsService().registerActivity(userActivity); + } + } }

18 years

1
0
0 / 0

JBoss Portal SVN: r10783 - in modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity: auth and 1 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2008-05-20 10:18:07 -0400 (Tue, 20 May 2008) New Revision: 10783 Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java Log: Add option to make portal authentication non case sensitive - customer request Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2008-05-20 14:03:57 UTC (rev 10782) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2008-05-20 14:18:07 UTC (rev 10783) @@ -71,6 +71,8 @@ public static final String USER_ALLOW_EMPTY_PASSWORDS = "allowEmptyPasswords"; + public static final String USER_USER_NAME_TO_LOWER_CASE = "userNameToLowerCase"; + //public static final String ROLE_CONTAINER_DN = "roleContainerDN"; public static final String ROLE_RID_ATTRIBUTE_ID = "ridAttributeID"; Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-20 14:03:57 UTC (rev 10782) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/IdentityLoginModule.java 2008-05-20 14:18:07 UTC (rev 10783) @@ -74,6 +74,8 @@ protected String validateUserNameCase; + protected String userNameToLowerCase; + public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) { super.initialize(subject, callbackHandler, sharedState, options); @@ -88,6 +90,7 @@ additionalRole = (String) options.get("additionalRole"); havingRole = (String) options.get("havingRole"); validateUserNameCase = (String) options.get("validateUserNameCase"); + userNameToLowerCase = (String) options.get("userNameToLowerCase"); // Some info log.trace("userModuleJNDIName = " + userModuleJNDIName); @@ -97,6 +100,7 @@ log.trace("additionalRole = " + additionalRole); log.trace("havingRole = " + havingRole); log.trace("validateUserNameCase = " + validateUserNameCase); + log.trace("userNameToLowerCase = " + userNameToLowerCase); } private UserModule userModule; @@ -356,4 +360,28 @@ { return new UserPrincipal(username); } + + protected String getUsername() + { + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) + { + return super.getUsername().toLowerCase(); + } + return super.getUsername(); + } + + protected String[] getUsernameAndPassword() throws LoginException + { + String[] names = super.getUsernameAndPassword(); + + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) + { + if (names[0] != null) + { + names[0] = names[0].toLowerCase(); + } + } + return names; + + } } Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java =================================================================== --- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2008-05-20 14:03:57 UTC (rev 10782) +++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModule.java 2008-05-20 14:18:07 UTC (rev 10783) @@ -199,8 +199,16 @@ //make DN as user ID ldapu = new LDAPUserImpl(dn,getIdentityContext(), dn); - ldapu.setUserName(uida.get().toString()); + if (isUserNameToLowerCase()) + { + ldapu.setUserName(uida.get().toString().toLowerCase()); + } + else + { + ldapu.setUserName(uida.get().toString()); + } + log.debug("user uid: " + ldapu.getId()); log.debug("user dn: " + ldapu.getDn()); @@ -415,7 +423,16 @@ return Boolean.FALSE.booleanValue(); } + protected boolean isUserNameToLowerCase() + { + String userNameToLowerCase = getIdentityConfiguration().getValue(IdentityConfiguration.USER_USER_NAME_TO_LOWER_CASE); + if (userNameToLowerCase != null && userNameToLowerCase.equalsIgnoreCase("true")) + { + return Boolean.TRUE.booleanValue(); + } + return Boolean.FALSE.booleanValue(); + } /*protected String getEmailAttributeId() throws IdentityException

18 years

1
0
0 / 0

JBoss Portal SVN: r10782 - branches/JBoss_Portal_Branch_2_7.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-05-20 10:03:57 -0400 (Tue, 20 May 2008) New Revision: 10782 Removed: branches/JBoss_Portal_Branch_2_7/format/ Log: Obsolete package

18 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits May 2008