JBoss Portal SVN: r10884 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 18:26:16 -0400 (Sat, 31 May 2008)
New Revision: 10884
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
I transformed embedded Strings to embedded LocalizedString. Actually they are configured to support only english and italian language
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-05-31 22:24:51 UTC (rev 10883)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-05-31 22:26:16 UTC (rev 10884)
@@ -22,13 +22,18 @@
package org.jboss.portal.core.admin.ui;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.faces.model.SelectItem;
+
+import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.control.ControlConstants;
-import javax.faces.model.SelectItem;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version $Revision$
@@ -44,9 +49,24 @@
/** . */
final PortalObjectManagerBean pomgr;
- private static final String DISPLAY_THE_DEFAULT_ERROR_MESSAGE = "Display the default error message";
- private static final String REDIRECT_TO_THE_SPECIFIED_RESOURCE = "Redirect to the specified resource";
- private static final String REMOVE_THE_RESOURCE_FROM_PAGE = "Remove the resource from page";
+
+ private static Map<Locale,String> DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME = new HashMap<Locale,String>();
+ private static Map<Locale,String> REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME = new HashMap<Locale,String>();
+ private static Map<Locale,String> REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME = new HashMap<Locale,String>();
+
+ static {
+ DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME.put(Locale.ENGLISH, "Display the default error message");
+ REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME.put(Locale.ENGLISH, "Redirect to the specified resource");
+ REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME.put(Locale.ENGLISH, "Remove the resource from page");
+
+ DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME.put(Locale.ITALY, "Visualizza il messaggio di errore di default");
+ REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME.put(Locale.ITALY, "Redireziona alla risorsa specificata");
+ REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME.put(Locale.ITALY, "Rimuovi la risorsa dalla pagina");
+ }
+
+ private static final LocalizedString DISPLAY_THE_DEFAULT_ERROR_MESSAGE = new LocalizedString(DISPLAY_THE_DEFAULT_ERROR_MESSAGE_DISPLAY_NAME,Locale.getDefault());
+ private static final LocalizedString REDIRECT_TO_THE_SPECIFIED_RESOURCE = new LocalizedString(REDIRECT_TO_THE_SPECIFIED_RESOURCE_DISPLAY_NAME,Locale.getDefault());
+ private static final LocalizedString REMOVE_THE_RESOURCE_FROM_PAGE = new LocalizedString(REMOVE_THE_RESOURCE_FROM_PAGE_DISPLAY_NAME,Locale.getDefault());
public ControlPropertiesBean(PortalObjectManagerBean pomgr)
{
@@ -59,8 +79,8 @@
if (portalSelectItems == null)
{
portalSelectItems = new ArrayList();
- portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE));
- portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE));
+ portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getDefaultString()));
+ portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getDefaultString()));
}
return portalSelectItems;
}
@@ -70,9 +90,9 @@
if (pageSelectItems == null)
{
pageSelectItems = new ArrayList();
- pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE));
- pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE));
- pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE));
+ pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getDefaultString()));
+ pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE.getDefaultString()));
+ pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getDefaultString()));
}
return pageSelectItems;
}
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-05-31 22:24:51 UTC (rev 10883)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-05-31 22:26:16 UTC (rev 10884)
@@ -22,6 +22,24 @@
******************************************************************************/
package org.jboss.portal.core.admin.ui;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
+
+import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.core.admin.ui.actions.AddPageAction;
import org.jboss.portal.core.admin.ui.actions.PropertyAction;
import org.jboss.portal.core.admin.ui.common.PageManagerBean;
@@ -50,21 +68,6 @@
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.theme.ThemeService;
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
-import javax.faces.model.SelectItem;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/** The portal object manager bean. */
public class PortalObjectManagerBean implements Serializable, AddPageAction.Listener
{
@@ -166,6 +169,14 @@
/** . */
private Boolean maximizedStateExists;
+
+ private static Map<Locale,String> NO_BOUND_LISTENER_DISPLAY_NAME = new HashMap<Locale,String>();
+ static {
+ NO_BOUND_LISTENER_DISPLAY_NAME.put(Locale.ENGLISH, "no bound listener");
+ NO_BOUND_LISTENER_DISPLAY_NAME.put(Locale.ITALY, "nessun listener");
+ }
+
+ private static final LocalizedString NO_BOUND_LISTENER = new LocalizedString(NO_BOUND_LISTENER_DISPLAY_NAME,Locale.getDefault());
// Wired services
@@ -872,7 +883,7 @@
{
SelectItem[] result = new SelectItem[ids.size() + 1];
int i = 1;
- result[0] = new SelectItem("", "no bound listener");
+ result[0] = new SelectItem("", NO_BOUND_LISTENER.getDisplayName().getDefaultString());
for (Iterator idsIt = ids.iterator(); idsIt.hasNext();)
{
result[i++] = new SelectItem(idsIt.next());
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10883 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 18:24:51 -0400 (Sat, 31 May 2008)
New Revision: 10883
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java
Log:
I updated LocalizedString objects to let internationalization. Actually it let only english and italian. It should to be increased for other languages
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2008-05-31 22:23:29 UTC (rev 10882)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2008-05-31 22:24:51 UTC (rev 10883)
@@ -31,56 +31,346 @@
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @author <a href="mailto:boleslaw dot dawidowicz at redhat dot com>Boleslaw Dawidowicz</a>
+ * @author <a href="mailto:jedim@vige.it>Luca Stancapiano</a>
* @version $Revision$
*/
public class PropertiesInfo
{
//
+ private static Map<Locale, String> THEME_LAYOUT_ID_DISPLAY_NAME = new HashMap<Locale, String>();
- public static final PropertyInfo THEME_LAYOUT_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_LAYOUT, new LocalizedString("Layout id"), new LocalizedString("The layout value formats a page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo THEME_THEME_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_THEME, new LocalizedString("Theme id"), new LocalizedString("The theme value skins a page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo THEME_RENDER_SET_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_RENDERSET, new LocalizedString("Renderset id"), new LocalizedString("The render set id"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo THEME_RENDER_REGION_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_REGION, new LocalizedString("Region id"), new LocalizedString("The region that will the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo THEME_RENDER_REGION_ORDER = new PropertyInfo(ThemeConstants.PORTAL_PROP_ORDER, new LocalizedString("Region order"), new LocalizedString("The vertical or horizontal order of the window within a region"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+ private static Map<Locale, String> THEME_LAYOUT_ID_DESCRIPTION = new HashMap<Locale, String>();
+ private static Map<Locale, String> THEME_THEME_ID_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_THEME_ID_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_RENDER_SET_ID_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_RENDER_SET_ID_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_RENDER_REGION_ID_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_RENDER_REGION_ID_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_RENDER_REGION_ORDER_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> THEME_RENDER_REGION_ORDER_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> AJAX_PARTIAL_REFRESH_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> AJAX_PARTIAL_REFRESH_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> AJAX_DND_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> AJAX_DND_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> WINDOW_CONTENT_TYPE_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> WINDOW_CONTENT_TYPE_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> DEFAULT_CHILD_NAME_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> DEFAULT_CHILD_NAME_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> PAGE_ORDER_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> PAGE_ORDER_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> INITIAL_WINDOW_STATE_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> INITIAL_WINDOW_STATE_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_ACCESS_DENIED_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_UNAVAILABLE_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_ERROR_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_ERROR_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_INTERNAL_ERROR_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_NOT_FOUND_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_RESOURCE_URI_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_ACCESS_DENIED_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_UNAVAILABLE_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_ERROR_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_NOT_FOUND_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_RESOURCE_URI_DISPLAY_NAME = new HashMap<Locale, String>();
+
+ private static Map<Locale, String> CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION = new HashMap<Locale, String>();
+
+ static {
+ THEME_LAYOUT_ID_DISPLAY_NAME.put(Locale.ENGLISH, "Layout id");
+ THEME_LAYOUT_ID_DESCRIPTION.put(Locale.ENGLISH, "The layout value formats a page");
+ THEME_THEME_ID_DISPLAY_NAME.put(Locale.ENGLISH, "Theme id");
+ THEME_THEME_ID_DESCRIPTION.put(Locale.ENGLISH, "The theme value skins a page");
+ THEME_RENDER_SET_ID_DISPLAY_NAME.put(Locale.ENGLISH, "Renderset id");
+ THEME_RENDER_SET_ID_DESCRIPTION.put(Locale.ENGLISH, "The render set id");
+ THEME_RENDER_REGION_ID_DISPLAY_NAME.put(Locale.ENGLISH, "Region id");
+ THEME_RENDER_REGION_ID_DESCRIPTION.put(Locale.ENGLISH, "The region that will the window");
+ THEME_RENDER_REGION_ORDER_DISPLAY_NAME.put(Locale.ENGLISH, "Region order");
+ THEME_RENDER_REGION_ORDER_DESCRIPTION.put(Locale.ENGLISH,
+ "The vertical or horizontal order of the window within a region");
+ AJAX_PARTIAL_REFRESH_DISPLAY_NAME.put(Locale.ENGLISH, "Partial refresh");
+ AJAX_PARTIAL_REFRESH_DESCRIPTION.put(Locale.ENGLISH, "Enable partial refresh for portlets");
+ AJAX_DND_DISPLAY_NAME.put(Locale.ENGLISH, "Drag and drop");
+ AJAX_DND_DESCRIPTION.put(Locale.ENGLISH, "Enable window drag and drop");
+ WINDOW_CONTENT_TYPE_DISPLAY_NAME.put(Locale.ENGLISH, "Content type");
+ WINDOW_CONTENT_TYPE_DESCRIPTION.put(Locale.ENGLISH, "The type of content of a window");
+ DEFAULT_CHILD_NAME_DISPLAY_NAME.put(Locale.ENGLISH, "Default child name");
+ DEFAULT_CHILD_NAME_DESCRIPTION.put(Locale.ENGLISH,
+ "The child name used when no specific child name is explicited");
+ PAGE_ORDER_DISPLAY_NAME.put(Locale.ENGLISH, "Tab order");
+ PAGE_ORDER_DESCRIPTION.put(Locale.ENGLISH, "The order value to display pages in tabs");
+ INITIAL_WINDOW_STATE_DISPLAY_NAME.put(Locale.ENGLISH, "Initial Mode");
+ INITIAL_WINDOW_STATE_DESCRIPTION.put(Locale.ENGLISH, "The inital mode of the window");
+ CONTROL_POLICY_PAGE_ACCESS_DENIED_DISPLAY_NAME.put(Locale.ENGLISH, "When access to the window is denied");
+ CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION.put(Locale.ENGLISH, "When access to the window is denied");
+ CONTROL_POLICY_PAGE_UNAVAILABLE_DISPLAY_NAME.put(Locale.ENGLISH, "When the window is unavailable");
+ CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION.put(Locale.ENGLISH, "When the window is unavailable");
+ CONTROL_POLICY_PAGE_ERROR_DISPLAY_NAME.put(Locale.ENGLISH, "When there is an error on the window");
+ CONTROL_POLICY_PAGE_ERROR_DESCRIPTION.put(Locale.ENGLISH, "When there is an error on the window");
+ CONTROL_POLICY_PAGE_INTERNAL_ERROR_DISPLAY_NAME.put(Locale.ENGLISH, "When there is an error within the window");
+ CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION.put(Locale.ENGLISH, "When there is an error within the window");
+ CONTROL_POLICY_PAGE_NOT_FOUND_DISPLAY_NAME.put(Locale.ENGLISH, "When the window is not found");
+ CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION.put(Locale.ENGLISH, "When the window is not found");
+ CONTROL_POLICY_PAGE_RESOURCE_URI_DISPLAY_NAME.put(Locale.ENGLISH, "On error redirect to this resource");
+ CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION.put(Locale.ENGLISH, "On error redirect to this resource");
+ CONTROL_POLICY_PORTAL_ACCESS_DENIED_DISPLAY_NAME.put(Locale.ENGLISH, "When access to the page is denied");
+ CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION.put(Locale.ENGLISH, "When access to the page is denied");
+ CONTROL_POLICY_PORTAL_UNAVAILABLE_DISPLAY_NAME.put(Locale.ENGLISH, "When the page is unavailable");
+ CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION.put(Locale.ENGLISH, "When the page is unavailable");
+ CONTROL_POLICY_PORTAL_ERROR_DISPLAY_NAME.put(Locale.ENGLISH, "When there is an error on the page");
+ CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION.put(Locale.ENGLISH, "When there is an error on the page");
+ CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DISPLAY_NAME.put(Locale.ENGLISH, "When there is an error within the page");
+ CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION.put(Locale.ENGLISH, "When there is an error within the page");
+ CONTROL_POLICY_PORTAL_NOT_FOUND_DISPLAY_NAME.put(Locale.ENGLISH, "When the page is not found");
+ CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION.put(Locale.ENGLISH, "When the page is not found");
+ CONTROL_POLICY_PORTAL_RESOURCE_URI_DISPLAY_NAME.put(Locale.ENGLISH, "On error redirect to this resource");
+ CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION.put(Locale.ENGLISH, "On error redirect to this resource");
+
+ THEME_LAYOUT_ID_DISPLAY_NAME.put(Locale.ITALY, "Id Layout");
+ THEME_LAYOUT_ID_DESCRIPTION.put(Locale.ITALY, "Il valore del layout formatta la pagina");
+ THEME_THEME_ID_DISPLAY_NAME.put(Locale.ITALY, "Id Tema");
+ THEME_THEME_ID_DESCRIPTION.put(Locale.ITALY, "Il valore del tema copre la pagina");
+ THEME_RENDER_SET_ID_DISPLAY_NAME.put(Locale.ITALY, "Id Renderset");
+ THEME_RENDER_SET_ID_DESCRIPTION.put(Locale.ITALY, "L'id del renderset");
+ THEME_RENDER_REGION_ID_DISPLAY_NAME.put(Locale.ITALY, "Id Regione");
+ THEME_RENDER_REGION_ID_DESCRIPTION.put(Locale.ITALY, "Regione desiderata per la finestra");
+ THEME_RENDER_REGION_ORDER_DISPLAY_NAME.put(Locale.ITALY, "Ordine Regione");
+ THEME_RENDER_REGION_ORDER_DESCRIPTION.put(Locale.ITALY,
+ "L'ordine verticale o orizzontale della finestra dentro una regione");
+ AJAX_PARTIAL_REFRESH_DISPLAY_NAME.put(Locale.ITALY, "Aggiornamento parziale");
+ AJAX_PARTIAL_REFRESH_DESCRIPTION.put(Locale.ITALY, "Attiva l'aggiornamento parziale per le portlet");
+ AJAX_DND_DISPLAY_NAME.put(Locale.ITALY, "Copia e incolla");
+ AJAX_DND_DESCRIPTION.put(Locale.ITALY, "Attiva il copia e incolla per la finestra");
+ WINDOW_CONTENT_TYPE_DISPLAY_NAME.put(Locale.ITALY, "Tipo Contenuto");
+ WINDOW_CONTENT_TYPE_DESCRIPTION.put(Locale.ITALY, "Il tipo di contenuto di una finestra");
+ DEFAULT_CHILD_NAME_DISPLAY_NAME.put(Locale.ITALY, "Nome di default del figlio");
+ DEFAULT_CHILD_NAME_DESCRIPTION.put(Locale.ITALY, "Il nome del figlio quando non c'è un nome specificato");
+ PAGE_ORDER_DISPLAY_NAME.put(Locale.ITALY, "Ordine Etichetta");
+ PAGE_ORDER_DESCRIPTION.put(Locale.ITALY, "Il valore dell'ordine per visualizzare le pagine nelle etichette");
+ INITIAL_WINDOW_STATE_DISPLAY_NAME.put(Locale.ITALY, "Modalità iniziale");
+ INITIAL_WINDOW_STATE_DESCRIPTION.put(Locale.ITALY, "La modalità iniziale della finestra");
+ CONTROL_POLICY_PAGE_ACCESS_DENIED_DISPLAY_NAME.put(Locale.ITALY, "Quando l'accesso alla finestra è negato");
+ CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION.put(Locale.ITALY, "Quando l'accesso alla finestra è negato");
+ CONTROL_POLICY_PAGE_UNAVAILABLE_DISPLAY_NAME.put(Locale.ITALY, "Quando la finestra non è disponibile");
+ CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION.put(Locale.ITALY, "Quando la finestra non è disponibile");
+ CONTROL_POLICY_PAGE_ERROR_DISPLAY_NAME.put(Locale.ITALY, "Quando c'è un errore sulla finestra");
+ CONTROL_POLICY_PAGE_ERROR_DESCRIPTION.put(Locale.ITALY, "Quando c'è un errore sulla finestra");
+ CONTROL_POLICY_PAGE_INTERNAL_ERROR_DISPLAY_NAME.put(Locale.ITALY, "Quando c'è un errore nella finestra");
+ CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION.put(Locale.ITALY, "Quando c'è un errore nella finestra");
+ CONTROL_POLICY_PAGE_NOT_FOUND_DISPLAY_NAME.put(Locale.ITALY, "Quando la finestra non viene trovata");
+ CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION.put(Locale.ITALY, "Quando la finestra non viene trovata");
+ CONTROL_POLICY_PAGE_RESOURCE_URI_DISPLAY_NAME.put(Locale.ITALY,
+ "In caso di errore redireziona sulla risorsa");
+ CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION.put(Locale.ITALY,
+ "In caso di errore redireziona sulla risorsa");
+ CONTROL_POLICY_PORTAL_ACCESS_DENIED_DISPLAY_NAME.put(Locale.ITALY, "Quando l'accesso alla pagina è negato");
+ CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION.put(Locale.ITALY, "Quando l'accesso alla pagina è negato");
+ CONTROL_POLICY_PORTAL_UNAVAILABLE_DISPLAY_NAME.put(Locale.ITALY, "Quando la pagina non è disponibile");
+ CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION.put(Locale.ITALY, "Quando la pagina non è disponibile");
+ CONTROL_POLICY_PORTAL_ERROR_DISPLAY_NAME.put(Locale.ITALY, "Quando c'è un errore sulla pagina");
+ CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION.put(Locale.ITALY, "Quando c'è un errore sulla pagina");
+ CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DISPLAY_NAME.put(Locale.ITALY, "Quando c'è un errore nella pagina");
+ CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION.put(Locale.ITALY, "Quando c'è un errore nella pagina");
+ CONTROL_POLICY_PORTAL_NOT_FOUND_DISPLAY_NAME.put(Locale.ITALY, "Quando la pagina non viene trovata");
+ CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION.put(Locale.ITALY, "Quando la pagina non viene trovata");
+ CONTROL_POLICY_PORTAL_RESOURCE_URI_DISPLAY_NAME.put(Locale.ITALY,
+ "In caso di errore redireziona sulla risorsa");
+ CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION.put(Locale.ITALY,
+ "In caso di errore redireziona sulla risorsa");
+ }
+
+ public static final PropertyInfo THEME_LAYOUT_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_LAYOUT,
+ new LocalizedString(THEME_LAYOUT_ID_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ THEME_LAYOUT_ID_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo THEME_THEME_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_THEME,
+ new LocalizedString(THEME_THEME_ID_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ THEME_THEME_ID_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo THEME_RENDER_SET_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_RENDERSET,
+ new LocalizedString(THEME_RENDER_SET_ID_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ THEME_RENDER_SET_ID_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo THEME_RENDER_REGION_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_REGION,
+ new LocalizedString(THEME_RENDER_REGION_ID_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ THEME_RENDER_REGION_ID_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo THEME_RENDER_REGION_ORDER = new PropertyInfo(ThemeConstants.PORTAL_PROP_ORDER,
+ new LocalizedString(THEME_RENDER_REGION_ORDER_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ THEME_RENDER_REGION_ORDER_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+
//
- public static final PropertyInfo AJAX_PARTIAL_REFRESH = new PropertyInfo(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, new LocalizedString("Partial refresh"), new LocalizedString("Enable partial refresh for portlets"), "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
- public static final PropertyInfo AJAX_DND = new PropertyInfo(DynaRenderOptions.DND_ENABLED, new LocalizedString("Drag and drop"), new LocalizedString("Enable window drag and drop"), "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+ public static final PropertyInfo AJAX_PARTIAL_REFRESH = new PropertyInfo(DynaRenderOptions.PARTIAL_REFRESH_ENABLED,
+ new LocalizedString(AJAX_PARTIAL_REFRESH_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ AJAX_PARTIAL_REFRESH_DESCRIPTION, Locale.getDefault()), "java.lang.Boolean",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+ public static final PropertyInfo AJAX_DND = new PropertyInfo(DynaRenderOptions.DND_ENABLED, new LocalizedString(
+ AJAX_DND_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(AJAX_DND_DESCRIPTION, Locale.getDefault()),
+ "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+
//
- public static final PropertyInfo WINDOW_CONTENT_TYPE = new PropertyInfo(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, new LocalizedString("Content type"), new LocalizedString("The type of content of a window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo DEFAULT_CHILD_NAME = new PropertyInfo(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME, new LocalizedString("Default child name"), new LocalizedString("The child name used when no specific child name is explicited"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
- public static final PropertyInfo PAGE_ORDER = new PropertyInfo("order", new LocalizedString("Tab order"), new LocalizedString("The order value to display pages in tabs"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
- public static final PropertyInfo INITIAL_WINDOW_STATE = new PropertyInfo(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, new LocalizedString("Initial Mode"), new LocalizedString("The inital mode of the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+ public static final PropertyInfo WINDOW_CONTENT_TYPE = new PropertyInfo(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE,
+ new LocalizedString(WINDOW_CONTENT_TYPE_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ WINDOW_CONTENT_TYPE_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+ public static final PropertyInfo DEFAULT_CHILD_NAME = new PropertyInfo(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME,
+ new LocalizedString(DEFAULT_CHILD_NAME_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ DEFAULT_CHILD_NAME_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+
+ public static final PropertyInfo PAGE_ORDER = new PropertyInfo("order", new LocalizedString(PAGE_ORDER_DISPLAY_NAME,
+ Locale.getDefault()), new LocalizedString(PAGE_ORDER_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+
+ public static final PropertyInfo INITIAL_WINDOW_STATE = new PropertyInfo(WindowImpl.PORTAL_INITIAL_WINDOW_STATE,
+ new LocalizedString(INITIAL_WINDOW_STATE_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ INITIAL_WINDOW_STATE_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+
//
- public static final PropertyInfo CONTROL_POLICY_PAGE_ACCESS_DENIED = new PropertyInfo(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, new LocalizedString("When access to the window is denied"), new LocalizedString("When access to the window is denied"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PAGE_UNAVAILABLE = new PropertyInfo(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, new LocalizedString("When the window is unavailable"), new LocalizedString("When the window is unavailable"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PAGE_ERROR = new PropertyInfo(ControlConstants.PAGE_ERROR_CONTROL_KEY, new LocalizedString("When there is an error on the window"), new LocalizedString("When there is an error on the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PAGE_INTERNAL_ERROR = new PropertyInfo(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, new LocalizedString("When there is an error within the window"), new LocalizedString("When there is an error within the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PAGE_NOT_FOUND = new PropertyInfo(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, new LocalizedString("When the window is not found"), new LocalizedString("When the window is not found"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PAGE_RESOURCE_URI = new PropertyInfo(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, new LocalizedString("On error redirect to this resource"), new LocalizedString("On error redirect to this resource"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+ public static final PropertyInfo CONTROL_POLICY_PAGE_ACCESS_DENIED = new PropertyInfo(
+ ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PAGE_ACCESS_DENIED_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+ public static final PropertyInfo CONTROL_POLICY_PAGE_UNAVAILABLE = new PropertyInfo(
+ ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PAGE_UNAVAILABLE_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PAGE_ERROR = new PropertyInfo(
+ ControlConstants.PAGE_ERROR_CONTROL_KEY, new LocalizedString(CONTROL_POLICY_PAGE_ERROR_DISPLAY_NAME, Locale
+ .getDefault()), new LocalizedString(CONTROL_POLICY_PAGE_ERROR_DESCRIPTION, Locale.getDefault()),
+ "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PAGE_INTERNAL_ERROR = new PropertyInfo(
+ ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PAGE_INTERNAL_ERROR_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PAGE_NOT_FOUND = new PropertyInfo(
+ ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, new LocalizedString(CONTROL_POLICY_PAGE_NOT_FOUND_DISPLAY_NAME,
+ Locale.getDefault()),
+ new LocalizedString(CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PAGE_RESOURCE_URI = new PropertyInfo(
+ ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PAGE_RESOURCE_URI_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
//
- public static final PropertyInfo CONTROL_POLICY_PORTAL_ACCESS_DENIED = new PropertyInfo(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, new LocalizedString("When access to the page is denied"), new LocalizedString("When access to the page is denied"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PORTAL_UNAVAILABLE = new PropertyInfo(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, new LocalizedString("When the page is unavailable"), new LocalizedString("When the page is unavailable"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PORTAL_ERROR = new PropertyInfo(ControlConstants.PORTAL_ERROR_CONTROL_KEY, new LocalizedString("When there is an error on the page"), new LocalizedString("When there is an error on the page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PORTAL_INTERNAL_ERROR = new PropertyInfo(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, new LocalizedString("When there is an error within the page"), new LocalizedString("When there is an error within the page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PORTAL_NOT_FOUND = new PropertyInfo(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, new LocalizedString("When the page is not found"), new LocalizedString("When the page is not found"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
- public static final PropertyInfo CONTROL_POLICY_PORTAL_RESOURCE_URI = new PropertyInfo(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, new LocalizedString("On error redirect to this resource"), new LocalizedString("On error redirect to this resource"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+ public static final PropertyInfo CONTROL_POLICY_PORTAL_ACCESS_DENIED = new PropertyInfo(
+ ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PORTAL_ACCESS_DENIED_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+ public static final PropertyInfo CONTROL_POLICY_PORTAL_UNAVAILABLE = new PropertyInfo(
+ ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PORTAL_UNAVAILABLE_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+ public static final PropertyInfo CONTROL_POLICY_PORTAL_ERROR = new PropertyInfo(
+ ControlConstants.PORTAL_ERROR_CONTROL_KEY, new LocalizedString(CONTROL_POLICY_PORTAL_ERROR_DISPLAY_NAME,
+ Locale.getDefault()), new LocalizedString(CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION, Locale.getDefault()),
+ "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PORTAL_INTERNAL_ERROR = new PropertyInfo(
+ ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PORTAL_NOT_FOUND = new PropertyInfo(
+ ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PORTAL_NOT_FOUND_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
+ public static final PropertyInfo CONTROL_POLICY_PORTAL_RESOURCE_URI = new PropertyInfo(
+ ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, new LocalizedString(
+ CONTROL_POLICY_PORTAL_RESOURCE_URI_DISPLAY_NAME, Locale.getDefault()), new LocalizedString(
+ CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION, Locale.getDefault()), "java.lang.String",
+ PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE);
+
/** . */
private static final PropertyInfoSet CONTEXT_PROPERTIES = new PropertyInfoSet();
@@ -206,16 +496,16 @@
Map objectProps = null;
switch (portalObject.getType())
{
- case PortalObject.TYPE_CONTEXT:
+ case PortalObject.TYPE_CONTEXT :
objectProps = CONTEXT_PROPERTIES;
break;
- case PortalObject.TYPE_PORTAL:
+ case PortalObject.TYPE_PORTAL :
objectProps = PORTAL_PROPERTIES;
break;
- case PortalObject.TYPE_PAGE:
+ case PortalObject.TYPE_PAGE :
objectProps = PAGE_PROPERTIES;
break;
- case PortalObject.TYPE_WINDOW:
+ case PortalObject.TYPE_WINDOW :
objectProps = WINDOW_PROPERTIES;
break;
}
@@ -226,14 +516,15 @@
//
for (Iterator i = portalObject.getDeclaredProperties().entrySet().iterator(); i.hasNext();)
{
- Map.Entry entry = (Map.Entry)i.next();
- String name = (String)entry.getKey();
+ Map.Entry entry = (Map.Entry) i.next();
+ String name = (String) entry.getKey();
// Add additional properties
if (!ALL_PROPERTIES.containsKey(name))
{
LocalizedString displayName = new LocalizedString(name);
- PropertyInfo info = new PropertyInfo(name, displayName, new LocalizedString("The " + name + " property"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
+ PropertyInfo info = new PropertyInfo(name, displayName, new LocalizedString("The " + name + " property"),
+ "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE);
entries.put(name, info);
}
}
@@ -249,7 +540,7 @@
public PropertyInfo getPropertyInfo(String name)
{
- return (PropertyInfo)entries.get(name);
+ return (PropertyInfo) entries.get(name);
}
public static boolean isControlProperty(String name)
@@ -259,7 +550,7 @@
public static PropertyInfo getControlPropertyInfo(String name)
{
- return (PropertyInfo)CONTROL_PROPERTIES.get(name);
+ return (PropertyInfo) CONTROL_PROPERTIES.get(name);
}
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10882 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 18:23:29 -0400 (Sat, 31 May 2008)
New Revision: 10882
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties
Log:
internationalization updates
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties 2008-05-31 20:53:15 UTC (rev 10881)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties 2008-05-31 22:23:29 UTC (rev 10882)
@@ -22,7 +22,7 @@
################################################################################
ACCOUNT_DISABLED=Il tuo account \u00e8 disabilitato
-ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=Utente insesistente o password non corretta
+ACCOUNT_INEXISTING_OR_WRONG_PASSWORD=Utente inesistente o password non corretta
ACCOUNT_NOTASSIGNEDTOROLE=L\'utente non ha i giusti permessi
LOGIN_TITLE=JBoss Portal Login
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10881 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 16:53:15 -0400 (Sat, 31 May 2008)
New Revision: 10881
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
Log:
internationalization updates
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-31 20:46:17 UTC (rev 10880)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-31 20:53:15 UTC (rev 10881)
@@ -36,7 +36,7 @@
PORTAL=portale
SUB_PORTALS=sotto-portali
PAGES_WITHIN=pagine dentro
-CREATE_PORTAL_NAMED=Crea un portale chiamato
+CREATE_PORTAL_NAMED=Crea un portale con nome
PAGE_LAYOUT=Layout della pagina
SECURITY=Sicurezza
THEME=Tema
@@ -96,7 +96,7 @@
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_CASE=Regola
COMMON_INHERITANCE=Ereditariet\u00e0
COMMON_ACTION=Azione
COMMON_INHERIT_ACTION=eredita l\'azione dal genitore
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10880 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 16:46:17 -0400 (Sat, 31 May 2008)
New Revision: 10880
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
Log:
internationalization updates
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-31 20:45:44 UTC (rev 10879)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-31 20:46:17 UTC (rev 10880)
@@ -23,8 +23,8 @@
POWERED_BY=Sviluppato da
THEME_BY=Tema di
-LOGIN=Login
-LOGOUT=Logout
+LOGIN=Connettiti
+LOGOUT=Uscita
PORTLET_INSTANCE_ASSOCIATED=Istanza di Portlet associata a questa finestra
PORTLET_NAME=Nome della Portlet
PORTLET_DESCRIPTION=Descrizione della Portlet
@@ -34,4 +34,4 @@
PORTAL=Portale
ADMIN=Amministrazione
MEMBERS=Membri
-LOGGED=Benvenuto
\ No newline at end of file
+LOGGED=Connesso come
\ No newline at end of file
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10879 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 16:45:44 -0400 (Sat, 31 May 2008)
New Revision: 10879
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
you cannot to use conf.bundle.Resource because that file is into portal-core.war. Here we are into portal-server.war. Threre is a own Resource.properties file
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-31 20:43:27 UTC (rev 10878)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-31 20:45:44 UTC (rev 10879)
@@ -25,7 +25,7 @@
<%@page import="java.util.ResourceBundle"%>
<%
- ResourceBundle rb = ResourceBundle.getBundle("conf.bundles.Resource", request.getLocale());
+ 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">
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10878 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 16:43:27 -0400 (Sat, 31 May 2008)
New Revision: 10878
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
Log:
internationalization updates
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-31 08:31:05 UTC (rev 10877)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-31 20:43:27 UTC (rev 10878)
@@ -120,3 +120,4 @@
CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
CMS_TO_MODIFY=To modify how this portlet behaves, please
CMS_CLICK_HERE=click here
+CMS_SELECT_ACTION=Select Action
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-31 08:31:05 UTC (rev 10877)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-31 20:43:27 UTC (rev 10878)
@@ -115,4 +115,5 @@
CMS_INTRODUCTION=Introduzione
CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra
CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet,
-CMS_CLICK_HERE=clicca qui
\ No newline at end of file
+CMS_CLICK_HERE=clicca qui
+CMS_SELECT_ACTION=Seleziona un\'azione
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-31 08:31:05 UTC (rev 10877)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-31 20:43:27 UTC (rev 10878)
@@ -105,7 +105,7 @@
<div class="menu">
<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">Select Action...</option>
+ <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
<option value="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_CONFIRM_CREATE_COLLECTION %>"/>
<portlet:param name="path" value="<%= sCurrPath %>"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10877 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-31 04:31:05 -0400 (Sat, 31 May 2008)
New Revision: 10877
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
internationalization update
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-30 22:33:46 UTC (rev 10876)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-31 08:31:05 UTC (rev 10877)
@@ -144,9 +144,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>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10876 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-30 18:33:46 -0400 (Fri, 30 May 2008)
New Revision: 10876
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
Log:
updated internationalization
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-30 22:33:24 UTC (rev 10875)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-30 22:33:46 UTC (rev 10876)
@@ -70,7 +70,6 @@
DESCRIPTION=Description
REMOTE=Remote
REMOTABLE=Remotable
-ACTIONS=Actions
CREATE_INSTANCE=Create instance
PORTLET_DEFINITIONS=Portlet Definitions
DETAILS=details
@@ -176,7 +175,6 @@
COMMON_TRANSPORT_GUARANTEES=Transport Guarantees
COMMON_CACHE_EXPIRATION=Cache Expiration
COMMON_SECONDS=seconds
-COMMON_MODES=Modes
COMMON_PUBLIC_NAVIGATION_PARAMETERS=Public Navigation Parameters
COMMON_CONSUMED_EVENTS=Consumed Events
COMMON_PRODUCED_EVENTS=Produced Events
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-30 22:33:24 UTC (rev 10875)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-30 22:33:46 UTC (rev 10876)
@@ -42,7 +42,6 @@
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
@@ -125,6 +124,7 @@
COMMON_OR=o
COMMON_ENTER_PROPERTY_NAME=Inserisci il nome della propriet\u00e0
COMMON_MANAGE_PROPERTIES=Gestisci le propriet\u00e0 attualmente definite
+COMMON_DESCRIPTION=Descrizione
COMMON_INHERITED=Ereditato
COMMON_YES=Si
COMMON_NO=No
@@ -134,6 +134,7 @@
COMMON_SETTING=Configurazione
COMMON_LAYOUT=Layout
COMMON_NAME_LAYOUT_IMPLEMENTATION=Nome dell\'implementazione del layout usato per le finestre della portlet nelle pagine
+COMMON_THEME=Tema
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
@@ -162,11 +163,11 @@
COMMON_APPEND=Aggiungi
COMMON_LOCALE=Nazionalit\u00e0
COMMON_DISPLAY_NAME=Visualizza Nome
-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_MEDIA_TYPES=Tipi di Media
+COMMON_WINDOW_STATES=Stati della Finestra
+COMMON_PORTLET_MODES=Modalit\u00e0
+COMMON_PREFERENCES=Preferenze
+COMMON_PUBLIC_RENDER_PARAMETERS=Parametri pubblici di visualizzazione
COMMON_ID=Id
COMMON_TITLE=Titolo
COMMON_KEYWORDS=Parole chiave
@@ -174,7 +175,6 @@
COMMON_TRANSPORT_GUARANTEES=Garanzia di Trasporto
COMMON_CACHE_EXPIRATION=Durata della Cache
COMMON_SECONDS=secondi
-COMMON_MODES=Modalit\u00e0
COMMON_PUBLIC_NAVIGATION_PARAMETERS=Parametri pubblici di navigazione
COMMON_CONSUMED_EVENTS=Eventi ricevuti
COMMON_PRODUCED_EVENTS=Eventi prodotti
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10875 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-30 18:33:24 -0400 (Fri, 30 May 2008)
New Revision: 10875
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml
Log:
updated internationalization
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-30 22:30:43 UTC (rev 10874)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/portlets.xhtml 2008-05-30 22:33:24 UTC (rev 10875)
@@ -17,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>
@@ -86,11 +86,11 @@
</tbody>
<tfoot 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>
</tfoot>
</table>
@@ -173,7 +173,7 @@
<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>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10874 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-30 18:30:43 -0400 (Fri, 30 May 2008)
New Revision: 10874
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml
Log:
updated internationalization
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-30 22:28:21 UTC (rev 10873)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/instances.xhtml 2008-05-30 22:30:43 UTC (rev 10874)
@@ -71,9 +71,9 @@
</tbody>
<tfoot 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>
</tfoot>
</table>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10873 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-30 18:28:21 -0400 (Fri, 30 May 2008)
New Revision: 10873
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml
Log:
updated internationalization
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-30 22:27:37 UTC (rev 10872)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/wizard/selectPortlet.xhtml 2008-05-30 22:28:21 UTC (rev 10873)
@@ -50,7 +50,7 @@
</tbody>
<tfoot class="portlet-section-header">
<tr>
- <th>Name</th>
+ <th>#{bundle.COMMON_NAME}</th>
</tr>
</tfoot>
</table>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10872 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-30 18:27:37 -0400 (Fri, 30 May 2008)
New Revision: 10872
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml
Log:
updated internationalization
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-30 20:54:24 UTC (rev 10871)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/showPortletDetails.xhtml 2008-05-30 22:27:37 UTC (rev 10872)
@@ -27,10 +27,10 @@
</div>
<div class="full-width sub-header1">
<ul>
- <li class="third-width"><label>Title: </label>#{portlet.title.value}</li>
- <li class="third-width"><label>Keywords: </label>#{portlet.keywords.value}</li>
+ <li class="third-width"><label>#{bundle.COMMON_TITLE}: </label>#{portlet.title.value}</li>
+ <li class="third-width"><label>#{bundle.COMMON_KEYWORDS}: </label>#{portlet.keywords.value}</li>
<f:subview id="locales" rendered="#{not empty portlet.locales}">
- <li class="third-width"><label>Locales: </label>
+ <li class="third-width"><label>#{bundle.COMMON_LOCALES}: </label>
<c:forEach items="#{portlet.locales}" var="locale">
<h:graphicImage style="margin: 0 3px 0 3px 0;" value="/img/locales/#{locale}.gif" alt="#{locale}"/>  
</c:forEach>
@@ -41,12 +41,12 @@
</div>
<div class="full-width sub-header2">
<ul>
- <li class="third-width"><label>Transport Guarantees: </label>
+ <li class="third-width"><label>#{bundle.COMMON_TRANSPORT_GUARANTEES}: </label>
<c:forEach var="transportGuarantees" items="#{portlet.info.security.transportGuarantees}">
#{transportGuarantees}  
</c:forEach>
</li>
- <li class="third-width"><label>Cache Expiration: </label>#{portlet.info.cache.expirationSecs} seconds</li>
+ <li class="third-width"><label>#{bundle.COMMON_CACHE_EXPIRATION}: </label>#{portlet.info.cache.expirationSecs} #{bundle.COMMON_SECONDS}</li>
</ul>
<br class="clear"/>
</div>
@@ -94,7 +94,7 @@
</dl>
</portal:box>
<portal:box class="whiteWithLtGreyHeader meta-box">
- <h3>#{bundle.COMMON_WINDOW_STATES}</h3>
+ <h3>#{bundle.PREFERENCES}</h3>
<dl>
<c:forEach var="preferenceKey" items="#{portlet.info.preferences.keys}">
<dt>
@@ -160,34 +160,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>
@@ -220,7 +220,7 @@
</dl>
</portal:box>
<portal:box class="whiteWithLtGreyHeader meta-box">
- <h3>#{bundle.COMMON_CONSUMEED_EVENTS}</h3>
+ <h3>#{bundle.COMMON_CONSUMED_EVENTS}</h3>
<dl>
<c:forEach var="consumedEvent" items="#{portlet.info.eventing.consumedEvents}">
<dt>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10871 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-30 16:54:24 -0400 (Fri, 30 May 2008)
New Revision: 10871
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
Log:
added new keywords
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-30 18:42:44 UTC (rev 10870)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-30 20:54:24 UTC (rev 10871)
@@ -170,8 +170,17 @@
COMMON_PREFERENCES=Preferences
COMMON_PUBLIC_RENDER_PARAMETERS=Public Render Parameters
COMMON_ID=Id
+COMMON_TITLE=Title
+COMMON_KEYWORDS=Keywords
+COMMON_LOCALES=Locales
+COMMON_TRANSPORT_GUARANTEES=Transport Guarantees
+COMMON_CACHE_EXPIRATION=Cache Expiration
+COMMON_SECONDS=seconds
+COMMON_MODES=Modes
+COMMON_PUBLIC_NAVIGATION_PARAMETERS=Public Navigation Parameters
+COMMON_CONSUMED_EVENTS=Consumed Events
+COMMON_PRODUCED_EVENTS=Produced Events
-
DASHBOARD_PERSONAL_EDITOR=Personal Dashboard Editor
DASHBOARD_CREATE_NEW_PAGE=Create a New Page
DASHBOARD_CREATE_PAGE=Page name
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-30 18:42:44 UTC (rev 10870)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-30 20:54:24 UTC (rev 10871)
@@ -162,6 +162,22 @@
COMMON_APPEND=Aggiungi
COMMON_LOCALE=Nazionalit\u00e0
COMMON_DISPLAY_NAME=Visualizza Nome
+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
+COMMON_TITLE=Titolo
+COMMON_KEYWORDS=Parole chiave
+COMMON_LOCALES=Nazionalit\u00e0
+COMMON_TRANSPORT_GUARANTEES=Garanzia di Trasporto
+COMMON_CACHE_EXPIRATION=Durata della Cache
+COMMON_SECONDS=secondi
+COMMON_MODES=Modalit\u00e0
+COMMON_PUBLIC_NAVIGATION_PARAMETERS=Parametri pubblici di navigazione
+COMMON_CONSUMED_EVENTS=Eventi ricevuti
+COMMON_PRODUCED_EVENTS=Eventi prodotti
DASHBOARD_PERSONAL_EDITOR=Editor personale della Dashboard
DASHBOARD_CREATE_NEW_PAGE=Crea una nuova pagina
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10869 - modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-30 13:20:58 -0400 (Fri, 30 May 2008)
New Revision: 10869
Modified:
modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java
Log:
- Google changed their code again...
Modified: modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java
===================================================================
--- modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java 2008-05-30 16:34:42 UTC (rev 10868)
+++ modules/portlet/trunk/samples/src/main/java/org/jboss/portal/portlet/samples/google/GoogleClippingPortlet.java 2008-05-30 17:20:58 UTC (rev 10869)
@@ -70,7 +70,7 @@
String html = new String(getBytes(in, 16384), "UTF-8");
in.close();
- String beg = "<div id=res><div";
+ String beg = "<div id=\"res\"><div";
String end = "</table>";
int begIndex = html.indexOf(beg);
if (begIndex != -1)
@@ -79,8 +79,8 @@
int endIndex = html.indexOf(end, begIndex);
html = html.substring(begIndex + beg.length(), endIndex + end.length());
- html = html.substring(html.indexOf(">")+1);
-
+ html = html.substring(html.indexOf(">") + 1);
+
html = postProcessHTML(html);
renderResponse.setContentType("text/html");
@@ -104,17 +104,17 @@
{
renderResponse.setContentType("text/html");
renderResponse.getWriter().print(
- "<div align='center'>\n" +
- " <br/>\n" +
- " <font class='portlet-font'>Change Location:</font>\n" +
- "\n" +
- " <form method='post' action='" + renderResponse.createActionURL() + "'\n" +
- " <font class='portlet-font'>Zip Code:</font><br/>\n" +
- " <input class='portlet-form-input-field' type='text' value='' size='12' name='" + ZIP + "'/>\n" +
- " <br/>\n" +
- " <input class='portlet-form-input-field' type='submit' name='submit' value='submit'>\n" +
- " </form>\n" +
- "</div>");
+ "<div align='center'>\n" +
+ " <br/>\n" +
+ " <font class='portlet-font'>Change Location:</font>\n" +
+ "\n" +
+ " <form method='post' action='" + renderResponse.createActionURL() + "'\n" +
+ " <font class='portlet-font'>Zip Code:</font><br/>\n" +
+ " <input class='portlet-form-input-field' type='text' value='' size='12' name='" + ZIP + "'/>\n" +
+ " <br/>\n" +
+ " <input class='portlet-form-input-field' type='submit' name='submit' value='submit'>\n" +
+ " </form>\n" +
+ "</div>");
}
@Override
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10868 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 12:34:42 -0400 (Fri, 30 May 2008)
New Revision: 10868
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
Log:
"Powered by" sounds better... Unless we find something better in French
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2008-05-30 15:39:38 UTC (rev 10867)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2008-05-30 16:34:42 UTC (rev 10868)
@@ -21,7 +21,7 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-POWERED_BY=Fait par
+POWERED_BY=Powered by
THEME_BY=Th\u00e8me de
LOGIN=Se connecter
LOGOUT=Se d\u00e9connecter
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10867 - in branches/JBoss_Portal_Branch_2_7/core-wsrp/src/etc: sun-jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 11:39:38 -0400 (Fri, 30 May 2008)
New Revision: 10867
Added:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/etc/sun-jsf/
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/etc/sun-jsf/jsf-example.jar
Log:
- adding link to jsf-example.jar for apps that are not migrated yet
Added: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/etc/sun-jsf/jsf-example.jar
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/etc/sun-jsf/jsf-example.jar
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10866 - in branches/JBoss_Portal_Branch_2_7: core-wsrp and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 11:35:24 -0400 (Fri, 30 May 2008)
New Revision: 10866
Added:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/etc/
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml
Log:
- adding link to jsf-example.jar for apps that are not migrated yet
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-05-30 15:07:32 UTC (rev 10865)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2008-05-30 15:35:24 UTC (rev 10866)
@@ -108,7 +108,6 @@
<path refid="el.el.classpath"/>
<path refid="jakarta.cactus.classpath"/>
<path refid="junit.junit.classpath"/>
- <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<path refid="jbpm.jaronly.classpath"/>
<path refid="portlet.portlet.classpath"/>
</path>
@@ -208,7 +207,7 @@
<fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/>
<fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/>
<fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
+ <fileset dir="src/etc/sun-jsf" includes="jsf-example.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
<fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-05-30 15:07:32 UTC (rev 10865)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-05-30 15:35:24 UTC (rev 10866)
@@ -101,7 +101,6 @@
<path refid="facelets.facelets.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="el.el.classpath"/>
- <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
</path>
<!-- Configure modules -->
@@ -206,7 +205,7 @@
<fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/>
<fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/>
<!-- For JSF -->
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
+ <fileset dir="src/etc/sun-jsf" includes="jsf-example.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
<fileset dir="${commons.el.lib}" includes="commons-el.jar"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10865 - branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 11:07:32 -0400 (Fri, 30 May 2008)
New Revision: 10865
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
Log:
- Fix connected users, sample
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-30 15:05:57 UTC (rev 10864)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-30 15:07:32 UTC (rev 10865)
@@ -23,10 +23,23 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<portlet-app
- xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+ 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_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
- version="1.0">
+ 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>CurrentUsersPortlet</portlet-name>
+ </filter-mapping>
+
<portlet>
<description>Current users portlet</description>
<portlet-name>CurrentUsersPortlet</portlet-name>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10864 - in branches/JBoss_Portal_Branch_2_7: core/src/resources/portal-core-war/WEB-INF/classes and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 11:05:57 -0400 (Fri, 30 May 2008)
New Revision: 10864
Added:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_fr.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties
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/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_fr.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/header/header.jsp
Log:
- More i18n
- Removed old stuff
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-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -21,310 +21,10 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-_ASREGISTERED=Don't have an account yet? You can create <a href\="">one</a>.
-_BLOCKNICKNAME=Username
-_BLOCKPASSWORD=Password
-
-
-
-MessageOrder=Message order
-Ascending=Ascending
-Descending=Descending
-
-AIM=AIM Address
-ICQ=ICQ Number
-YIM=YIM Number
-MSNM=MSN Messenger
-
-YourAIM=Your AIM Address
-YourICQ=Your ICQ Number
-YourYIM=Your YIM Number
-YourMSNM=Your MSN Messenger
-
-MyEmail=My e-mail
-MyHomePage=My homepage
-
-Question=Secret question
-Answer=Secret answer
-Location=Location
-Occupation=Occupation
-Interests=Interests
-ExtraInfo=Extra Information
-YourLocation=Your location
-YourOccupation=Your occupation
-YourInterests=Your interests
-Signature=Signature
-
-LoginSite=Login.
-Register=Register.
-
-UserExist=Username already exists
-ToChangeInfo=to change your info
-EmailVerify=Activation link Emailed! Check your email and click the activation link to activate your account.
-AccountActivated=Account successfully activated!
-UnableActivate=Unable to validate new user.
-LoggingYou=Logging you in, hang tight\!
-YouAreLoggedOut=You are now logged out\!
-PassDifferent=The passwords are different. They need to be identical.
-YourPassMustBe=Sorry, your password must be at least
-CharLong=characters long
-UserNotExist=User doesn't exist\!
-UserRegLogin=User registration/login
-SelectOption=Please select an option from the menu below\:
-RetrievePass=Retrieve lost password.
-RegNewUser=New user registration
-PasswordAgain=Confirm your password
-Email=E-mail
-Options=Options
-AllowEmailView=Allow other users to view my e-mail address
-AsRegUser=As a registered user you can\:
-AsReg6=Select different themes
-AsReg5=Customize the comments
-AsReg4=Select how many news items to show on the homepage
-AsReg3=Have a personal box on the homepage
-AsReg2=Send news with your username
-AsReg1=Post comments with your username
-RegisterNow=Register now\! It's free\!
-WeDontGive=We won't sell/give others your personal info.
-WelcomeTo=Welcome to
-Registration=registration area.
-
-Over13_1=I am
-Over13_2=or over or I have parental consent
-MustBe_1=You must be
-MustBe_2=or over, or have parental permission to register here.
-Consent_1=(By clicking on the above link you certify that you are either<br>
-Consent_2=or over, or that you have parental consent to register here.)
-Under13_1=I am under
-Under13_2=and do not have parental consent.
-
-Sorry=Sorry.
-Click=Please click
-Here=here
-Return=to return to the main page.
-UserName=Username
-GoBack=Back
-Finish=Finish
-PersonalInfo=Personal information
-RealName=Real name
-Optional=(optional)
-CanKnowAbout=(255 characters max. Type what you'd like others to know about you)
-Language=Language
-255CharMax=(255 characters max. Type your signature with HTML coding)
-YourAvatar=Your avatar
-YourHomePage=Your website
-TimeZoneOffset=Time zone offset
-EmailNotPublic=(This e-mail will not be public but is required. It will be used to send your password if you lose it)
-EmailPublic=(This e-mail will be public. Type what you'd like. Spam proof)
-RealEmail=Real e-mail
-FakeEmail=Fake e-mail
-NewUser=New user
-SaveChanges=Save Changes
-SaveChange=Save Change
-TypeNewPassword=(type a new password twice to change it)
-Search=Search
-All=All
-UsersFoundFor=users found for
-Pages=pages
-UsersShown=users shown
-Delete=Delete
-Edit=Edit
-Ok=Ok
-Cancel=Cancel
-AreYouSureToDeleteUser=Are you sure to delete user?
-UserDeleted=User deleted succesfully
-ReturnToMemberList=Return to member list
-Avatar=Avatar
-AdminFunctions=Admin functions
-URL=URL
-UpdateUser=Update user
-UserID=User ID
-ForChanges=(For changes only)
-MemberList=Member List
-SearchTip=Tip: choose a letter, display all or search for a user if you know its username
-
-ThemeText1=This option will change the look for the whole site.
-ThemeText2=The changes will be valid only to you.
-ThemeText3=Each user can view the site with a different theme.
-SelectTheme=Select a theme
-ThemeSelection=Theme selection
-
-CannotLogin=Cannot proceed to login
-
-LoginInvalidName=the user name is not valid
-LoginNoSuchUser=the user name does not exist
-LoginBadPassword=your password does not match
-LoginUnexpectedError=unexpected error
-LoginUserDisabled=your account has been blocked. Please contact an administrator.
-
-Enable=Enable
-Disable=Disable
-StatusChanged=The user status has been succesfully changed
-
-NotAuth=You\'re not authorized to perform this operation
-
-
-REMEMBERME=Remember me
-LOGIN=Login
-USERNAME=Username
-PASSWORD=Password
-USERLOGIN=User login
-
-OPTIONAL=Optional
-REQUIRED=Required
-
-255MAX=(Signature of 255 characters max)
-
-NAMENOTAVAILABLE=N/A
-
-MODIFIED_PROFILE=Your profile has been modified, the portal will be running with your former profile until you log back in.
-
-# Registration
-REGISTER_NOT_LOGGED_IN=You are currently not logged in.
-REGISTER_REGISTER=You can create an account.
-REGISTER_REGISTER_LINK=create one
-REGISTER_REGISTER_ADMIN_LINK=Create User account
-REGISTER_TY=Thank you for registering.
-REGISTER_BASICINFO=Basic User Information
-REGISTER_IM=Instant Message Identities
-REGISTER_ADDITIONAL=Additional Optional User Information
-REGISTER_NEWUSER=New user registration
-REGISTER_PASSWORDAGAIN=Confirm your password
-REGISTER_REALEMAIL=Real e-mail
-REGISTER_EMAILNOTPUBLIC=(This e-mail will not be public but is required. It will be used to send your password if you lose it)
-REGISTER_FAKEEMAIL=Fake e-mail
-REGISTER_EMAILPUBLIC=(This e-mail will be public. Type what you'd like. Spam proof)
-REGISTER_FAKEEMAIL_EXPLAIN=If this field is not empty, the real email will be used only to send notifications
-REGISTER_QUESTION=Secret question
-REGISTER_ANSWER=Secret answer
-REGISTER_ASREGUSER=As a registered user you can:
-REGISTER_ASREG6=Select different themes
-REGISTER_ASREG5=Customize the comments
-REGISTER_ASREG4=Select how many news items to show on the homepage
-REGISTER_ASREG3=Have a personal box on the homepage
-REGISTER_ASREG2=Send news with your username
-REGISTER_ASREG1=Post comments with your username
-REGISTER_REGISTERNOW=Register now! It's free!
-REGISTER_WEDONTGIVE=We won't sell/give others your personal info.
-REGISTER_ALREADYHAVEACCOUNT=You already have an account:
-REGISTER_SIGNIN=Sign in
-REGISTER_GIVENNAME=Firstname
-REGISTER_FAMILYNAME=Lastname
-REGISTER_PERSONALINFO=Personal information
-REGISTER_VIEWREALEMAIL=Allow other users to view my real e-mail address
-REGISTER_HOMEPAGE=Address of your personal website
-REGISTER_TIMEZONEOFFSET=Time zone offset
-REGISTER_THEME=Theme
-REGISTER_DEFAULT_THEME=Site Default
-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=Location
-REGISTER_LANGUAGE=Preferred language
-REGISTER_OCCUPATION=Occupation
-REGISTER_INTERESTS=Interests
-REGISTER_SIGNATURE=Signature
-REGISTER_EXTRAINFO=Extra information
-REGISTER_CANKNOWABOUT=(255 characters max. Type what you'd like others to know about you)
-REGISTER_SAVECHANGES=Save changes
-REGISTER_CONFIRMATIONEMAIL=Confirmation email
-
-REGISTER_SHOWMENU=Go back to the user menu
-
-REGISTER_ERROR_INVALIDUSERNAME=Username is not valid
-REGISTER_ERROR_EXISTINGUSERNAME=This username is already taken
-REGISTER_ERROR_INVALIDPASSWORD1=Password was not valid
-REGISTER_ERROR_INVALIDPASSWORD2=Password was not valid
-REGISTER_ERROR_PASSWORDMISMATCH=Passwords do not match
-REGISTER_ERROR_INVALIDREALEMAIL=Email address is not valid
-
-REGISTER_CONFIRM=User created successfully.
-REGISTER_ADMIN_SEARCH=View/Edit users
-
-
-MENU_LOGOUT=Logout
-MENU_EDITPROFILE=Edit your profile
-MENU_LISTUSERS=List of all the users
-
-LIST_FILTERS=Apply filters to the list
-LIST_USERSPERPAGE=Users per page
-LIST_USERNAMECONTAINS=Username contains
-LIST_FULLNAME=Fullname
-LIST_USERNAME=Username
-LIST_FIRSTNAME=Firstname
-LIST_LASTNAME=Lastname
-LIST_ROLES=Roles
-LIST_ACTIONS=Actions
-LIST_ACTIONSSHOWPROFILE=Profile
-LIST_ACTIONADDROLESTOUSER=Roles
-LIST_ACTIONEDITROLES=Edit Roles
-LIST_ACTIONDELETEUSER=Delete user
-LIST_CONFIRMDELETEUSER=You are about to delete a user
-LIST_SEARCHRESULTS=Search results for
-LIST_MATCHING=Matching Users
-FILTER=Filter
-
-NEXTPAGE=Next page
-PREVIOUSPAGE=Previous page
-
-ASSIGNROLES=Assign roles
-ASSIGNEDROLES=Roles to assign
-ROLESAVAILABLE=Available roles
-EDITROLESFORUSER=Edit roles for the user
-
-
-ROLE_THEREARE=There are
-ROLE_THEREIS=There is
-ROLE_ROLESDEFINED=roles defined
-ROLE_ROLEDEFINED=role defined
-
-ROLE_NAME=Name of the new role
-ROLE_DISPLAYNAME=Display name of the role
-ROLE_NEWDISPLAYNAME=New display name for the role
-ROLE_SELECTONETOMODIFY= Select the role to modify
-ROLE_SELECTONETODELETE= Select the role to delete
-ROLE_CREATE=Create user role
-ROLE_UPDATE=Update user role
-ROLE_EDIT=Edit user role
-ROLE_DELETE=Delete selected role
-ROLE_CONFIRM_DELETE=You are about to delete a role
-ROLE_DELETED=The role has been deleted
-ROLE_EDIT_MEMBERS=Edit role members
-ROLE_MAINLIST=Back to Role Edit
-ROLE_EDIT_USER=Editing users in Role
-ROLE_ADD=Add roles
-ROLE_REMOVE=Remove roles
-
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=There is already a role with that display name
-ROLE_ERROR_NAMEALREADYEXISTS=There is already a role with that name
-ROLE_ERROR_NAMEEMPTY=The role name cannot be empty
-ROLE_ERROR_DISPLAYNAMEEMPTY=The role display name cannot be empty
-ROLE_ERROR_DELETE_FAILED=Could not delete the role
-
-MENU_CREATEROLE=Create new role
-MENU_EDITROLE=Edit existing role
-MENU_EDITROLEMEMBERS=Role member
-
-ROLE_TEXT_1=Use this portlet to create, edit, delete and add users to roles.
-ROLE_TEXT_2=These roles are used in the Management Portlet to set access rights.
-
-PERMISSION_PICKPORTLET=Portlet Permissions Administration
-PERMISSION_PERMISSIONS=Permissions to modify
-PERMISSION_TOP=Select a Component to Modify
-PERMISSION_FINERGRAIN=Select a sub-component to define its permissions
-PERMISSION_MODIFYROLES=Add/Remove roles
-PERMISSION_MODIFYINGROLES=Modifying roles for
-PERMISSION_DOMAIN=Domain
-PERMISSION_DOMAIN_MOD=Modify Domain
-PERMISSION_DEFINEDROLES=Defined roles
-PERMISSION_IMPLIEDROLES=Implied roles
-
POWERED_BY=Powered by
-BAD_LOGIN=bad login
THEME_BY=Theme by
+LOGIN=Login
+LOGOUT=Logout
PORTLET_INSTANCE_ASSOCIATED=Portlet instance associated to this window
PORTLET_NAME=Portlet name
PORTLET_DESCRIPTION=Portlet description
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2008-05-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -1,296 +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. #
-################################################################################
-
-_ASREGISTERED=�No tiene una cuenta todav�a? Puede crear <a href\="">una</a>.
-_BLOCKNICKNAME=Usuario
-_BLOCKPASSWORD=Clave
-
-
-
-MessageOrder=�rden de Mensajes
-Ascending=Ascendente
-Descending=Descendente
-
-AIM=AIM Direcci�n
-ICQ=ICQ N�mero
-YIM=YIM N�mero
-MSNM=MSN Messenger
-
-YourAIM=Su direcci�n AIM
-YourICQ=Su n�mero ICQ
-YourYIM=Su n�mero YIM
-YourMSNM=Su Messenger MSN
-
-MyEmail=Mi e-mail
-MyHomePage=Mi p�gina de inicio
-
-Question=Pregunta secreta
-Answer=Respuesta secreta
-Location=Residencia
-Occupation=Puesto
-Interests=Intereses
-ExtraInfo=Informaci�n extra
-YourLocation=Su residencia
-YourOccupation=Su puesto
-YourInterests=Sus intereses
-Signature=Firma
-
-LoginSite=Login.
-Register=Registro.
-
-UserExist=Ese usuario ya existe
-ToChangeInfo=para cambiar tu informaci�n
-EmailVerify=�Enlace de activaci�n enviado! Comprueba tu correo y pincha en en enlace de activaci�n para activar tu cuenta.
-AccountActivated=�Cuenta activada!
-UnableActivate=Imposible validar el nuevo usuario.
-LoggingYou=Autenticando, \�espere\!
-YouAreLoggedOut=\�Ahora ya est�s autenticado\!
-PassDifferent=Las claves son diferentes. Tienen que ser id�nticas.
-YourPassMustBe=Lo sentimos, su clave debe ser por lo menos de
-CharLong=caracteres
-UserNotExist=\�El usuario no existe\!
-UserRegLogin=Registro de usuario/autenticaci�n
-SelectOption=por favor, elija una opci�n del men� siguiente\:
-RetrievePass=Recuperar la clave perdida.
-RegNewUser=Registro de un nuevo usuario
-PasswordAgain=Confirme su clave
-Email=E-mail
-Options=Opciones
-AllowEmailView=Permitir a otros usuarios ver mi direcci�n de e-mail
-AsRegUser=Como usuario registrado, usted podr�\:
-AsReg6=Elegir diferentes estilos
-AsReg5=Personalizar los comentarios
-AsReg4=Elegir cu�ntos objetos nuevos mostrar en la p�gina de inicio
-AsReg3=Tener un buz�n personal en la p�gina de inicio
-AsReg2=Enviar noticias con su usuario
-AsReg1=Responder con su usuario.
-RegisterNow=\�Reg�strese ahora\! \�Es gratis\!
-WeDontGive=No venderemos o daremos a otros su informaci�n personal.
-WelcomeTo=Bienvenido a
-Registration=la zona de registro.
-
-Over13_1=Tengo
-Over13_2=o m�s a�os o tengo consentimiento paterno
-MustBe_1=Debe tener
-MustBe_2=o m�s a�os, o tener permiso paterno para registrarse.
-Consent_1=(Pinchando en el enlace superior usted certifica que tiene<br>
-Consent_2=o m�s a�os, o que tiene permiso paterno para registrarse.)
-Under13_1=Tengo menos de
-Under13_2=a�os y no tengo consentimiento paterno.
-
-Sorry=Lo sentimos.
-Click=Por favor, pinche
-Here=aqu�
-Return=para volver a la p�gina principal.
-UserName=Usuario
-GoBack=Atr�s
-Finish=Finalizar
-PersonalInfo=Informaci�n personal
-RealName=Nombre real
-Optional=(opcional)
-CanKnowAbout=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
-Language=Lenguaje
-255CharMax=(255 caracteres max. Introduzca su firma en c�digo HTML)
-YourAvatar=Su avatar
-YourHomePage=Su p�gina de inicio
-TimeZoneOffset=Zona horaria
-EmailNotPublic=(Este correo no ser� p�blico pero es necesario. Se usar� para enviarle su clave en caso de p�rdida)
-EmailPublic=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
-RealEmail=E-mail real
-FakeEmail=E-mail de pega
-NewUser=Nuevo usuario
-SaveChanges=Guardar cambios
-SaveChange=Guardar cambio
-TypeNewPassword=(escriba una clave dos veces para cambiarla)
-Search=Buscar
-All=Todos
-UsersFoundFor=usuarios encontrados para
-Pages=p�ginas
-UsersShown=usuarios mostrados
-Delete=Borrar
-Edit=Editar
-Ok=Aceptar
-Cancel=Cancelar
-AreYouSureToDeleteUser=�De verdad quiere borrar el usuario?
-UserDeleted=Usuario borrado
-ReturnToMemberList=Volver a la lista de miembros
-Avatar=Avatar
-AdminFunctions=Tareas administrativas
-URL=URL
-UpdateUser=Actualizaci�n de usuario
-UserID=ID de usuario
-ForChanges=(S�lo para cambios)
-MemberList=Lista de miembros
-SearchTip=Sugerencia: escoja una letra, muestre todos o busque un usuario si conoce su nombre
-
-ThemeText1=Esta opci�n cambia la apariencia de todo el sitio.
-ThemeText2=Estos cambios s�lo le afectar�n a usted.
-ThemeText3=Cada usuario puede ver el sitio con una apariencia diferente.
-SelectTheme=Elegir un estilo
-ThemeSelection=Elecci�n de estilo
-
-CannotLogin=No se puede autenticar
-
-LoginInvalidName=El nombre de usuario no es v�lido
-LoginNoSuchUser=el nombre de usuario no existe
-LoginBadPassword=su contrase�a no coincide
-LoginUnexpectedError=error inesperado
-LoginUserDisabled=su cuenta ha sido bloqueada. Por favor, contacte con un administrador.
-
-Enable=Activar
-Disable=Desactivar
-StatusChanged=El estado del usuario ha sido cambiado
-
-NotAuth=Usted no est� autorizado para realizar esta operaci�n
-
-REMEMBERME=Recordarme
-LOGIN=Login
-USERNAME=Usuario
-PASSWORD=Clave
-USERLOGIN=Login de usuario
-
-OPTIONAL=Opcional
-REQUIRED=Obligatorio
-
-255MAX=(Firma de 255 caract�res max)
-
-NAMENOTAVAILABLE=N/A
-
-# Registration
-REGISTER_REGISTER=Puedes crear una cuenta.
-REGISTER_REGISTER_LINK=crear una
-REGISTER_REGISTER_ADMIN_LINK=Crear una cuenta
-REGISTER_NEWUSER=Registro de nuevo usuario
-REGISTER_PASSWORDAGAIN=Confirme su clave
-REGISTER_REALEMAIL=E-mail real
-REGISTER_EMAILNOTPUBLIC=(Este correo no ser� p�blico pero es necesario. Se usar� para enviarle su clave en caso de p�rdida)
-REGISTER_FAKEEMAIL=E-mail de pega
-REGISTER_EMAILPUBLIC=(Este correo ser� p�blico. Escriba lo que quiera. Prueba de Spam)
-REGISTER_FAKEEMAIL_EXPLAIN= Si este campo no est� vac�o, el e-mail real s�lo se usar� para enviarle notificaciones
-REGISTER_QUESTION=Pregunta secreta
-REGISTER_ANSWER=Respuesta secreta
-REGISTER_ASREGUSER=Como usuario registrado, usted podr�:
-REGISTER_ASREG6=Elegir diferentes estilos
-REGISTER_ASREG5=Personalizar los comentarios
-REGISTER_ASREG4=Elegir cu�ntos objetos nuevos mostrar en la p�gina de inicio
-REGISTER_ASREG3=Tener un buz�n personal en la p�gina de inicio
-REGISTER_ASREG2=Enviar noticias con su usuario
-REGISTER_ASREG1=Responder con su usuario.
-REGISTER_REGISTERNOW=�Reg�strese ahora! �Es gratis!
-REGISTER_WEDONTGIVE=No venderemos o daremos a otros su informaci�n personal.
-REGISTER_ALREADYHAVEACCOUNT=Usted ya tiene una cuenta:
-REGISTER_SIGNIN=Entrar
-REGISTER_GIVENNAME=Nombre
-REGISTER_FAMILYNAME=Apellido
-REGISTER_PERSONALINFO=Informaci�n personal
-REGISTER_VIEWREALEMAIL=Permitir a otros usuarios ver mi direcci�n de e-mail real
-REGISTER_HOMEPAGE=Direcci�n de su pagina personal
-REGISTER_TIMEZONEOFFSET=Zona horaria
-REGISTER_THEME=Estilo
-REGISTER_DEFAULT_THEME=Site Default
-REGISTER_ICQ=ICQ id
-REGISTER_AIM=AIM id
-REGISTER_YIM=Yahoo id
-REGISTER_MSNM=MSN messenger id
-REGISTER_SKYPE=Skype id
-REGISTER_LOCATION=Residencia
-REGISTER_LANGUAGE=Lenguaje preferido
-REGISTER_OCCUPATION=Puesto
-REGISTER_INTERESTS=Intereses
-REGISTER_SIGNATURE=Firma
-REGISTER_EXTRAINFO=Informaci�n adicional
-REGISTER_CANKNOWABOUT=(255 caracteres max. Introduzca lo que quiera que otros conozcan de usted)
-REGISTER_SAVECHANGES=Guardar cambios
-REGISTER_CONFIRMATIONEMAIL=email de confirmaci�n
-
-REGISTER_SHOWMENU=Volver al men� de usuario
-
-REGISTER_ERROR_INVALIDUSERNAME=El usuario no es v�lido
-REGISTER_ERROR_EXISTINGUSERNAME=Este usuario ya existe
-REGISTER_ERROR_INVALIDPASSWORD1=La clave no es v�lida
-REGISTER_ERROR_INVALIDPASSWORD2=La clave no es v�lida
-REGISTER_ERROR_PASSWORDMISMATCH=Las Claves no coincide
-REGISTER_ERROR_INVALIDREALEMAIL=La direcci�n de E-mail no es v�lida
-
-MENU_LOGOUT=Desconectarse
-MENU_EDITPROFILE=Editar su perfil
-MENU_LISTUSERS=Listar todos los usuarios
-
-LIST_FILTERS=Aplicar filtros a la lista
-LIST_USERSPERPAGE=N�mero de usuarios por p�gina
-LIST_USERNAMECONTAINS=Usuario contiene
-LIST_FULLNAME=Nombre completo
-LIST_USERNAME=Nombre de usuario
-LIST_ROLES=Roles
-LIST_ACTIONS=Acciones
-LIST_ACTIONSSHOWPROFILE=Perfil
-LIST_ACTIONADDROLESTOUSER=Roles
-LIST_ACTIONEDITROLES=Editar Roles
-LIST_ACTIONDELETEUSER=Borrar el usario
-FILTER=Filtro
-
-NEXTPAGE=P�gina siguiente
-PREVIOUSPAGE=P�gina anterior
-
-ASSIGNROLES=Asignar roles
-ROLESAVAILABLE=Roles disponibles
-EDITROLESFORUSER=Editar roles para el usuario
-
-
-ROLE_THEREARE=Hay
-ROLE_THEREIS=Hay
-ROLE_ROLESDEFINED=roles definidos
-ROLE_ROLEDEFINED=rol definido
-
-ROLE_NAME=Nombre del nuevo rol
-ROLE_DISPLAYNAME=Nombre para mostrar del rol
-ROLE_NEWDISPLAYNAME=Nombre para mostrar del nuevo rol
-ROLE_SELECTONETOMODIFY= Elegir el rol para modificar
-ROLE_SELECTONETODELETE= Elegir el rol para borrar
-ROLE_CREATE=Crear un rol de usuario
-ROLE_UPDATE=Modificar un rol de usuario
-ROLE_EDIT=Editar un rol de usuario
-ROLE_DELETE=Borrar el rol elegido
-ROLE_DELETED=El rol ha sido borrado
-ROLE_EDIT_MEMBERS=Editar miembros del rol
-ROLE_MAINLIST=Volver a edici�n de roles
-
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Ya existe un rol con ese nombre para mostrar
-ROLE_ERROR_NAMEALREADYEXISTS=Ya existe un rol con ese nombre
-ROLE_ERROR_NAMEEMPTY=El nombre del rol no puede dejarse en blanco
-ROLE_ERROR_DISPLAYNAMEEMPTY=El nombre para visualizar del rol no puede dejarse en blanco
-ROLE_ERROR_DELETE_FAILED=No se puede borrar el rol
-ROLE_EDIT_USER=Editar usuarios del rol
-
-MENU_CREATEROLE=Crear un nuevo rol
-MENU_EDITROLE=Editar un rol existente
-MENU_EDITROLEMEMBERS=Editar los miembros de un rol
-
-PERMISSION_PICKPORTLET=Permisos de administraci�n de portlets
-PERMISSION_PERMISSIONS=Permisos para modificaci�n
-PERMISSION_TOP=Elegir un componente para modificar
-PERMISSION_FINERGRAIN=Elegir un sub-componente para definir sus permisos
-PERMISSION_MODIFYROLES=A�adir/Borrar roles
-PERMISSION_MODIFYINGROLES=Modificar roles para
-PERMISSION_DOMAIN=Dominio
-PERMISSION_DOMAIN_MOD=Modificar el dominio
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2008-05-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -1,4 +1,3 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
################################################################################
# JBoss, a division of Red Hat #
# Copyright 2006, Red Hat Middleware, LLC, and individual #
@@ -22,527 +21,17 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-255CharMax = (255 caract\u00E8res maximum. Vous pouvez inclure des balises HTML dans votre signature.)
-
-255MAX = (Signature de 255 caract\u00E8res max)
-
-AIM = Addresse AIM
-
-ASSIGNEDROLES = R\u00F4les \u00E0 assigner
-
-ASSIGNROLES = Assigner des r\u00F4les
-
-AccountActivated = Compte activ\u00E9
-
-AdminFunctions = Fonctions d'administration
-
-All = Tous
-
-AllowEmailView = Autoriser les autres utilisateurs \u00E0 voir mon adresse courriel
-
-Answer = R\u00E9ponse secr\u00E8te
-
-AreYouSureToDeleteUser = Voulez-vous vraiment supprimer le compte?
-
-AsReg1 = Soumettre un commentaire avec votre identifiant
-
-AsReg2 = Envoyez une nouvelle avec votre identifiant
-
-AsReg3 = Avoir une bo\u00EEte de saisie de mot de passe sur la page d'accueil
-
-AsReg4 = Choisissez combien de nouvelles vous voulez afficher sur votre page
-
-AsReg5 = Pesonnalizez les commentaires
-
-AsReg6 = Selectionnez parmis les diff\u00E9rents th\u00E8mes
-
-AsRegUser = En tant qu'utilisateur enregistr\u00E9 vous pouvez:
-
-Ascending = Ascendant
-
-Avatar = Avatar
-
-CanKnowAbout = (255 caracteres max. Pr\u00E9cisez ce que les autres devraient savoir de vous.)
-
-Cancel = Annuler
-
-CannotLogin = Connexion impossible
-
-CharLong = caract\u00E8res de long
-
-Click = S'il vous pla\u00EEt, cliquez
-
-Consent_1 = (En cliquant sur le lien ci-dessus vous d\u00E9clarez avoir <br>
-
-Consent_2 = ans ou plus, ou avoir l'autorisation de vos parents)
-
-Delete = Supprimer
-
-Descending = Descendant
-
-Disable = D\u00E9sactiver
-
-EDITROLESFORUSER = Modifier les r\u00F4les de l'utilisateur
-
-Edit = Modifier
-
-Email = Courriel
-
-EmailNotPublic = (Une adresse de courriel est obligatoire, mais ne sera pas diffus\u00E9e. Elle n'est utilis\u00E9e que pour vous envoyer votre mot de passe)
-
-EmailPublic = (Cette adresse de courriel sera diffus\u00E9e. Inscrivez y ce que vous voulez afin de d\u00E9jouer les robots de pourriel.)
-
-EmailVerify = Votre lien d'activation a \u00E9t\u00E9 envoy\u00E9 par courriel. Consultez vos messages et clickez sur le lien qui y est inclus pour activer votre compte.
-
-Enable = Activer
-
-ExtraInfo = Informations compl\u00E9mentaires
-
-FILTER = Filtre
-
-FakeEmail = Adresse de courriel factice
-
-Finish = Terminer
-
-ForChanges = (Modifications seulement)
-
-GoBack = Retour
-
-Here = ici
-
-ICQ = Num\u00E9ro ICQ
-
-Interests = Centres d'int\u00E9r\u00EAts
-
-LIST_ACTIONADDROLESTOUSER = R\u00F4les
-
-LIST_ACTIONDELETEUSER = Supprimer le compte
-
-LIST_ACTIONEDITROLES = Modifier les r\u00F4les
-
-LIST_ACTIONS = Actions
-
-LIST_ACTIONSSHOWPROFILE = Profil
-
-LIST_CONFIRMDELETEUSER = Vous allez supprimer d\u00E9finitivement un compte d'utilisateur
-
-LIST_FILTERS = Filtrer la liste
-
-LIST_FIRSTNAME = Pr\u00E9nom
-
-LIST_FULLNAME = Nom complet
-
-LIST_LASTNAME = Nom de famille
-
-LIST_MATCHING = Utilisateurs trouv\u00E9s
-
-LIST_ROLES = R\u00F4les
-
-LIST_SEARCHRESULTS = R\u00E9sultats de la recherche pour
-
-LIST_USERNAME = Identifiant
-
-LIST_USERNAMECONTAINS = L'identifiant contient
-
-LIST_USERSPERPAGE = Utilisateurs par page
-
-LOGIN = Login
-
-Language = Langage
-
-Location = Lieu de r\u00E9sidence
-
-LoggingYou = Bienvenue, connexion en cours ...
-
-LoginBadPassword = Le mot de passe n'est pas valide
-
-LoginInvalidName = L'identifiant n'est pas valide
-
-LoginNoSuchUser = Ce compte n'existe pas
-
-LoginSite = Login.
-
-LoginUnexpectedError = Erreur innatendue
-
-LoginUserDisabled = Votre compte est bloqu\u00E9. Consultez un administrateur.
-
-MENU_CREATEROLE = Cr\u00E9er un r\u00F4le
-
-MENU_EDITPROFILE = Modifier votre profil
-
-MENU_EDITROLE = Modifier un r\u00F4le existant
-
-MENU_EDITROLEMEMBERS = Membre du r\u00F4le
-
-MENU_LISTUSERS = Liste des utilisateurs
-
-MENU_LOGOUT = D\u00E9connection
-
-MODIFIED_PROFILE = Votre profil a \u00E9t\u00E9 modifi\u00E9. Les changements seront refl\u00E9t\u00E9s lors de votre prochaine visite.
-
-MSNM = Identifiant MSN
-
-MemberList = Liste des membres
-
-MessageOrder = Ordre des messages
-
-MustBe_1 = Vous devez avoir
-
-MustBe_2 = ans ou plus ou avoir l'autorisation de vos parents
-
-MyEmail = Mon courriel
-
-MyHomePage = Ma page personnelle
-
-NAMENOTAVAILABLE = N/D
-
-NEXTPAGE = Page suivante
-
-NewUser = Nouveau compte
-
-NotAuth = Op\u00E9ration non autoris\u00E9e
-
-OPTIONAL = Facultatif
-
-Occupation = Occupation
-
-Ok = Ok
-
-Optional = (optionel)
-
-Options = Options
-
-Over13_1 = J'ai
-
-Over13_2 = ans ou plus ou j'ai l'autorisation de mes parents
-
-PASSWORD = Mot de passe
-
-PERMISSION_DEFINEDROLES = R\u00F4les actuels
-
-PERMISSION_DOMAIN = Domaine
-
-PERMISSION_DOMAIN_MOD = Modifier le domaine
-
-PERMISSION_FINERGRAIN = S\u00E9lectionnez un sous-\u00E9l\u00E9ment afin d'en d\u00E9finir les permissions
-
-PERMISSION_IMPLIEDROLES = R\u00F4les h\u00E9rit\u00E9s
-
-PERMISSION_MODIFYINGROLES = Modification des r\u00F4les pour
-
-PERMISSION_MODIFYROLES = Ajouter/Supprimer des r\u00F4les
-
-PERMISSION_PERMISSIONS = Permissions de modifier
-
-PERMISSION_PICKPORTLET = Administration des permissions du portlet
-
-PERMISSION_TOP = S\u00E9lectionnez un module \u00E0 modifier
-
-PREVIOUSPAGE = Page pr\u00E9c\u00E9dente
-
-Pages = pages
-
-PassDifferent = Les mots de passe sont diff\u00E9rents, ils doivent \u00EAtre identiques.
-
-PasswordAgain = Confirmez votre mot de passe
-
-PersonalInfo = Informations personnelles
-
-Question = Question secr\u00E8te
-
-REGISTER_ADDITIONAL = Informations additionnelles facultatives
-
-REGISTER_ADMIN_SEARCH = Visualiser/Modifier les comptes
-
-REGISTER_AIM = Identifiant AIM
-
-REGISTER_ALREADYHAVEACCOUNT = Vous avez d\u00E9j\u00E0 un compte:
-
-REGISTER_ANSWER = R\u00E9ponse secr\u00E8te
-
-REGISTER_ASREG1 = Soumettre des commentaires avec votre identifiant
-
-REGISTER_ASREG2 = Soumettre des nouvelles avec votre identifiant
-
-REGISTER_ASREG3 = Avoir une bo\u00EEte de saisie de mot de passe sur la page d'accueil
-
-REGISTER_ASREG4 = S\u00E9lectionnez combien de nouvelles doivent \u00EAtre affich\u00E9es sur la page d'accueil
-
-REGISTER_ASREG5 = Personnaliser les commentaires
-
-REGISTER_ASREG6 = Choisir parmi plusieurs th\u00E8mes
-
-REGISTER_ASREGUSER = En \u00E9tant enregistr\u00E9 vous pouvez:
-
-REGISTER_BASICINFO = Informations de base
-
-REGISTER_CANKNOWABOUT = (255 caract\u00E8res maximum. Indiquez ce que vous voulez que les autres sachent de vous.)
-
-REGISTER_CONFIRM = Compte cr\u00E9\u00E9 avec succ\u00E8s.
-
-REGISTER_CONFIRMATIONEMAIL = Courriel de confirmation
-
-REGISTER_DEFAULT_THEME = D\u00E9faut du site
-
-REGISTER_EMAILNOTPUBLIC = (Ce courriel ne sera pas diffus\u00E9 mais est obligatoire. Il sera utilis\u00E9 pour vous envoyer votre mot de passe)
-
-REGISTER_EMAILPUBLIC = (Cet e-mail sera diffus\u00E9. Indiquez ce que vous d\u00E9sirez afin de d\u00E9jouer les robots de pourriel.)
-
-REGISTER_ERROR_EXISTINGUSERNAME = Cet identifiant est d\u00E9j\u00E0 pris
-
-REGISTER_ERROR_INVALIDPASSWORD1 = Le mot de passe n'est pas valide
-
-REGISTER_ERROR_INVALIDPASSWORD2 = Le mot de passe n'est pas valide
-
-REGISTER_ERROR_INVALIDREALEMAIL = L'adresse courriel n'est pas valide
-
-REGISTER_ERROR_INVALIDUSERNAME = L'identifiant n'est pas valide
-
-REGISTER_ERROR_PASSWORDMISMATCH = Les mots de passe sont diff\u00E9rents
-
-REGISTER_EXTRAINFO = Informations compl\u00E9mentaires
-
-REGISTER_FAKEEMAIL = Courriel fictif
-
-REGISTER_FAKEEMAIL_EXPLAIN = Si ce champ n'est pas vide, l'adresse de courriel r\u00E9elle ne sera utilis\u00E9e que pour envoyer des notifications
-
-REGISTER_FAMILYNAME = Nom de famille
-
-REGISTER_GIVENNAME = Pr\u00E9nom
-
-REGISTER_HOMEPAGE = Addresse de votre site web
-
-REGISTER_ICQ = Num\u00E9ro ICQ
-
-REGISTER_IM = Identit\u00E9s de messagerie instantan\u00E9e
-
-REGISTER_INTERESTS = Champs d'int\u00E9r\u00EAts
-
-REGISTER_LANGUAGE = Langue pr\u00E9f\u00E9r\u00E9e
-
-REGISTER_LOCATION = Lieu de r\u00E9sidence
-
-REGISTER_MSNM = Identifiant MSN
-
-REGISTER_NEWUSER = Enregistrement d'un nouvel utilisateur
-
-# Registration
-REGISTER_NOT_LOGGED_IN = Vous n'\u00EAtes pas connect\u00E9
-
-REGISTER_OCCUPATION = M\u00E9tier
-
-REGISTER_PASSWORDAGAIN = Confirmer votre mot de passe
-
-REGISTER_PERSONALINFO = Information personelles
-
-REGISTER_QUESTION = Question secr\u00E8te
-
-REGISTER_REALEMAIL = Courriel r\u00E9el
-
-REGISTER_REGISTER = Cr\u00E9er un compte
-
-REGISTER_REGISTERNOW = Enregistrez-vous! C'est gratuit!
-
-REGISTER_REGISTER_ADMIN_LINK = Cr\u00E9er un compte
-
-REGISTER_REGISTER_LINK = Cr\u00E9er un
-
-REGISTER_SAVECHANGES = Enregistrer les changements
-
-REGISTER_SHOWMENU = Retour au menu utilisateur
-
-REGISTER_SIGNATURE = Signature
-
-REGISTER_SIGNIN = Connexion
-
-REGISTER_SKYPE = Identifiant Skype
-
-REGISTER_THEME = Th\u00E8me
-
-REGISTER_TIMEZONEOFFSET = Fuseau horaire
-
-REGISTER_TY = Merci de vous \u00EAtre enregistr\u00E9.
-
-REGISTER_VIEWREALEMAIL = Permettre aux autres utilisateurs de voir ma vraie adresse courriel.
-
-REGISTER_WEDONTGIVE = Nous ne communiquons pas les donn\u00E9es personnelles \u00E0 des organismes tiers.
-
-REGISTER_XMMP = Identifiant XMMP
-
-REGISTER_YIM = Identifiant Yahoo
-
-REMEMBERME = Connexion automatique
-
-REQUIRED = Requis
-
-ROLESAVAILABLE = R\u00F4les disponibles
-
-ROLE_ADD = Ajouter des r\u00F4les
-
-ROLE_CONFIRM_DELETE = ous \u00EAtes sur le point de supprimer un r\u00F4le
-
-ROLE_CREATE = Cr\u00E9er un role
-
-ROLE_DELETE = Supprimer le r\u00F4le selectionn\u00E9
-
-ROLE_DELETED = Le r\u00F4le a \u00E9t\u00E9 supprim\u00E9
-
-ROLE_DISPLAYNAME = Nom usuel du r\u00F4le
-
-ROLE_EDIT = Modifier le r\u00F4le
-
-ROLE_EDIT_MEMBERS = Modifier les membres du r\u00F4le
-
-ROLE_EDIT_USER = Modifier les utilisateurs pour un r\u00F4le donn\u00E9
-
-ROLE_ERROR_DELETE_FAILED = Le r\u00F4le n'a pu \u00EAtre supprim\u00E9
-
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS = Il existe deja un r\u00F4le avec ce nom
-
-ROLE_ERROR_DISPLAYNAMEEMPTY = Le nom usuel du r\u00F4le est obligatoire
-
-ROLE_ERROR_NAMEALREADYEXISTS = Il existe deja un r\u00F4le avec ce nom usuel
-
-ROLE_ERROR_NAMEEMPTY = Le nom de r\u00F4le ne peut pas \u00EAtre vide
-
-ROLE_MAINLIST = Retour \u00E0 la modification de r\u00F4les
-
-ROLE_NAME = Nom du nouveau r\u00F4le
-
-ROLE_NEWDISPLAYNAME = Nouveau nom usuel pour le r\u00F4le
-
-ROLE_REMOVE = Supprimer ces r\u00F4les
-
-ROLE_ROLEDEFINED = r\u00F4le d\u00E9fini
-
-ROLE_ROLESDEFINED = r\u00F4les d\u00E9finis
-
-ROLE_SELECTONETODELETE = Selectionnez un r\u00F4le \u00E0 supprimer
-
-ROLE_SELECTONETOMODIFY = Selectionnez le r\u00F4le a modifier
-
-ROLE_TEXT_1 = Utilisez ce portlet afin de cr\u00E9er, modifier, supprimer ou ajouter des comptes \u00E0 des r\u00F4les.
-
-ROLE_TEXT_2 = Ces r\u00F4les sont utilis\u00E9s dans le portlet d'administration afin de d\u00E9finir les droits d'acc\u00E8s.
-
-ROLE_THEREARE = Il y a
-
-ROLE_THEREIS = Il y a
-
-ROLE_UPDATE = Modifier un role
-
-RealEmail = Adresse de courriel r\u00E9elle
-
-RealName = Nom r\u00E9el
-
-RegNewUser = Enregistrement d'un nouvel utilisateur
-
-Register = Enregistrement.
-
-RegisterNow = Enregistrez vous! C'est gratuit!
-
-Registration = enregistrement
-
-RetrievePass = R\u00E9cup\u00E9rer un mot de passe oubli\u00E9.
-
-Return = pour revenir \u00E0 la page d'accueil
-
-ReturnToMemberList = Revenir \u00E0 la liste des membres
-
-SaveChange = Enregistrer la modification
-
-SaveChanges = Enregistrer les modifications
-
-Search = Chercher
-
-SearchTip = Astuce : Choisir une lettre, cliquez sur Tous ou entrez un nom de membre
-
-SelectOption = Veuillez choisir l'une des options suivantes :
-
-SelectTheme = Selectionnez un th\u00E8me
-
-Signature = Signature
-
-Sorry = D\u00E9sol\u00E9.
-
-StatusChanged = Le status de l'utilisateur a \u00E9t\u00E9 chang\u00E9
-
-TITLE_FILEBROWSE = Explorateur de fichier
-
-ThemeSelection = Selection d'un th\u00E8me
-
-ThemeText1 = Cette option change le style pour tout le site
-
-ThemeText2 = Les changements n'affecteront que vous
-
-ThemeText3 = Chaque utilisateur peut consulter le site avec le th\u00E8me de son choix
-
-TimeZoneOffset = D\u00E9calage GMT
-
-ToChangeInfo = pour changer vos informations personnelles
-
-TypeNewPassword = (saisissez un nouveau mot de passe 2 fois pour valider)
-
-URL = URL
-
-USERLOGIN = Pseudo utilisateur
-
-USERNAME = Identifiant
-
-UnableActivate = Impossible d'activer le compte.
-
-Under13_1 = Je ne suis pas majeur
-
-Under13_2 = et je n'ai pas l'autorisation de mes parents
-
-UpdateUser = Mettre \u00E0 jour le compte
-
-UserDeleted = Utilisateur supprim\u00E9
-
-UserExist = Cet identifiant existe d\u00E9j\u00E0
-
-UserID = Identifiant utilisateur
-
-UserName = Identifiant
-
-UserNotExist = Cet identifiant n'existe pas !
-
-UserRegLogin = Enregistrement/connexion
-
-UsersFoundFor = utilisateurs trouv\u00E9s pour
-
-UsersShown = utilisateurs affich\u00E9s
-
-WeDontGive = Nous ne donnons ni ne vendons vos informations personelles.
-
-WelcomeTo = Bienvenue sur
-
-YIM = Num\u00E9ro YIM
-
-YouAreLoggedOut = D\u00E9connexion en cours... \u00E0 bient\u00F4t !
-
-YourAIM = Addresse AIM
-
-YourAvatar = Votre avatar
-
-YourHomePage = Votre site web
-
-YourICQ = Votre num\u00E9ro ICQ
-
-YourInterests = Vos centres d'int\u00E9r\u00EAts
-
-YourLocation = Votre lieu de r\u00E9sidence
-
-YourMSNM = Votre identifiant MSN
-
-YourOccupation = Votre m\u00E9tier
-
-YourPassMustBe = D\u00E9sol\u00E9, votre mot de passe doit comporter au moins
-
-YourYIM = Votre identifiant YIM
-
-_ASREGISTERED = Vous n'avez pas de compte? vous pouvez en <a href="">cr\u00E9er un</a>.
-
-_BLOCKNICKNAME = Identifiant
-
-_BLOCKPASSWORD = Mot de passe
+POWERED_BY=Fait par
+THEME_BY=Th\u00e8me de
+LOGIN=Se connecter
+LOGOUT=Se d\u00e9connecter
+PORTLET_INSTANCE_ASSOCIATED=Instance de portlet associ\u00e9e \u00e0 cette fen\u00eatre
+PORTLET_NAME=Nom de la portlet
+PORTLET_DESCRIPTION=Description de la portlet
+DASHBOARD=Dashboard
+CONFIGURE_DASHBOARD=Configurer le dashboard
+COPY_TO_DASHBOARD=Copier vers mon dashboard
+PORTAL=Portail
+ADMIN=Administration
+MEMBERS=Membres
+LOGGED=Utilisateur connect\u00e9
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-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -21,310 +21,10 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-_ASREGISTERED=Non hai ancora un account? Puoi <a href\="index.html?module=user&op=getlogin">crearne uno</a>.
-_BLOCKNICKNAME=Username
-_BLOCKPASSWORD=Password
-
-
-
-MessageOrder=Ordine del messaggio
-Ascending=Ascendente
-Descending=Discendente
-
-AIM=Indirizzo AIM
-ICQ=Numero ICQ
-YIM=Numero YIM
-MSNM=MSN Messenger
-
-YourAIM=Il tuo indirizzo AIM
-YourICQ=Il tuo numero ICQ
-YourYIM=Il tuo numero YIM
-YourMSNM=Il tuo MSN Messenger
-
-MyEmail=La mia e-mail
-MyHomePage=La mia homepage
-
-Question=Domanda segreta
-Answer=Risposta segreta
-Location=Localit\u00e0
-Occupation=Occupazione
-Interests=Interessi
-ExtraInfo=Informazioni extra
-YourLocation=La tua localit\u00e0
-YourOccupation=La tua occupazione
-YourInterests=Tuoi interessi
-Signature=Firma
-
-LoginSite=Login.
-Register=Registra.
-
-UserExist=Lo Username esiste gia
-ToChangeInfo=per cambiare le tue info
-EmailVerify=Mandato il link di attivazione! Leggi la tua e-mail e clicca sul link per l'attivazione.
-AccountActivated=Account creato con successo!
-UnableActivate=Impossibile validare il nuovo utente.
-LoggingYou=Login in atto, attenti un p\u00f2\!
-YouAreLoggedOut=Sei uscito\!
-PassDifferent=Le passwords sono differenti. Devono essere identiche.
-YourPassMustBe=Mi spiace, la tua password deve essere di almeno
-CharLong=caratteri
-UserNotExist=L'utente non esiste\!
-UserRegLogin=Registrazione utente/login
-SelectOption=Seleziona un'opzione dal menu in basso\:
-RetrievePass=Ricevi la password persa.
-RegNewUser=Nuova registrazione utente
-PasswordAgain=Conferma la tua password
-Email=E-mail
-Options=Opzioni
-AllowEmailView=Permetti agli altri utenti di vedere la mia e-mail
-AsRegUser=Come utente registrato puoi\:
-AsReg6=Seleziona differenti temi
-AsReg5=Personalizza i commenti
-AsReg4=Seleziona quanti nuovi oggetti da mostrare sulla homepage
-AsReg3=Prendi un box personale sulla homepage
-AsReg2=Manda news con il tuo username
-AsReg1=Rispondi con il tuo username
-RegisterNow=Registrati ora\! E' gratis\!
-WeDontGive=Non vogliamo darti altre informazioni personali.
-WelcomeTo=Benvenuto su
-Registration=area di registrazione.
-
-Over13_1=Io sono
-Over13_2=o al di sopra o con il consenso dei genitori
-MustBe_1=Devi essere
-MustBe_2=o al di sopra, o con il consenso dei genitori per registrarmi qui.
-Consent_1=(Cliccando sul link qui sopra per verificare quanto detto<br>
-Consent_2=o al di sopra, o con il consenso dei genitori per registrarmi qui.)
-Under13_1=Sono al di sotto
-Under13_2=e non ho il consenso dei genitori.
-
-Sorry=Mi spiace.
-Click=Per favore clicca
-Here=qui
-Return=per ritornare alla pagina principale.
-UserName=Username
-GoBack=Indietro
-Finish=Termina
-PersonalInfo=Informazione personale
-RealName=nome reale
-Optional=(opzionale)
-CanKnowAbout=(massimo 255 caratteri. Scrivi cosa vorresti far sapere agli altri)
-Language=Lingua
-255CharMax=(massimo 255 caratteri. Scrivi la tua firma con la codifica HTML)
-YourAvatar=La tua identit\u00e0
-YourHomePage=Il tuo sito web
-TimeZoneOffset=Fuso orario
-EmailNotPublic=(Questa e-mail non sar\u00e0 pubblica ma \u00e8 richiesta. Sar\u00e0 usata per inviarti la password nel caso la perdessi)
-EmailPublic=(Questa e-mail sar\u00e0 pubblica. Scrivi quello che vuoi. A prova di spam)
-RealEmail=e-mail principale
-FakeEmail=e-mail secondaria
-NewUser=Nuovo utente
-SaveChanges=Salva le modifiche
-SaveChange=Salva la modifica
-TypeNewPassword=(digita una nuova password due volte per cambiarla)
-Search=Cerca
-All=Tutto
-UsersFoundFor=utenti trovati per
-Pages=pagine
-UsersShown=utenti mostrati
-Delete=Cancella
-Edit=Modifica
-Ok=Ok
-Cancel=Annulla
-AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente?
-UserDeleted=Utente cancellato con successo
-ReturnToMemberList=Ritorna alla lista dei membri
-Avatar=Identit\u00e0
-AdminFunctions=Funzioni di amministrazione
-URL=URL
-UpdateUser=Aggiorna l'utente
-UserID=User ID
-ForChanges=(Solo per le modifiche)
-MemberList=Lista dei membri
-SearchTip=Consiglio: scegli una lettera, visualizza tutto o cerca un utente se conosci lo username
-
-ThemeText1=Quest'opzione cambier\u00e0 il look all'intero sito.
-ThemeText2=Le modifiche saranno valide solo per te.
-ThemeText3=Ogni utente pu\u00f2 vedere il sito con un tema differente.
-SelectTheme=Seleziona un tema
-ThemeSelection=Selezione del tema
-
-CannotLogin=Non posso procedere con la login
-
-LoginInvalidName=il nome utente non \u00e8 valido
-LoginNoSuchUser=il nome utente non esiste
-LoginBadPassword=la tua password non \u00e8 corretta
-LoginUnexpectedError=errore inaspettato
-LoginUserDisabled=il tuo account \u00e8 stato bloccato. Per favore contatta l'amministratore.
-
-Enable=Attiva
-Disable=Disattiva
-StatusChanged=Lo stato dell'utente \u00e8 stato modificato con successo
-
-NotAuth=Non sei autorizzato ad eseguire quest\'operazione
-
-
-REMEMBERME=Ricordami
-LOGIN=Login
-USERNAME=Username
-PASSWORD=Password
-USERLOGIN=Login utente
-
-OPTIONAL=Opzionale
-REQUIRED=Obbligatorio
-
-255MAX=(Firma di massimo 255 caratteri)
-
-NAMENOTAVAILABLE=N/A
-
-MODIFIED_PROFILE=Il tuo profilo \u00e8 stato modificato, il portale lavorer\u00e0 con il vecchio profilo finch\u00e8 non ti ricolleghi.
-
-# Registration
-REGISTER_NOT_LOGGED_IN=Non sei al momento loggato.
-REGISTER_REGISTER=Puoi creare un account
-REGISTER_REGISTER_LINK=Creane uno
-REGISTER_REGISTER_ADMIN_LINK=Crea un account
-REGISTER_TY=Grazie per la registrazione.
-REGISTER_BASICINFO=Informazioni base sull'utente
-REGISTER_IM=Identit\u00e0 del messaggio istantaneo
-REGISTER_ADDITIONAL=Informazioni sull'utente opzionali e aggiuntive
-REGISTER_NEWUSER=Registrazione nuovo utente
-REGISTER_PASSWORDAGAIN=Conferma la tua password
-REGISTER_REALEMAIL=e-mail principale
-REGISTER_EMAILNOTPUBLIC=(Questa e-mail non sar\u00e0 pubblica ma \u00e8 richiesta. Sar\u00e0 usata per inviarti la password nel caso la perdessi)
-REGISTER_FAKEEMAIL=e-mail secondaria
-REGISTER_EMAILPUBLIC=(Questa e-mail sar\u00e0 pubblica. Scrivi quello che vuoi. A prova di spam)
-REGISTER_FAKEEMAIL_EXPLAIN=Se questo campo non \u00e8 vuoto, l'e-mail principale sar\u00e0 usata solo per mandare notifiche
-REGISTER_QUESTION=Domanda segreta
-REGISTER_ANSWER=Risposta segreta
-REGISTER_ASREGUSER=Come utente registrato puoi:
-REGISTER_ASREG6=Seleziona differenti temi
-REGISTER_ASREG5=Personalizza i commenti
-REGISTER_ASREG4=Seleziona quanti nuovi oggetti mostrare sulla homepage
-REGISTER_ASREG3=Ottieni un box personale sulla homepage
-REGISTER_ASREG2=Manda news con il tuo username
-REGISTER_ASREG1=Rispondi ai commenti con il tuo username
-REGISTER_REGISTERNOW=Registrati ora! E' gratis!
-REGISTER_WEDONTGIVE=Non vogliamo dare agli altri le tue informazioni personali.
-REGISTER_ALREADYHAVEACCOUNT=Hai gi\u00e0 un account:
-REGISTER_SIGNIN=Registrati
-REGISTER_GIVENNAME=Nome
-REGISTER_FAMILYNAME=Cognome
-REGISTER_PERSONALINFO=Informazione personale
-REGISTER_VIEWREALEMAIL=Permetti agli altri utenti di vedere il mio indirizzo di posta
-REGISTER_HOMEPAGE=Indirizzo del tuo sito personale
-REGISTER_TIMEZONEOFFSET=Fuso orario
-REGISTER_THEME=Tema
-REGISTER_DEFAULT_THEME=Sito di default
-REGISTER_ICQ=Id ICQ
-REGISTER_AIM=Id AIM
-REGISTER_YIM=Id Yahoo
-REGISTER_MSNM=Id MSN messenger
-REGISTER_SKYPE=Id Skype
-REGISTER_XMMP=Id XMMP
-REGISTER_LOCATION=Localit\u00e0
-REGISTER_LANGUAGE=Lingua preferita
-REGISTER_OCCUPATION=Occupazione
-REGISTER_INTERESTS=Interessi
-REGISTER_SIGNATURE=Firma
-REGISTER_EXTRAINFO=Informazioni extra
-REGISTER_CANKNOWABOUT=(massimo 255 caratteri. Scrivi quello che vuoi che gli altri sappiano di te)
-REGISTER_SAVECHANGES=Salva le modifiche
-REGISTER_CONFIRMATIONEMAIL=E-mail di conferma
-
-REGISTER_SHOWMENU=Torna al menu utenti
-
-REGISTER_ERROR_INVALIDUSERNAME=Il nome utente non \u00e8 valido
-REGISTER_ERROR_EXISTINGUSERNAME=Questo nome utente \u00e8 gi\u00e0 stato preso
-REGISTER_ERROR_INVALIDPASSWORD1=La password non \u00e8 valida
-REGISTER_ERROR_INVALIDPASSWORD2=La password non \u00e8 valida
-REGISTER_ERROR_PASSWORDMISMATCH=La password non corrisponde
-REGISTER_ERROR_INVALIDREALEMAIL=L'indirizzo di posta non \u00e8 valido
-
-REGISTER_CONFIRM=L'utente \u00e8 stato creato con successo.
-REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti
-
-
-MENU_LOGOUT=Uscita
-MENU_EDITPROFILE=Modifica il tuo profilo
-MENU_LISTUSERS=Lista di tutti gli utenti
-
-LIST_FILTERS=Applica i filtri alla lista
-LIST_USERSPERPAGE=Utenti per pagina
-LIST_USERNAMECONTAINS=Contiene lo username
-LIST_FULLNAME=Nome per intero
-LIST_USERNAME=Nome utente
-LIST_FIRSTNAME=Nome
-LIST_LASTNAME=Cognome
-LIST_ROLES=Ruoli
-LIST_ACTIONS=Azioni
-LIST_ACTIONSSHOWPROFILE=Profilo
-LIST_ACTIONADDROLESTOUSER=Ruoli
-LIST_ACTIONEDITROLES=Modifica i ruoli
-LIST_ACTIONDELETEUSER=Cancella l'utente
-LIST_CONFIRMDELETEUSER=Stai per cancellare un utente
-LIST_SEARCHRESULTS=Cerca i risultati per
-LIST_MATCHING=Utenti trovati
-FILTER=Filtro
-
-NEXTPAGE=Prossima pagina
-PREVIOUSPAGE=Pagina precedente
-
-ASSIGNROLES=Assegna i ruoli
-ASSIGNEDROLES=Ruoli da assegnare
-ROLESAVAILABLE=Ruoli attivi
-EDITROLESFORUSER=Modifica i ruoli per l'utente
-
-
-ROLE_THEREARE=Ci sono
-ROLE_THEREIS=C'\u00e8
-ROLE_ROLESDEFINED=ruoli definiti
-ROLE_ROLEDEFINED=ruolo definito
-
-ROLE_NAME=Nome del nuovo ruolo
-ROLE_DISPLAYNAME=Nome visualizzabile del ruolo
-ROLE_NEWDISPLAYNAME=Nuovo nome visualizzato del ruolo
-ROLE_SELECTONETOMODIFY= Seleziona il ruolo da modificare
-ROLE_SELECTONETODELETE= Seleziona il ruolo da cancellare
-ROLE_CREATE=Crea un nuovo ruolo utente
-ROLE_UPDATE=Aggiorna il ruolo utente
-ROLE_EDIT=Modifica il ruolo utente
-ROLE_DELETE=Cancella il ruolo selezionato
-ROLE_CONFIRM_DELETE=Stai per cancellare un ruolo
-ROLE_DELETED=Il ruolo \u00e8 stato cancellato
-ROLE_EDIT_MEMBERS=Modifica il ruolo dei membri
-ROLE_MAINLIST=Torna alla modifica del ruolo
-ROLE_EDIT_USER=Modifica i ruoli degli utenti
-ROLE_ADD=Aggiungi i ruoli
-ROLE_REMOVE=Rimuovi i ruoli
-
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Esiste gi\u00e0 un ruolo con quel nome visualizzabile
-ROLE_ERROR_NAMEALREADYEXISTS=Esiste gi\u00e0 un ruolo con quel nome
-ROLE_ERROR_NAMEEMPTY=Il nome del ruolo non pu\u00f2 essere vuoto
-ROLE_ERROR_DISPLAYNAMEEMPTY=Il nome visualizzabile del ruolo non pu\u00f2 essere vuoto
-ROLE_ERROR_DELETE_FAILED=Non si pu\u00f2 cancellare il ruolo
-
-MENU_CREATEROLE=Crea un nuovo ruolo
-MENU_EDITROLE=Modifica il ruolo esistente
-MENU_EDITROLEMEMBERS=Modifica i membri del ruolo
-
-ROLE_TEXT_1=Usa questa portlet per creare,editare,cancellare e aggiungere i ruoli agli utenti.
-ROLE_TEXT_2=Questi ruoli sono usati nella portlet di gestione per configurare i permessi.
-
-PERMISSION_PICKPORTLET=Amministrazione dei permessi per le portlet
-PERMISSION_PERMISSIONS=Permessi di modifica
-PERMISSION_TOP=Seleziona un componente da modificare
-PERMISSION_FINERGRAIN=Seleziona un sotto componente per definire i suoi permessi
-PERMISSION_MODIFYROLES=Aggiungi/Rimuovi ruoli
-PERMISSION_MODIFYINGROLES=Modifica i ruoli per
-PERMISSION_DOMAIN=Dominio
-PERMISSION_DOMAIN_MOD=Modifica Dominio
-PERMISSION_DEFINEDROLES=Ruoli definiti
-PERMISSION_IMPLIEDROLES=Ruoli impliciti
-
POWERED_BY=Sviluppato da
-BAD_LOGIN=login sbagliato
THEME_BY=Tema di
+LOGIN=Login
+LOGOUT=Logout
PORTLET_INSTANCE_ASSOCIATED=Istanza di Portlet associata a questa finestra
PORTLET_NAME=Nome della Portlet
PORTLET_DESCRIPTION=Descrizione della Portlet
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties 2008-05-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_pt_BR.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -1,294 +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. #
-################################################################################
-
-_ASREGISTERED=Ainda n�o possu� uma conta? Voc� pode <a href\="">criar uma</a>.
-_BLOCKNICKNAME=Usu�rio
-_BLOCKPASSWORD=Senha
-
-MessageOrder=Ordem
-Ascending=Crescente
-Descending=Decrescente
-
-AIM=AIM
-ICQ=ICQ
-YIM=YIM
-MSNM=MSN
-
-YourAIM=AIM
-YourICQ=ICQ
-YourYIM=YIM
-YourMSNM=MSN
-
-MyEmail=Meu e-mail
-MyHomePage=Minha homepage
-
-Question=Pergunta secreta
-Answer=Resposta secreta
-Location=Localidade
-Occupation=Profiss�o
-Interests=Interesses
-ExtraInfo=Informa��o Extra
-YourLocation=Sua localidade
-YourOccupation=Sua profiss�o
-YourInterests=Seus interesses
-Signature=Assinatura
-
-LoginSite=Entrar.
-Register=Registrar.
-
-UserExist=Usu�rio j� existe
-ToChangeInfo=para mudar seus dados
-EmailVerify=Endere�o de ativa��o enviado! Verifique seu email e clique no link de ativa��o para ativar sua conta.
-AccountActivated=Conta ativada com sucesso!
-UnableActivate=N�o foi possivel v�lidar usu�rio.
-LoggingYou=Entrando, aguarde\!
-YouAreLoggedOut=Voc� n�o est� deslogado\!
-PassDifferent=As senhas s�o diferentes. Devem ser id�nticas.
-YourPassMustBe=Desculpe, sua senha deve ter pelo menos
-CharLong=d�gitos
-UserNotExist=Usu�rio n�o encontrado\!
-UserRegLogin=User registration/login
-SelectOption=Selecione uma op��o do menu abaixo\:
-RetrievePass=Recuperar senha.
-RegNewUser=New user registration
-PasswordAgain=Confirme sua senha
-Email=E-mail
-Options=Op��es
-AllowEmailView=Permitir outros usu�rios visualizarem meu endere�o e-mail
-AsRegUser=Como usu�rio registrado voc� pode\:
-AsReg6=Selecionar temas diferentes
-AsReg5=Personalizar os coment�rios
-AsReg4=Seleciona quantos items devem ser mostrados na p�gina principal
-AsReg3=
-AsReg2=Enviar not�cias com seu nome de usu�rio
-AsReg1=Postar coment�rios com seu nome de usu�rio
-RegisterNow=Registre agora\! � de gra�a\!
-WeDontGive=N�s n�o vendemos/distribu�mos suas informa��es pessoais.
-WelcomeTo=Bem-vido �
-Registration=�rea de registro.
-
-Over13_1=Eu sou
-Over13_2=de maior ou tenho consentimento de respons�veis
-MustBe_1=Voc� deve ser
-MustBe_2=de maior, ou permiss�o de respons�veis para me registrar aqui.
-Consent_1=(Ao clicar no link acima voc� garante que voc� �<br>
-Consent_2=de maior, ou possu� permiss�o de respons�veis para se registrar.)
-Under13_1=Eu sou de menor
-Under13_2=e n�o tenho permiss�o de respons�veis.
-
-Sorry=Desculpe.
-Click=Por favor, clique
-Here=aqui
-Return=para retornar � p�gina principal.
-UserName=Usu�rio
-GoBack=Voltar
-Finish=Terminar
-PersonalInfo=Informa��o Pessoal
-RealName=Nome Real
-Optional=(opcional)
-CanKnowAbout=(255 letras no m�x. Digite o que voc� gostaria que os outros soubessem sobre voc�)
-Language=L�ngua
-255CharMax=(255 letras no m�x. Digite sua assinatura com c�digos HMTL)
-YourAvatar=Seu avatar
-YourHomePage=Seu website
-TimeZoneOffset=Fuso hor�rio
-EmailNotPublic=(Esse email n�o ser� mostrado, mas � necess�rio. Ser� usado para enviar sua senha em caso de perda.)
-EmailPublic=(Esse email ser� mostrado. Entre o que desejar.)
-RealEmail=E-mail real
-FakeEmail=E-mail falso
-Required=(necess�rio)
-NewUser=Novo usu�rio
-SaveChanges=Salvar Mudan�as
-SaveChange=Salvar Mudan�a
-TypeNewPassword=(digite uma senha nova duas vezes para alter�-la)
-Search=Procurar
-All=Todos
-UsersFoundFor=usu�rios encontrados para
-Pages=p�ginas
-UsersShown=usu�rios mostrados
-Delete=Remover
-Edit=Editar
-Ok=Ok
-Cancel=Cancelar
-AreYouSureToDeleteUser=Voc� tem certeza que deseja remover o usu�rio?
-UserDeleted=Usu�rio removido
-ReturnToMemberList=Voltar � lista de usu�rios
-Avatar=Avatar
-AdminFunctions=Opera��es Admin
-URL=URL
-UpdateUser=Atualizar usu�rio
-UserID=ID do Usu�rio
-ForChanges=(Para altera��es apenas)
-MemberList=Lista de membros
-SearchTip=Dica: escolha uma letra, mostre todos ou procure por um usu�rio se voc� sabe seu nome.
-
-ThemeText1=Essa op��o vai alterar o visual de todo o site.
-ThemeText2=Essas mudan�as ser�o v�lidas apenas para voc�.
-ThemeText3=Cada usu�rio pode ver o site com um tema diferente.
-SelectTheme=Selecione um tema
-ThemeSelection=Sele��o de Tema
-
-CannotLogin=N�o foi poss�vel efetuar o login
-
-LoginInvalidName=o nome do usu�rio n�o � v�lido
-LoginNoSuchUser=o nome do usu�rio n�o existe
-LoginBadPassword=sua senha n�o est� correta
-LoginUnexpectedError=unexpected error
-LoginUserDisabled=sua conta foi bloqueada. Favor entrar em contato com o administrador.
-
-Enable=Habilitar
-Disable=Desabilitar
-StatusChanged=O estatus do usu�rio foi alterado com sucesso
-
-NotAuth=Voc� n�o tem permiss�o para realizar essa opera��o
-
-# Used by JBoss Portal
-
-REMEMBERME=Lembre-me
-LOGIN=Login
-USERNAME=Usu�rio
-PASSWORD=Senha
-USERLOGIN=Login de Usu�rio
-
-OPTIONAL=Opcional
-REQUIRED=Requerido
-
-255MAX=(M�ximo de 255 caracteres)
-
-NAMENOTAVAILABLE=N/A
-
-#Registration
-REGISTER_REGISTER=N�o possu� conta ainda? Voc� pode
-REGISTER_REGISTER_LINK=criar uma\!
-REGISTER_NEWUSER=Registro de novo usu�rio
-REGISTER_PASSWORDAGAIN=Confirme sua senha
-REGISTER_REALEMAIL=E-mail real
-REGISTER_EMAILNOTPUBLIC=(Esse email n�o ser� mostrado, mas � necess�rio. Ser� usado para enviar sua senha em caso de perda.)
-REGISTER_FAKEEMAIL=E-mail falso
-REGISTER_EMAILPUBLIC=(Esse email ser� mostrado. Entre o que desejar.)
-REGISTER_FAKEEMAIL_EXPLAIN=Se este campo n�o estiver vazio, o email real ser� utilizado apenas para enviar notifica��es
-REGISTER_QUESTION=Pergunta secreta
-REGISTER_ANSWER=Resposta secreta
-REGISTER_ASREGUSER=Como usu�rio registrado voc� pode:
-REGISTER_ASREG6=Selecione temas diferentes
-REGISTER_ASREG5=Personalizar os coment�rios
-REGISTER_ASREG4=Selecionar quantos items ser�o mostrados na p�gina inicial
-REGISTER_ASREG3=Possuir uma janela pessoal na p�gina inicial
-REGISTER_ASREG2=Enviar not�cias com o seu nome
-REGISTER_ASREG1=Postar coment�rios com o seu nome
-REGISTER_REGISTERNOW=Registre agora, � gr�tis!
-REGISTER_WEDONTGIVE=N�s n�o vendemos/distribuimos suas informa��es pessoais.
-REGISTER_ALREADYHAVEACCOUNT=Se voce j� possu� uma conta:
-REGISTER_SIGNIN=Entrar
-REGISTER_GIVENNAME=Primeiro nome
-REGISTER_FAMILYNAME=�ltimo nome
-REGISTER_PERSONALINFO=Informa��es Pessoais
-REGISTER_VIEWREALEMAIL=Permitir que outros usu�rios vejam meu email verdadeiro
-REGISTER_HOMEPAGE=Endere�o de seu site pessoal
-REGISTER_TIMEZONEOFFSET=Fuso hor�rio
-REGISTER_ICQ=ICQ
-REGISTER_AIM=AIM
-REGISTER_YIM=Yahoo
-REGISTER_MSNM=MSN
-REGISTER_SKYPE=Skype
-REGISTER_LOCATION=Localidade
-REGISTER_LANGUAGE=L�ngua preferida
-REGISTER_OCCUPATION=Trabalho
-REGISTER_INTERESTS=Interesses
-REGISTER_SIGNATURE=Assinatura
-REGISTER_EXTRAINFO=Informa��es extras
-REGISTER_CANKNOWABOUT=(255 letras no m�x. Digite o que voc� gostaria que os outros soubessem sobre voc�)
-REGISTER_SAVECHANGES=Salvar atualiza��es
-REGISTER_CONFIRMATIONEMAIL=Email de confirma��o
-
-REGISTER_SHOWMENU=Voltar ao menu de usu�rio
-
-REGISTER_ERROR_INVALIDUSERNAME=Usu�rio inv�lido
-REGISTER_ERROR_EXISTINGUSERNAME=Esse usu�rio j� est� em uso
-REGISTER_ERROR_INVALIDPASSWORD1=Senha inv�lida
-REGISTER_ERROR_INVALIDPASSWORD2=Senha inv�lida
-REGISTER_ERROR_PASSWORDMISMATCH=Senhas n�o conferem
-REGISTER_ERROR_INVALIDREALEMAIL=Email inv�lido
-
-
-MENU_LOGOUT=Sair
-MENU_EDITPROFILE=Editar seu perfil
-MENU_LISTUSERS=Listar todos os usu�rios
-
-LIST_FILTERS=Aplicar filtro
-LIST_USERSPERPAGE=Usu�rios por p�gina
-LIST_USERNAMECONTAINS=Nome cont�m
-LIST_FULLNAME=Nome completo
-LIST_USERNAME=Usu�rio
-LIST_ROLES=Grupos
-LIST_ACTIONS=A��es
-LIST_ACTIONSSHOWPROFILE=Perfil
-LIST_ACTIONADDROLESTOUSER=Grupos
-LIST_ACTIONEDITROLES=Editar Grupos
-FILTER=Filtro
-
-NEXTPAGE=Pr�xima p�gina
-PREVIOUSPAGE=P�gina anterior
-
-ASSIGNROLES=Atribuir grupo
-ROLESAVAILABLE=Grupos dispon�veis
-EDITROLESFORUSER=Editar grupos do usu�rio
-
-
-ROLE_THEREARE=Existem
-ROLE_THEREIS=Existe
-ROLE_ROLESDEFINED=grupos definidos
-ROLE_ROLEDEFINED=grupo definido
-
-ROLE_NAME=Nome do novo grupo
-ROLE_DISPLAYNAME=Nome vis�vel do grupo
-ROLE_NEWDISPLAYNAME=Novo nome vis�vel do grupo
-ROLE_SELECTONETOMODIFY= Selecione o grupo para alterar
-ROLE_SELECTONETODELETE= Selecione o grupo para remover
-ROLE_CREATE=Criar grupo
-ROLE_UPDATE=Atualizar grupo
-ROLE_EDIT=Editar grupo
-ROLE_DELETE=Remover grupo selecionado
-ROLE_DELETED=O grupo foi removido
-ROLE_EDIT_MEMBERS=Editar membros do grupo
-ROLE_MAINLIST=Voltar
-
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=J� existe um grupo com esse nome (vis�vel)
-ROLE_ERROR_NAMEALREADYEXISTS=J� existe um grupo com esse nome
-ROLE_ERROR_NAMEEMPTY=O nome n�o pode ser vazio
-ROLE_ERROR_DISPLAYNAMEEMPTY=O nome vis�vel nao pode ser vazio
-ROLE_ERROR_DELETE_FAILED=N�o � poss�vel remover o grupo
-ROLE_EDIT_USER=Editando usu�rios do grupo
-
-MENU_CREATEROLE=Criar novo grupo
-MENU_EDITROLE=Editar grupo
-MENU_EDITROLEMEMBERS=Editar membros do grupo
-
-PERMISSION_PICKPORTLET=Administra��o de Permiss�es de Portlet
-PERMISSION_PERMISSIONS=Permiss�es para modificar
-PERMISSION_TOP=Selecione um Componente para Modificar
-PERMISSION_FINERGRAIN=Selecione um sub-componente para definir suar permiss�es
-PERMISSION_MODIFYROLES=Adicionar/Remover roles
-PERMISSION_MODIFYINGROLES=Modificando roles para
-PERMISSION_DOMAIN=Dominio
-PERMISSION_DOMAIN_MOD=Modificar Dominio
\ No newline at end of file
Deleted: 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 2008-05-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -1,324 +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. #
-################################################################################
-
-_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
-
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-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-05-30 15:05:57 UTC (rev 10864)
@@ -79,7 +79,7 @@
{
%> <a href="<%= copyToDashboardURL %>"><%= rb.getString("COPY_TO_DASHBOARD") %></a> |<%
}
-%> <a href="<%= signOutURL %>"><%= rb.getString("MENU_LOGOUT") %></a>
+%> <a href="<%= signOutURL %>"><%= rb.getString("LOGOUT") %></a>
<%
}
%>
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -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
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_fr.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_fr.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -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=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
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_it.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -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=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
Added: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/WEB-INF/classes/Resource_ru.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -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-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-30 15:05:23 UTC (rev 10863)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-30 15:05:57 UTC (rev 10864)
@@ -101,7 +101,7 @@
IDENTITY_LOST_PASSWORD = Mot de passe perdu
-IDENTITY_LOST_PASSWORD_DESCRIPTION = Veuillez entrer votre identifiantr afin de r\u00E9initialiser votre mot de passe.
+IDENTITY_LOST_PASSWORD_DESCRIPTION = Veuillez entrer votre identifiant afin de r\u00E9initialiser votre mot de passe.
IDENTITY_LOST_PASSWORD_ERROR = \u00C9chec de r\u00E9initialisation de votre mot de passe.
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10863 - in modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation: model and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-05-30 11:05:23 -0400 (Fri, 30 May 2008)
New Revision: 10863
Removed:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/tree/
Log:
remove empty dirs
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10862 - in branches/JBoss_Portal_Branch_2_7: core-admin and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 10:16:09 -0400 (Fri, 30 May 2008)
New Revision: 10862
Removed:
branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-admin/build.xml
Log:
- Using PortletBridge 1.0.0.B2 from the repo
- Using RichFaces 3.2.1.GA
- Removed embedded libs
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-05-30 13:44:38 UTC (rev 10861)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-05-30 14:16:09 UTC (rev 10862)
@@ -77,7 +77,8 @@
<componentref name="ehcache" version="1.2.2"/>
<componentref name="el" version="1.0"/>
<componentref name="facelets" version="1.1.14"/>
- <componentref name="richfaces" version="3.1.4.SR1"/>
+ <componentref name="richfaces" version="3.2.1.GA"/>
+ <componentref name="jboss/portlet-bridge" version="1.0.0.B2"/>
<componentref name="hibernate" version="3.2.0.CR2"/>
<componentref name="httpunit" version="1.6"/>
<componentref name="hsqldb" version="1.8.0.2"/>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-05-30 13:44:38 UTC (rev 10861)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-05-30 14:16:09 UTC (rev 10862)
@@ -103,8 +103,7 @@
<path refid="richfaces.richfaces.classpath"/>
<path refid="facelets.facelets.classpath"/>
<path refid="portlet.portlet.classpath"/>
- <pathelement location="${source.etc}/sun-jsf/portletbridge-api-1.0.0-SNAPSHOT.jar"/>
- <pathelement location="${source.etc}/sun-jsf/portletbridge-impl-1.0.0-SNAPSHOT.jar"/>
+ <path refid="jboss/portlet.bridge.classpath"/>
</path>
<!-- Configure modules -->
@@ -193,8 +192,8 @@
<copy todir="${build.resources}/portal-admin-war/WEB-INF/lib">
<fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/>
<fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="portletbridge-api-1.0.0-SNAPSHOT.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf" includes="portletbridge-impl-1.0.0-SNAPSHOT.jar"/>
+ <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/>
+ <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/>
<fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/>
<fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/>
<fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10861 - in modules/presentation/trunk: classic/src/main/java/org/jboss/portal/presentation/classic and 17 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-05-30 09:44:38 -0400 (Fri, 30 May 2008)
New Revision: 10861
Added:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DefaultLayout.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Layout.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/LayoutFactory.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Orientation.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/RegionLayout.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/SimpleLayout.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java
Removed:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeFactory.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/tree/UINode.java
Modified:
modules/presentation/trunk/classic/src/main/artifacts/presentation-war/WEB-INF/page-structure.xml
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java
modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/PortletPresentationServer.java
modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/controller/PresentationPortletControllerContext.java
modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java
modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationWindowContext.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java
modules/presentation/trunk/presentation/src/main/resources/org/jboss/portal/presentation/impl/state/structural/page_structure_1_0.xsd
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java
Log:
adding early support for layout
Modified: modules/presentation/trunk/classic/src/main/artifacts/presentation-war/WEB-INF/page-structure.xml
===================================================================
--- modules/presentation/trunk/classic/src/main/artifacts/presentation-war/WEB-INF/page-structure.xml 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/classic/src/main/artifacts/presentation-war/WEB-INF/page-structure.xml 2008-05-30 13:44:38 UTC (rev 10861)
@@ -2,39 +2,14 @@
<context-def
xmlns="urn:jboss:portal:presentation:page:1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
<page-def name="default">
- <window-def name="windowA">
- <properties>
- <property>
- <name>portlet-ref</name>
- <value>/classic-presentation.Catalog</value>
- </property>
- </properties>
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <window-def name="windowB">
- <properties>
- <property>
- <name>portlet-ref</name>
- <value>/classic-presentation.Cart</value>
- </property>
- </properties>
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <page-def name="child-page-default-1">
+ <simple-layout>
<window-def name="windowA">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <window-def name="windowB">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- </page-def>
- <page-def name="child-page-default-2">
- <window-def name="windowA">
<properties>
<property>
<name>portlet-ref</name>
- <value>/classic-presentation.PublicParameterPortlet1</value>
+ <value>/classic-presentation.Catalog</value>
</property>
</properties>
<content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
@@ -43,37 +18,71 @@
<properties>
<property>
<name>portlet-ref</name>
- <value>/classic-presentation.PublicParameterPortlet2</value>
+ <value>/classic-presentation.Cart</value>
</property>
</properties>
<content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
</window-def>
+ </simple-layout>
+ <page-def name="child-page-default-1">
+ <simple-layout>
+ <window-def name="windowA">
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ <window-def name="windowB">
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ </simple-layout>
+ </page-def>
+ <page-def name="child-page-default-2">
+ <simple-layout>
+ <window-def name="windowA">
+ <properties>
+ <property>
+ <name>portlet-ref</name>
+ <value>/classic-presentation.PublicParameterPortlet1</value>
+ </property>
+ </properties>
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ <window-def name="windowB">
+ <properties>
+ <property>
+ <name>portlet-ref</name>
+ <value>/classic-presentation.PublicParameterPortlet2</value>
+ </property>
+ </properties>
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ <window-def name="windowC">
+ <properties>
+ <property>
+ <name>portlet-ref</name>
+ <value>/classic-presentation.PublicParameterPortlet3</value>
+ </property>
+ </properties>
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ </simple-layout>
+ </page-def>
+ </page-def>
+ <page-def name="default-sibling-1">
+ <simple-layout>
+ <window-def name="windowA">
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ <window-def name="windowB">
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
<window-def name="windowC">
- <properties>
- <property>
- <name>portlet-ref</name>
- <value>/classic-presentation.PublicParameterPortlet3</value>
- </property>
- </properties>
<content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
</window-def>
- </page-def>
+ <window-def name="windowD">
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ <window-def name="windowE">
+ <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
+ </window-def>
+ </simple-layout>
</page-def>
- <page-def name="default-sibling-1">
- <window-def name="windowA">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <window-def name="windowB">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <window-def name="windowC">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <window-def name="windowD">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- <window-def name="windowE">
- <content>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Pellentesque odio nisl, faucibus id, placerat et, pulvinar at, nisi. Vivamus mollis pharetra risus. Mauris vitae massa vel augue congue eleifend. Morbi pede pede, adipiscing nec, scelerisque nec, ullamcorper sed, libero. Mauris iaculis lorem sit amet eros. Proin viverra eros. Morbi sit amet libero. Donec nec turpis et nunc consectetuer auctor. Fusce et metus. Sed commodo condimentum libero. Sed mollis tellus id justo. Nulla condimentum, libero ultricies accumsan pellentesque, nibh pede egestas quam, vitae varius nisi arcu ac urna. Phasellus interdum, odio vitae eleifend suscipit, nibh massa laoreet lorem, id mollis justo nisl non nunc. Sed enim enim, rutrum a, scelerisque eget, laoreet non, ante. Aenean molestie ipsum in nisi.</content>
- </window-def>
- </page-def>
</context-def>
Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java
===================================================================
--- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/ClassicPresentationClient.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -35,6 +35,9 @@
import org.jboss.portal.presentation.model.ui.UIObject;
import org.jboss.portal.presentation.model.ViewPort;
import org.jboss.portal.presentation.model.ViewPortScope;
+import org.jboss.portal.presentation.model.layout.LayoutFactory;
+import org.jboss.portal.presentation.model.layout.Layout;
+import org.jboss.portal.presentation.model.layout.SimpleLayout;
import org.jboss.portal.presentation.model.content.WindowContent;
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
@@ -55,6 +58,7 @@
import org.jboss.portal.web.WebResponse;
import org.jboss.portal.web.impl.DefaultServletContainerFactory;
import org.jboss.portal.common.servlet.URLFormat;
+import org.jboss.portal.common.NotYetImplemented;
import java.io.IOException;
import java.io.PrintWriter;
@@ -234,13 +238,26 @@
{
if (node.getChildren() != null)
{
- writer.print("<div>");
+ LayoutFactory layoutFactory = new LayoutFactory();
//
- renderChildren(node, writer);
+ Layout layout = layoutFactory.getLayout(node);
//
- writer.print("</div>");
+ if (layout instanceof SimpleLayout)
+ {
+ writer.print("<div>");
+
+ //
+ renderChildren(node, writer);
+
+ //
+ writer.print("</div>");
+ }
+ else
+ {
+ throw new NotYetImplemented();
+ }
}
else
{
Modified: modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java
===================================================================
--- modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/classic/src/main/java/org/jboss/portal/presentation/classic/model/ClassicUINode.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -23,6 +23,7 @@
package org.jboss.portal.presentation.classic.model;
import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.UINode;
import java.util.Collection;
import java.util.Map;
@@ -31,7 +32,7 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class ClassicUINode
+public class ClassicUINode implements UINode
{
/** . */
@@ -68,7 +69,7 @@
return object;
}
- public Collection<ClassicUINode> getChildren()
+ public Collection getChildren()
{
return children == null ? null : children.values();
}
Modified: modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/PortletPresentationServer.java
===================================================================
--- modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/PortletPresentationServer.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/PortletPresentationServer.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -31,12 +31,12 @@
import org.jboss.portal.presentation.protocol.ProtocolAction;
import org.jboss.portal.presentation.protocol.ShowUIObjectResponse;
import org.jboss.portal.presentation.model.content.WindowContent;
-import org.jboss.portal.presentation.model.tree.UINode;
+import org.jboss.portal.presentation.model.UINode;
import org.jboss.portal.presentation.client.PresentationClient;
import org.jboss.portal.presentation.portlet.protocol.PortletContainerAction;
import org.jboss.portal.presentation.portlet.controller.PresentationPortletPageNavigationalState;
import org.jboss.portal.presentation.portlet.controller.PresentationPortletControllerContext;
-import org.jboss.portal.presentation.impl.model.tree.UINodeFactory;
+import org.jboss.portal.presentation.impl.model.UINodeFactory;
import org.jboss.portal.portlet.controller.request.ControllerRequest;
import org.jboss.portal.portlet.controller.request.PortletActionRequest;
import org.jboss.portal.portlet.controller.request.PortletRenderRequest;
Modified: modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/controller/PresentationPortletControllerContext.java
===================================================================
--- modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/controller/PresentationPortletControllerContext.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/controller/PresentationPortletControllerContext.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -26,6 +26,7 @@
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.PortletContext;
import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.impl.spi.AbstractUserContext;
import org.jboss.portal.portlet.controller.PortletControllerContext;
import org.jboss.portal.portlet.controller.event.EventControllerContext;
@@ -47,7 +48,7 @@
import org.jboss.portal.presentation.portlet.spi.PresentationPortalContext;
import org.jboss.portal.presentation.portlet.spi.PresentationSecurityContext;
import org.jboss.portal.presentation.client.PresentationClient;
-import org.jboss.portal.presentation.model.tree.UINode;
+import org.jboss.portal.presentation.model.UINode;
import org.jboss.portal.presentation.model.ui.UIObject;
import org.jboss.portal.presentation.model.ui.UIWindow;
import org.jboss.portal.presentation.state.StateType;
@@ -190,6 +191,12 @@
//
Portlet portlet = portlets.get(ctx.getWindowId());
+ if (portlet == null)
+ {
+ throw new NoSuchPortletException(ctx.getWindowId());
+ }
+
+ //
portletInvocation.setTarget(portlet.getContext());
//
Modified: modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java
===================================================================
--- modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationInstanceContext.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -25,7 +25,7 @@
import org.jboss.portal.portlet.StateEvent;
import org.jboss.portal.portlet.spi.InstanceContext;
import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.presentation.model.tree.UINode;
+import org.jboss.portal.presentation.model.UINode;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
Modified: modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationWindowContext.java
===================================================================
--- modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationWindowContext.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/portlet/src/main/java/org/jboss/portal/presentation/portlet/spi/PresentationWindowContext.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -23,7 +23,7 @@
package org.jboss.portal.presentation.portlet.spi;
import org.jboss.portal.portlet.spi.WindowContext;
-import org.jboss.portal.presentation.model.tree.UINode;
+import org.jboss.portal.presentation.model.UINode;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java (from rev 10724, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeFactory.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeFactory.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,63 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model;
+
+import org.jboss.portal.presentation.model.UINode;
+import org.jboss.portal.presentation.state.structural.StructuralStateContext;
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UINodeFactory
+{
+
+ /**
+ * Creates a user interface node.
+ *
+ * @param navigationalStateContext the navigational state context
+ * @param structuralStateContext the structural state context
+ * @param objectId the object id
+ * @return the corresponding node
+ */
+ public static UINode createNode(
+ NavigationalStateContext navigationalStateContext,
+ StructuralStateContext structuralStateContext,
+ String objectId)
+ {
+ StructuralObject object = structuralStateContext.load(objectId);
+
+ //
+ if (object != null)
+ {
+ return new UINodeImpl(navigationalStateContext, structuralStateContext, object);
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+}
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java (from rev 10724, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeImpl.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/UINodeImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,164 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model;
+
+import org.jboss.portal.presentation.model.UINode;
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+import org.jboss.portal.presentation.state.structural.StructuralStateContext;
+import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
+import org.jboss.portal.presentation.impl.model.ui.UIObjectContext;
+import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl;
+
+import java.util.Collection;
+import java.util.ArrayList;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+class UINodeImpl implements UINode, UIObjectContext
+{
+
+ /** . */
+ private final NavigationalStateContext navigationalStateContext;
+
+ /** . */
+ private final StructuralStateContext structuralStateContext;
+
+ /** . */
+ private final StructuralObject structuralObject;
+
+ /** . */
+ private Collection<UINode> children;
+
+ /** . */
+ private UINode parent;
+
+ /** . */
+ private boolean parentVisited;
+
+ /** . */
+ private UIObject object;
+
+ UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject)
+ {
+ this.navigationalStateContext = navigationalStateContext;
+ this.structuralStateContext = structuralStateContext;
+ this.structuralObject = structuralObject;
+ this.children = null;
+ this.parentVisited = false;
+ }
+
+ private UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject, Collection<UINode> children)
+ {
+ this.navigationalStateContext = navigationalStateContext;
+ this.structuralStateContext = structuralStateContext;
+ this.structuralObject = structuralObject;
+ this.children = children;
+ this.parentVisited = true;
+ }
+
+ public UIObject getObject()
+ {
+ if (object == null)
+ {
+ object = UIObjectImpl.create(structuralObject, this);
+ }
+
+ //
+ return object;
+ }
+
+ public UINode getParent()
+ {
+ if (!parentVisited)
+ {
+ StructuralObject parentObject = structuralStateContext.loadParent(structuralObject);
+
+ //
+ if (parentObject != null)
+ {
+ Collection<StructuralObject> siblingObjects = structuralStateContext.loadChildren(parentObject);
+ ArrayList<UINode> siblings = new ArrayList<UINode>(siblingObjects.size());
+ for (StructuralObject siblingObject : siblingObjects)
+ {
+ UINodeImpl sibling;
+ if (siblingObject.getId().equals(structuralObject.getId()))
+ {
+ sibling = this;
+ }
+ else
+ {
+ sibling = new UINodeImpl(navigationalStateContext, structuralStateContext, siblingObject);
+ sibling.parent = this;
+ sibling.parentVisited = true;
+ }
+
+ //
+ siblings.add(sibling);
+ }
+
+ //
+ parent = new UINodeImpl(navigationalStateContext, structuralStateContext, parentObject, siblings);
+ }
+
+ //
+ parentVisited = true;
+ }
+
+ //
+ return parent;
+ }
+
+ public Collection<UINode> getChildren()
+ {
+ if (children == null)
+ {
+ Collection<StructuralObject> childrenObject = structuralStateContext.loadChildren(structuralObject);
+ ArrayList<UINode> children = new ArrayList<UINode>(childrenObject.size());
+ for (StructuralObject childObject : childrenObject)
+ {
+ UINodeImpl child = new UINodeImpl(navigationalStateContext, structuralStateContext, childObject);
+ child.parent = this;
+ child.parentVisited = true;
+
+ //
+ children.add(child);
+ }
+
+ //
+ this.children = children;
+ }
+
+ //
+ return children;
+ }
+
+ // UIObjectContext implementation ***********************************************************************************
+
+ public NavigationalStateContext getNavigationalStateContext()
+ {
+ return navigationalStateContext;
+ }
+}
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeFactory.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeFactory.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeFactory.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -1,63 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.impl.model.tree;
-
-import org.jboss.portal.presentation.model.tree.UINode;
-import org.jboss.portal.presentation.state.structural.StructuralStateContext;
-import org.jboss.portal.presentation.state.structural.StructuralObject;
-import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public class UINodeFactory
-{
-
- /**
- * Creates a user interface node.
- *
- * @param navigationalStateContext the navigational state context
- * @param structuralStateContext the structural state context
- * @param objectId the object id
- * @return the corresponding node
- */
- public static UINode createNode(
- NavigationalStateContext navigationalStateContext,
- StructuralStateContext structuralStateContext,
- String objectId)
- {
- StructuralObject object = structuralStateContext.load(objectId);
-
- //
- if (object != null)
- {
- return new UINodeImpl(navigationalStateContext, structuralStateContext, object);
- }
- else
- {
- return null;
- }
- }
-
-}
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeImpl.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/tree/UINodeImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -1,164 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.impl.model.tree;
-
-import org.jboss.portal.presentation.model.tree.UINode;
-import org.jboss.portal.presentation.model.ui.UIObject;
-import org.jboss.portal.presentation.state.structural.StructuralObject;
-import org.jboss.portal.presentation.state.structural.StructuralStateContext;
-import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
-import org.jboss.portal.presentation.impl.model.ui.UIObjectContext;
-import org.jboss.portal.presentation.impl.model.ui.UIObjectImpl;
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-/**
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-class UINodeImpl implements UINode, UIObjectContext
-{
-
- /** . */
- private final NavigationalStateContext navigationalStateContext;
-
- /** . */
- private final StructuralStateContext structuralStateContext;
-
- /** . */
- private final StructuralObject structuralObject;
-
- /** . */
- private Collection<UINode> children;
-
- /** . */
- private UINode parent;
-
- /** . */
- private boolean parentVisited;
-
- /** . */
- private UIObject object;
-
- UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject)
- {
- this.navigationalStateContext = navigationalStateContext;
- this.structuralStateContext = structuralStateContext;
- this.structuralObject = structuralObject;
- this.children = null;
- this.parentVisited = false;
- }
-
- private UINodeImpl(NavigationalStateContext navigationalStateContext, StructuralStateContext structuralStateContext, StructuralObject structuralObject, Collection<UINode> children)
- {
- this.navigationalStateContext = navigationalStateContext;
- this.structuralStateContext = structuralStateContext;
- this.structuralObject = structuralObject;
- this.children = children;
- this.parentVisited = true;
- }
-
- public UIObject getObject()
- {
- if (object == null)
- {
- object = UIObjectImpl.create(structuralObject, this);
- }
-
- //
- return object;
- }
-
- public UINode getParent()
- {
- if (!parentVisited)
- {
- StructuralObject parentObject = structuralStateContext.loadParent(structuralObject);
-
- //
- if (parentObject != null)
- {
- Collection<StructuralObject> siblingObjects = structuralStateContext.loadChildren(parentObject);
- ArrayList<UINode> siblings = new ArrayList<UINode>(siblingObjects.size());
- for (StructuralObject siblingObject : siblingObjects)
- {
- UINodeImpl sibling;
- if (siblingObject.getId().equals(structuralObject.getId()))
- {
- sibling = this;
- }
- else
- {
- sibling = new UINodeImpl(navigationalStateContext, structuralStateContext, siblingObject);
- sibling.parent = this;
- sibling.parentVisited = true;
- }
-
- //
- siblings.add(sibling);
- }
-
- //
- parent = new UINodeImpl(navigationalStateContext, structuralStateContext, parentObject, siblings);
- }
-
- //
- parentVisited = true;
- }
-
- //
- return parent;
- }
-
- public Collection<UINode> getChildren()
- {
- if (children == null)
- {
- Collection<StructuralObject> childrenObject = structuralStateContext.loadChildren(structuralObject);
- ArrayList<UINode> children = new ArrayList<UINode>(childrenObject.size());
- for (StructuralObject childObject : childrenObject)
- {
- UINodeImpl child = new UINodeImpl(navigationalStateContext, structuralStateContext, childObject);
- child.parent = this;
- child.parentVisited = true;
-
- //
- children.add(child);
- }
-
- //
- this.children = children;
- }
-
- //
- return children;
- }
-
- // UIObjectContext implementation ***********************************************************************************
-
- public NavigationalStateContext getNavigationalStateContext()
- {
- return navigationalStateContext;
- }
-}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIObjectImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -28,6 +28,7 @@
import org.jboss.portal.presentation.model.ui.UIContext;
import org.jboss.portal.presentation.model.ui.UIPage;
import org.jboss.portal.presentation.model.ui.UIWindow;
+import org.jboss.portal.presentation.model.ui.UIPane;
import org.jboss.portal.presentation.state.StateException;
import org.jboss.portal.presentation.state.StateType;
import org.jboss.portal.presentation.state.structural.StructuralObject;
@@ -65,6 +66,10 @@
{
object = new UIPageImpl(structuralObject, objectContext);
}
+ else if (type == UIPane.class)
+ {
+ object = new UIPaneImpl(structuralObject, objectContext);
+ }
else if (type == UIContext.class)
{
object = new UIContextImpl(structuralObject, objectContext);
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPageImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
*/
-public class UIPageImpl extends UIObjectImpl implements UIPage
+public class UIPageImpl extends UIPaneImpl implements UIPage
{
public UIPageImpl(
StructuralObject structuralObject,
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ui/UIPaneImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.impl.model.ui;
+
+import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.state.structural.StructuralObject;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class UIPaneImpl extends UIObjectImpl implements UIPane
+{
+
+ public UIPaneImpl(StructuralObject structuralObject, UIObjectContext context)
+ {
+ super(structuralObject, context);
+ }
+}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/NodeImporter.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -24,7 +24,9 @@
import org.jboss.portal.common.io.IOTools;
import org.jboss.portal.common.xml.XMLTools;
+import org.jboss.portal.common.NotYetImplemented;
import static org.jboss.portal.common.xml.XMLTools.*;
+import org.jboss.portal.presentation.model.layout.Constants;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
@@ -37,6 +39,7 @@
import javax.xml.validation.SchemaFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.io.Serializable;
import java.net.URL;
/**
@@ -119,11 +122,6 @@
}
}
- private void importProperties()
- {
-
- }
-
private void importContextDef(Element contextDefElt)
{
// Children pages
@@ -143,16 +141,42 @@
importPageDef(pageNode, childElt);
}
- // Windows
- for (Element childElt : getChildren(pageDefElt, "window-def"))
+ //
+ Element layoutElt = getUniqueChild(pageDefElt, "simple-layout", false);
+
+ //
+ if (layoutElt != null)
{
- importWindowDef(pageNode, childElt);
+ importLayout(pageNode, layoutElt);
}
//
return pageNode;
}
+ private void importLayout(StructuralNode paneNode, Element layoutElt)
+ {
+ if ("simple-layout".equals(layoutElt.getNodeName()))
+ {
+ paneNode.setProperty(Constants.LAYOUT_ID, Constants.SIMPLE_LAYOUT);
+ paneNode.setProperty(Constants.SIMPLE_LAYOUT_ORIENTATION, Constants.VERTICAL_ORIENTATION);
+
+ //
+ int index = 0;
+ for (Element childElt : getChildren(layoutElt, "window-def"))
+ {
+ WindowNode windowNode = importWindowDef(paneNode, childElt);
+
+ //
+ windowNode.setProperty(Constants.SIMPLE_LAYOUT_INDEX, index++);
+ }
+ }
+ else
+ {
+ throw new NotYetImplemented();
+ }
+ }
+
private WindowNode importWindowDef(StructuralNode parentNode, Element windowDefElt)
{
WindowNode windowNode = createStructuralNode(parentNode, WindowNode.class, windowDefElt);
@@ -188,8 +212,23 @@
//
Element valueElt = XMLTools.getUniqueChild(propertyElt, "value", true);
- String propertyValue = XMLTools.asString(valueElt);
+ String litteralPropertyValue = XMLTools.asString(valueElt);
+ Serializable propertyValue;
+ String propertyType = valueElt.getAttribute("type");
+ if (propertyType == null || "string".equals(propertyType))
+ {
+ propertyValue = litteralPropertyValue;
+ }
+ else if ("int".equals(propertyType))
+ {
+ propertyValue = Integer.parseInt(litteralPropertyValue);
+ }
+ else
+ {
+ throw new AssertionError();
+ }
+
//
node.setProperty(propertyName, propertyValue);
}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralNode.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -35,6 +35,7 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -65,14 +66,14 @@
private boolean valid;
/** . */
- private final Map<String, String> properties;
+ private final Map<String, Serializable> properties;
protected StructuralNode(String name, StructuralStateContextImpl structuralStateContext)
{
this.name = name;
this.id = structuralStateContext.nextId();
this.structuralStateContext = structuralStateContext;
- this.properties = new HashMap<String, String>();
+ this.properties = new HashMap<String, Serializable>();
this.valid = true;
}
@@ -120,7 +121,7 @@
StructuralStateImpl state = new StructuralStateImpl(
getType(),
name,
- Collections.unmodifiableMap(new HashMap<String, String>(properties)));
+ Collections.unmodifiableMap(new HashMap<String, Serializable>(properties)));
//
Set<String> childrenIds = new HashSet<String>();
@@ -209,7 +210,7 @@
return Collections.unmodifiableSet(properties.keySet());
}
- public String getProperty(String propertyName)
+ public Serializable getProperty(String propertyName)
{
if (propertyName == null)
{
@@ -223,7 +224,7 @@
}
}
- public void setProperty(String propertyName, String propertyValue)
+ public void setProperty(String propertyName, Serializable propertyValue)
{
if (propertyName == null)
{
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/StructuralStateImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -26,6 +26,7 @@
import org.jboss.portal.presentation.state.structural.StructuralState;
import java.util.Map;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -41,12 +42,12 @@
private final String name;
/** . */
- private final Map<String, String> properties;
+ private final Map<String, Serializable> properties;
public StructuralStateImpl(
Class<? extends UIObject> type,
String name,
- Map<String, String> properties)
+ Map<String, Serializable> properties)
{
this.type = type;
this.name = name;
@@ -63,7 +64,7 @@
return name;
}
- public Map<String, String> getProperties()
+ public Map<String, Serializable> getProperties()
{
return properties;
}
Copied: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java (from rev 10727, modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/tree/UINode.java)
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,60 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model;
+
+import org.jboss.portal.presentation.model.ui.UIObject;
+
+import java.util.Collection;
+
+/**
+ * The node interface provides a pull style api for interacting with an ui object.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UINode
+{
+
+ /**
+ * Returns the related ui object.
+ *
+ * @return the ui object
+ */
+ UIObject getObject();
+
+ /**
+ * Returns the parent node or null if it cannot be loaded (because it is the root or
+ * because the viewport scope does not go beyond)
+ *
+ * @return the parent node
+ */
+ UINode getParent();
+
+ /**
+ * Returns a collection of children nodes or null if the node children cannot be loaded.
+ *
+ * @return the children
+ */
+ Collection<UINode> getChildren();
+
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Constants.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class Constants
+{
+
+ /** . */
+ public static final String LAYOUT_ID = "org.jboss.portal.presentation.layout_id";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT_ORIENTATION = "org.jboss.portal.presentation.layout.simple.orientation";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT_INDEX = "org.jboss.portal.presentation.layout.simple.index";
+
+ /** . */
+ public static final String VERTICAL_ORIENTATION = "vertical";
+
+ /** . */
+ public static final String HORIZONTAL_ORIENTATION = "horizontal";
+
+ /** . */
+ public static final String SIMPLE_LAYOUT = "simple_layout";
+
+ /** . */
+ public static final String REGION_LAYOUT = "region_layout";
+
+ /** . */
+ public static final String REGION_LAYOUT_NAME = "org.jboss.portal.presentation.layout.region.name";
+
+ /** . */
+ public static final String REGION_LAYOUT_INDEX = "org.jboss.portal.presentation.layout.region.index";
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DefaultLayout.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DefaultLayout.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/DefaultLayout.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class DefaultLayout implements Layout
+{
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Layout.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Layout.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Layout.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface Layout
+{
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/LayoutFactory.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/LayoutFactory.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/LayoutFactory.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,135 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+import org.jboss.portal.presentation.model.ui.UIPane;
+import org.jboss.portal.presentation.model.ui.UIObject;
+import org.jboss.portal.presentation.model.UINode;
+import org.jboss.portal.presentation.state.StateType;
+
+import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.util.SetMap;
+
+import java.util.Collection;
+import java.util.TreeMap;
+import java.util.Comparator;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class LayoutFactory
+{
+
+ public Layout getLayout(UINode node)
+ {
+ UIPane pane = (UIPane)node.getObject();
+
+ //
+ String layoutId = pane.getProperty(StateType.STRUCTURAL, Constants.LAYOUT_ID, String.class);
+
+ //
+ if (Constants.SIMPLE_LAYOUT.equals(layoutId))
+ {
+ String orientationValue = pane.getProperty(StateType.STRUCTURAL, Constants.SIMPLE_LAYOUT_ORIENTATION, String.class);
+
+ //
+ Orientation orientation = Orientation.HORIZONTAL;
+
+ //
+ if (Constants.VERTICAL_ORIENTATION.equals(orientationValue))
+ {
+ orientation = Orientation.VERTICAL;
+ }
+
+ //
+ Collection<? extends UINode> chidrenNodes = node.getChildren();
+
+ //
+ if (chidrenNodes == null)
+ {
+ throw new IllegalStateException("No children found for the simple layout " + pane.getId());
+ }
+
+ //
+ TreeMap<Integer, UINode> layoutNodes = new TreeMap<Integer, UINode>();
+ for (UINode childNode : chidrenNodes)
+ {
+ UIObject child = childNode.getObject();
+
+ //
+ Integer index = child.getProperty(StateType.STRUCTURAL, Constants.SIMPLE_LAYOUT_INDEX, Integer.class);
+
+ //
+ if (index != null)
+ {
+ layoutNodes.put(index, childNode);
+ }
+ }
+
+ //
+ return new SimpleLayout(orientation, layoutNodes.values());
+ }
+ else if (Constants.REGION_LAYOUT.equals(layoutId))
+ {
+ Collection<? extends UINode> chidrenNodes = node.getChildren();
+
+ //
+ SetMap<String, UINode> map = new SetMap<String, UINode>(comparator);
+ for (UINode childNode : chidrenNodes)
+ {
+ UIObject child = childNode.getObject();
+
+ //
+ String regionName = child.getProperty(StateType.STRUCTURAL, Constants.REGION_LAYOUT_NAME, String.class);
+ Integer regionIndex = child.getProperty(StateType.STRUCTURAL, Constants.REGION_LAYOUT_INDEX, Integer.class);
+
+ //
+ if (regionName != null && regionIndex != null)
+ {
+ map.put(regionName, childNode);
+ }
+ }
+
+ //
+ return new RegionLayout(map);
+ }
+ else
+ {
+ throw new NotYetImplemented();
+ }
+ }
+
+ /** . */
+ private static final Comparator<UINode> comparator = new Comparator<UINode>()
+ {
+ public int compare(UINode node1, UINode node2)
+ {
+ UIObject object1 = node1.getObject();
+ UIObject object2 = node2.getObject();
+ Integer index1 = object1.getProperty(StateType.STRUCTURAL, Constants.REGION_LAYOUT_INDEX, Integer.class);
+ Integer index2 = object2.getProperty(StateType.STRUCTURAL, Constants.REGION_LAYOUT_INDEX, Integer.class);
+ return index1.compareTo(index2);
+ }
+ };
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Orientation.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Orientation.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/Orientation.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,34 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+/**
+ * An orientation.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public enum Orientation
+{
+ VERTICAL, HORIZONTAL
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/RegionLayout.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/RegionLayout.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/RegionLayout.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,56 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+import org.jboss.portal.presentation.model.UINode;
+
+import org.jboss.portal.common.util.CollectionMap;
+
+import java.util.Set;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class RegionLayout implements Layout
+{
+
+ /** . */
+ private final CollectionMap<String, UINode> map;
+
+ RegionLayout(CollectionMap<String, UINode> map)
+ {
+ this.map = map;
+ }
+
+ public Set<String> getRegionNames()
+ {
+ return map.keySet();
+ }
+
+ public Collection<? extends UINode> getNodes(String regionName)
+ {
+ return map.get(regionName);
+ }
+}
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/SimpleLayout.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/SimpleLayout.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/layout/SimpleLayout.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,57 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.layout;
+
+import org.jboss.portal.presentation.model.UINode;
+
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class SimpleLayout implements Layout
+{
+
+ /** . */
+ private final Orientation orientation;
+
+ /** . */
+ private final Collection<? extends UINode> nodes;
+
+ SimpleLayout(Orientation orientation, Collection<? extends UINode> nodes)
+ {
+ this.orientation = orientation;
+ this.nodes = nodes;
+ }
+
+ public Orientation getOrientation()
+ {
+ return orientation;
+ }
+
+ public Collection<? extends UINode> getNodes()
+ {
+ return nodes;
+ }
+}
Deleted: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/tree/UINode.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/tree/UINode.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/tree/UINode.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -1,59 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2008, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.presentation.model.tree;
-
-import org.jboss.portal.presentation.model.ui.UIObject;
-
-import java.util.Collection;
-
-/**
- * The node interface provides a pull style api for interacting with the structural context.
- *
- * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
- * @version $Revision: 630 $
- */
-public interface UINode
-{
-
- /**
- * Returns the related ui object.
- *
- * @return the ui object
- */
- UIObject getObject();
-
- /**
- * Returns the parent node or null if it does not exist.
- *
- * @return the parent node
- */
- UINode getParent();
-
- /**
- * Returns a collection of children nodes.
- *
- * @return the children
- */
- Collection<UINode> getChildren();
-
-}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPage.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -26,6 +26,6 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public interface UIPage extends UIObject
+public interface UIPage extends UIPane
{
}
\ No newline at end of file
Added: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java (rev 0)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ui/UIPane.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -0,0 +1,31 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.presentation.model.ui;
+
+/**
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public interface UIPane extends UIObject
+{
+}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -25,6 +25,7 @@
import org.jboss.portal.presentation.model.ui.UIObject;
import java.util.Map;
+import java.io.Serializable;
/**
* The structural state.
@@ -39,5 +40,5 @@
String getName();
- Map<String, String> getProperties();
+ Map<String, Serializable> getProperties();
}
\ No newline at end of file
Modified: modules/presentation/trunk/presentation/src/main/resources/org/jboss/portal/presentation/impl/state/structural/page_structure_1_0.xsd
===================================================================
--- modules/presentation/trunk/presentation/src/main/resources/org/jboss/portal/presentation/impl/state/structural/page_structure_1_0.xsd 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/main/resources/org/jboss/portal/presentation/impl/state/structural/page_structure_1_0.xsd 2008-05-30 13:44:38 UTC (rev 10861)
@@ -7,10 +7,7 @@
attributeFormDefault="unqualified"
version="1.0">
- <xsd:element
- name="context-def"
- type="contextDefType">
- <xsd:annotation><xsd:documentation>A jboss-unit is the top container element.</xsd:documentation></xsd:annotation>
+ <xsd:element name="context-def" type="contextDefType">
</xsd:element>
<xsd:complexType name="nodeDefType">
@@ -34,10 +31,31 @@
</xsd:complexType>
<xsd:complexType name="nodePropertyType">
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- <xsd:attribute name="value" type="xsd:string" use="required"/>
+ <xsd:sequence>
+ <xsd:element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
+ <xsd:element name="value" type="propertyValueType" minOccurs="1" maxOccurs="1"/>
+ </xsd:sequence>
</xsd:complexType>
+ <xsd:complexType name="propertyValueType">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="type" use="optional" default="string">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="string"/>
+ <xsd:enumeration value="int"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ </xsd:extension>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+ <xsd:simpleType name="contentType" >
+ <xsd:restriction base="xsd:string"/>
+ </xsd:simpleType>
+
<xsd:complexType name="contextDefType">
<xsd:complexContent>
<xsd:extension base="nodeDefType">
@@ -53,10 +71,15 @@
<xsd:complexType name="pageDefType">
<xsd:complexContent>
<xsd:extension base="namedNodeDefType">
- <xsd:choice minOccurs="0" maxOccurs="unbounded">
- <xsd:element name="page-def" type="pageDefType"/>
- <xsd:element name="window-def" type="windowDefType"/>
- </xsd:choice>
+ <xsd:sequence>
+ <xsd:choice minOccurs="1" maxOccurs="1">
+ <xsd:element name="simple-layout" type="simpleLayoutType"/>
+ <xsd:element name="region-layout" type="regionLayoutType"/>
+ </xsd:choice>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="page-def" type="pageDefType"/>
+ </xsd:choice>
+ </xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
@@ -71,8 +94,31 @@
</xsd:complexContent>
</xsd:complexType>
- <xsd:simpleType name="contentType" >
- <xsd:restriction base="xsd:string"/>
- </xsd:simpleType>
+ <xsd:complexType name="simpleLayoutType">
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="window-def" type="windowDefType"/>
+ </xsd:choice>
+ <xsd:attribute name="orientation" use="optional" default="vertical">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="vertical"/>
+ <xsd:enumeration value="horizontal"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ </xsd:complexType>
+ <xsd:complexType name="regionLayoutType">
+ <xsd:sequence>
+ <xsd:element name="region" type="regionType" minOccurs="0" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="regionType">
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="window-def" type="windowDefType"/>
+ </xsd:choice>
+ <xsd:attribute name="orientation" use="required" type="xsd:string"/>
+ </xsd:complexType>
+
</xsd:schema>
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/AbstractModelTestCase.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -39,6 +39,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -80,7 +81,7 @@
protected abstract void setProperty(MockObject object, String propertyName, String propertyValue);
- protected abstract String getProperty(MockObject object, String name);
+ protected abstract Serializable getProperty(MockObject object, String name);
protected final StructuralObject getStructuralObject(MockObject object)
{
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObject.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -28,6 +28,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -81,13 +82,13 @@
int getVersion();
- String getPropertyValue(String propertyName) throws IllegalArgumentException;
+ Serializable getPropertyValue(String propertyName) throws IllegalArgumentException;
void setPropertyBehavior(String propertyName, UpdateBehavior propertyBehavior) throws IllegalArgumentException;
UpdateBehavior getPropertyBehavior(String propertyName) throws IllegalArgumentException;
- void setPropertyValue(String propertyName, String propertyValue) throws MockException;
+ void setPropertyValue(String propertyName, Serializable propertyValue) throws MockException;
Set<String> getPropertyNames();
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/MockObjectImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -31,6 +31,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -49,7 +50,7 @@
private final String name;
/** . */
- private final Map<String, String> propertyValues;
+ private final Map<String, Serializable> propertyValues;
/** . */
private final Map<String, UpdateBehavior> propertyBehaviors;
@@ -75,7 +76,7 @@
this.name = name;
this.type = type;
this.children = new LinkedHashMap<String, MockObjectImpl>();
- this.propertyValues = new HashMap<String, String>();
+ this.propertyValues = new HashMap<String, Serializable>();
this.propertyBehaviors = new HashMap<String, UpdateBehavior>();
this.valid = true;
this.handle = new StructuralObjectHandle(id, 0);
@@ -101,7 +102,7 @@
return handle.id;
}
- public String getPropertyValue(String propertyName)
+ public Serializable getPropertyValue(String propertyName)
{
if (name == null)
{
@@ -216,7 +217,7 @@
return propertyBehaviors.get(propertyName);
}
- public void setPropertyValue(String propertyName, String propertyValue) throws MockException
+ public void setPropertyValue(String propertyName, Serializable propertyValue) throws MockException
{
if (!valid)
{
@@ -256,7 +257,7 @@
}
//
- StructuralStateImpl state = new StructuralStateImpl(type, name, new HashMap<String, String>(propertyValues));
+ StructuralStateImpl state = new StructuralStateImpl(type, name, new HashMap<String, Serializable>(propertyValues));
//
return new StructuralObjectImpl(handle, parentHandle, childrenHandles, state);
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/model/state/structural/StructuralStateImpl.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -26,6 +26,7 @@
import org.jboss.portal.presentation.state.structural.StructuralState;
import java.util.Map;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -41,9 +42,9 @@
private final String name;
/** . */
- private final Map<String, String> properties;
+ private final Map<String, Serializable> properties;
- public StructuralStateImpl(Class<? extends UIObject> type, String name, Map<String, String> properties)
+ public StructuralStateImpl(Class<? extends UIObject> type, String name, Map<String, Serializable> properties)
{
this.type = type;
this.name = name;
@@ -60,7 +61,7 @@
return name;
}
- public Map<String, String> getProperties()
+ public Map<String, Serializable> getProperties()
{
return properties;
}
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java 2008-05-30 12:06:26 UTC (rev 10860)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/structural/StructuralStateContextTestCase.java 2008-05-30 13:44:38 UTC (rev 10861)
@@ -37,6 +37,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -124,7 +125,7 @@
structuralNode.setProperty(propertyName, propertyValue);
}
- protected String getProperty(StructuralNode structuralNode, String name)
+ protected Serializable getProperty(StructuralNode structuralNode, String name)
{
return structuralNode.getProperty(name);
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10860 - branches/JBoss_Portal_Branch_2_7/cms/src/resources/test.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 08:06:26 -0400 (Fri, 30 May 2008)
New Revision: 10860
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/db-config.xml
branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/standardidentity-config.xml
Log:
fix for cms tests
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/db-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/db-config.xml 2008-05-30 10:46:24 UTC (rev 10859)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/db-config.xml 2008-05-30 12:06:26 UTC (rev 10860)
@@ -47,7 +47,13 @@
<type>Membership</type>
<implementation>DB</implementation>
<config/>
- </module>
+ </module>
+ <module>
+ <!--type used to correctly map in IdentityContext registry-->
+ <type>UserProfile</type>
+ <implementation>DB</implementation>
+ <config/>
+ </module>
</modules>
<options/>
</identity-configuration>
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/standardidentity-config.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/standardidentity-config.xml 2008-05-30 10:46:24 UTC (rev 10859)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/standardidentity-config.xml 2008-05-30 12:06:26 UTC (rev 10860)
@@ -140,8 +140,33 @@
</option>
</config>
</module>
+
+ <module>
+ <!--type used to correctly map in IdentityContext registry-->
+ <type>UserProfile</type>
+ <implementation>DB</implementation>
+
+ <!--name of service and class for creating mbean-->
+ <service-name>portal:service=Module,type=UserProfile</service-name>
+ <class>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</class>
+
+ <!--set of options that are set in instantiated object-->
+ <config>
+ <option>
+ <name>sessionFactoryJNDIName</name>
+ <value>java:/SessionFactory</value>
+ </option>
+ <option>
+ <name>jNDIName</name>
+ <value>java:/portal/UserProfileModule</value>
+ </option>
+ </config>
+ </module>
+
</modules>
+
+
<options>
<!--Common options section-->
<option-group>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10859 - in branches/JBoss_Portal_Branch_2_7: cms/src/main/org/jboss/portal/cms/impl/jcr and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 06:46:24 -0400 (Fri, 30 May 2008)
New Revision: 10859
Added:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
Modified:
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/CommandFactory.java
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
Log:
[JBPORTAL-1899] - Uploading large archives into Portal CMS results in Transaction timeout (merge missing from 2.6)
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/CommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/CommandFactory.java 2008-05-30 10:40:00 UTC (rev 10858)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/CommandFactory.java 2008-05-30 10:46:24 UTC (rev 10859)
@@ -25,6 +25,7 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
+import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import java.io.InputStream;
@@ -74,6 +75,8 @@
Command createContentCreateNewVersionCommand(List contents, boolean bMakeLive);
Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage);
+
+ Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage);
Command createItemExistsCommand(String sPath);
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-05-30 10:40:00 UTC (rev 10858)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-05-30 10:46:24 UTC (rev 10859)
@@ -50,8 +50,11 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
+import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
+import org.jboss.portal.cms.impl.jcr.command.AsyncStoreArchiveCommand;
+
import java.io.InputStream;
import java.util.List;
import java.util.Locale;
@@ -153,8 +156,13 @@
public Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
{
- return new StoreArchiveCommand(sRootPath, is, sLanguage);
+ return new StoreArchiveCommand(sRootPath, is, sLanguage);
}
+
+ public Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ {
+ return new AsyncStoreArchiveCommand(cms,sRootPath, is, sLanguage);
+ }
public Command createItemExistsCommand(String sPath)
{
Copied: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java (from rev 10735, branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-05-30 10:46:24 UTC (rev 10859)
@@ -0,0 +1,127 @@
+/******************************************************************************
+ * 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.cms.impl.jcr.command;
+
+import org.apache.log4j.Logger;
+
+import org.jboss.portal.cms.impl.jcr.JCRCMS;
+import org.jboss.portal.cms.impl.jcr.JCRCommand;
+import org.jboss.portal.cms.impl.jcr.JCRCommandContext;
+import org.jboss.portal.cms.CMSException;
+
+
+import java.io.InputStream;
+
+import org.jboss.portal.cms.CMS;
+
+/**
+ * Saves an uploaded archive to the repo.
+ *
+ * @author <a href="mailto:roy@jboss.org">Roy Russo</a>
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class AsyncStoreArchiveCommand extends JCRCommand
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1568453649437987499L;
+ private static Logger log = Logger.getLogger(AsyncStoreArchiveCommand.class);
+
+ String msRootPath;
+ InputStream mIS;
+ String msLanguage;
+ CMS cms = null;
+
+ private Object user = null;
+ private Object approvePublishWorkflow = null;
+
+
+ /**
+ * @param sRootPath
+ * @param is
+ * @param sLanguage
+ */
+ public AsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ {
+ this.msRootPath = sRootPath;
+ this.mIS = is;
+ this.msLanguage = sLanguage;
+ this.cms = cms;
+ }
+
+ /**
+ *
+ */
+ public Object execute()
+ {
+ try
+ {
+ //Capture context information to be passed to the Async processor
+ this.user = context.getAttribute(JCRCommandContext.scope, "user");
+ this.approvePublishWorkflow = context.getAttribute(JCRCommandContext.scope, "approvePublishWorkflow");
+
+ Thread t = new Thread(new AsyncProcessor());
+ t.start();
+
+ return null;
+ }
+ catch(Exception e)
+ {
+ throw new CMSException(e);
+ }
+ }
+ //--------------------------------------------------------------------------------------------------------------------------------------------------------------
+ /**
+ *
+ */
+ private class AsyncProcessor implements Runnable
+ {
+ /**
+ *
+ */
+ public void run()
+ {
+ try
+ {
+ log.info("Async Processing started....................");
+
+ //Setup context information to be propagated to the new CMS Service Command call
+ JCRCMS.getUserInfo().set(user);
+ if(approvePublishWorkflow != null)
+ {
+ JCRCMS.turnOnWorkflow();
+ }
+
+ JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().createStoreArchiveCommand(msRootPath, mIS, msLanguage);
+ cms.execute(storeArchiveCommand);
+
+ log.info("Async Processing finished..................");
+ }
+ catch(Exception e)
+ {
+ log.error("Asynchronous Processing of archive failed------------------------------------");
+ log.error(this, e);
+ log.error("-----------------------------------------------------------------------------");
+ }
+ }
+ }
+}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-05-30 10:40:00 UTC (rev 10858)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-05-30 10:46:24 UTC (rev 10859)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.jboss.portal.cms.impl.jcr.command;
+import org.apache.log4j.Logger;
import org.apache.tools.zip.ZipEntry;
import org.apache.tools.zip.ZipFile;
import org.jboss.portal.cms.CMSException;
@@ -37,10 +38,8 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
-import java.util.ArrayList;
import java.util.Date;
import java.util.Enumeration;
-import java.util.List;
import java.util.Locale;
import java.util.StringTokenizer;
@@ -54,6 +53,8 @@
{
/** The serialVersionUID */
private static final long serialVersionUID = 1568453649437987499L;
+ private static Logger log = Logger.getLogger(StoreArchiveCommand.class);
+
String msRootPath;
InputStream mIS;
String msLanguage;
@@ -75,7 +76,6 @@
*/
public Object execute()
{
- List contents = new ArrayList();
File tmpFile = null;
try
{
@@ -128,8 +128,10 @@
JCRCommand saveContentCMD = (JCRCommand)context.getCommandFactory().createContentSaveCommand(file);
context.execute(saveContentCMD);
-
- contents.add(content);
+
+ //Add this content to the repository
+ JCRCommand createContent = (JCRCommand)context.getCommandFactory().createContentCreateNewVersionCommand(content, true);
+ context.execute(createContent);
}
else // isDirectory
{
@@ -168,11 +170,11 @@
}
}
}
- return contents;
+ return null;
}
catch (Exception e)
{
- e.printStackTrace();
+ throw new CMSException(e);
}
finally
{
@@ -181,7 +183,6 @@
tmpFile.delete();
}
}
- return null;
}
/** @param parentPath */
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2008-05-30 10:40:00 UTC (rev 10858)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2008-05-30 10:46:24 UTC (rev 10859)
@@ -80,13 +80,9 @@
service.setDefaultLocale(Locale.ENGLISH.getLanguage());
InputStream is = IOTools.safeBufferedWrapper(new FileInputStream(sZipFile));
Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en");
- List contentsToVersion = (List)service.execute(storearchiveCMD);
- is.close();
+ service.execute(storearchiveCMD);
+ is.close();
- Command createVersions = service.getCommandFactory()
- .createContentCreateNewVersionCommand(contentsToVersion, true);
- service.execute(createVersions);
-
// retrieve list
Command listCMD = service.getCommandFactory().createFolderGetListCommand("/ziptest/poop");
Folder whopper = (Folder)service.execute(listCMD);
@@ -107,13 +103,6 @@
Command listCMD3 = service.getCommandFactory().createFolderGetListCommand("/");
Folder whopper3 = (Folder)service.execute(listCMD3);
List folders3 = whopper3.getFolders();
- List files3 = whopper3.getFiles();
-
- //Create and Test an archive containing foreign files
- is = IOTools.safeBufferedWrapper(new FileInputStream(this.foreignArchive));
- storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en");
- contentsToVersion = (List)service.execute(storearchiveCMD);
- assertTrue("Foreign Archive Creation Failed", (contentsToVersion != null && !contentsToVersion.isEmpty() && contentsToVersion.size() == 2));
- is.close();
+ List files3 = whopper3.getFiles();
}
}
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-05-30 10:40:00 UTC (rev 10858)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-05-30 10:46:24 UTC (rev 10859)
@@ -68,6 +68,7 @@
import org.jboss.portlet.JBossRenderResponse;
import javax.naming.InitialContext;
+import javax.portlet.PortletConfig;
import javax.portlet.PortletException;
import javax.portlet.PortletRequest;
import javax.portlet.PortletRequestDispatcher;
@@ -85,6 +86,7 @@
import java.util.Locale;
import java.util.Set;
import java.util.Vector;
+import java.util.ResourceBundle;
/**
* @author <a href="mailto:roy@jboss.org">Roy Russo</a>
@@ -99,6 +101,7 @@
private MembershipModule membershipModule;
private ApprovePublish approvePublish;
private AuthorizationManager authorizationManager;
+ private ResourceBundle resources = null;
public void init() throws PortletException
@@ -130,9 +133,22 @@
throw new PortletException("Authorization Service not found");
}
- this.initializeApprovePublishWorkflow();
+ this.initializeApprovePublishWorkflow();
}
+
+ /**
+ *
+ */
+ public void init(PortletConfig config) throws PortletException
+ {
+ super.init(config);
+
+ //Get the Resource Bundle for this Portlet
+ this.resources = config.getResourceBundle(Locale.getDefault());
+ }
+
+
protected void doView(final JBossRenderRequest rReq, final JBossRenderResponse rRes)
throws PortletException, IOException, UnavailableException
{
@@ -222,6 +238,14 @@
{
rReq.setAttribute("manageWorkflowAccessible", new Boolean(false));
}
+
+ //Messages
+ if(rReq.getPortletSession().getAttribute("messages") != null)
+ {
+ Object messages = rReq.getPortletSession().getAttribute("messages");
+ rReq.getPortletSession().removeAttribute("messages");
+ rReq.setAttribute("messages", messages);
+ }
javax.portlet.PortletRequestDispatcher prd = getPortletContext().getRequestDispatcher(CMSAdminConstants.CMS_JSP_PATH + "/main.jsp");
prd.include(rReq, rRes);
@@ -852,12 +876,14 @@
if (!item.isFormField())
{
InputStream is = item.getInputStream();
- Command storearchiveCMD = CMSService.getCommandFactory().createStoreArchiveCommand(sPath, is, sLanguage);
- List contentstoVersion = (List)CMSService.execute(storearchiveCMD);
+
+ Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(CMSService, sPath, is, sLanguage);
+ CMSService.execute(storearchiveCMD);
+
+ List messages = new ArrayList();
+ messages.add(this.resources.getObject("CMS_MSG_UPLOADARCHIVE_ASYNC"));
+ aReq.getPortletSession().setAttribute("messages", messages);
- Command createVersions = CMSService.getCommandFactory().createContentCreateNewVersionCommand(contentstoVersion, true);
- CMSService.execute(createVersions);
-
aRes.setRenderParameter("path", FileUtil.cleanDoubleSlashes(sPath));
}
else
@@ -870,13 +896,13 @@
else if ("language".equals(fieldName))
{
sLanguage = item.getString(aReq.getCharacterEncoding());
- }
+ }
}
}
}
catch (Exception e)
{
- throw new PortletException(e);
+ throw new PortletException("CMS_ERROR_UPLOADARCHIVE_ASYNC");
}
aRes.setRenderParameter("op", CMSAdminConstants.OP_MAIN);
}
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-30 10:40:00 UTC (rev 10858)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-30 10:46:24 UTC (rev 10859)
@@ -58,6 +58,7 @@
CMS_CREATEFOLDER= Create Folder
CMS_CREATEFILE=Create File
CMS_UPLOADARCHIVE=Upload Archive
+CMS_UPLOADARCHIVE_ASYNC=Process Asynchronously
CMS_BACKTOBROWSER=Back to Directory Browser
CMS_TRANSFER=Import/Export
CMS_EXPORTARCHIVE=Export Folder
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10858 - branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 06:40:00 -0400 (Fri, 30 May 2008)
New Revision: 10858
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
Log:
[JBPORTAL-1997] - Fixing the Security Logic issue with the accessibility of the CMSAdminPortlet (merge missing from 2.6)
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-05-30 10:28:35 UTC (rev 10857)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-05-30 10:40:00 UTC (rev 10858)
@@ -1510,6 +1510,12 @@
if (portletRequest.getUserPrincipal() != null)
{
+ if(portletRequest.getUserPrincipal().getName().equals(this.authorizationManager.getProvider().getRoot().getUserName()))
+ {
+ return true;
+ }
+
+ //Not the Root User. so now make sure the Portlet is accessible to the User that is logged in
User user = this.userModule.findUserByUserName(portletRequest.getUserPrincipal().getName());
String uri = this.authorizationManager.getProvider().getUserURI(user.getUserName());
Collection permissions = this.authorizationManager.getProvider().getSecurityBindings(uri);
@@ -1527,6 +1533,25 @@
}
}
}
+ else
+ {
+ //Make sure based on permissions if the resources are accessible to the Anonymous user
+ String uri = this.authorizationManager.getProvider().getRoleURI(AuthorizationManager.Anonymous);
+ Collection permissions = this.authorizationManager.getProvider().getSecurityBindings(uri);
+ if (permissions != null)
+ {
+ for (Iterator itr = permissions.iterator(); itr.hasNext();)
+ {
+ Permission permission = (Permission)itr.next();
+ if ((permission.getService().equals("cms")) &&
+ (permission.getAction().equals("write") || permission.getAction().equals("manage"))
+ )
+ {
+ isPortletAccessible = true;
+ }
+ }
+ }
+ }
return isPortletAccessible;
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10857 - in branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates: lostPassword and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 06:28:35 -0400 (Fri, 30 May 2008)
New Revision: 10857
Added:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
Log:
Italian l10n for email templates
Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl (from rev 10851, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl 2008-05-30 10:28:35 UTC (rev 10857)
@@ -0,0 +1,9 @@
+Ciao,
+
+Hai provato a cambiare il tuo indirizzo e-mail su ${emailDomain}
+
+Segui questo link per verificare il nuovo indirizzo:
+${activationLink}
+
+Saluti,
+${emailDomain}
Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl (from rev 10851, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl 2008-05-30 10:28:35 UTC (rev 10857)
@@ -0,0 +1,12 @@
+Ciao,
+
+abbiamo ricevuto la tua richiesta di resettare la password su ${emailDomain}.
+
+Ti mandiamo le informazioni per l'utenza:
+Username: ${username}
+Password: ${password}
+
+E' raccomandato che modifichi la password dopo il prossimo login.
+
+Saluti,
+${emailDomain}
Copied: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl (from rev 10851, branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl 2008-05-30 10:28:35 UTC (rev 10857)
@@ -0,0 +1,15 @@
+Ciao,
+
+hai provato a creare un account su ${emailDomain}
+
+Ti mandiamo le informazioni per l'utenza:
+Username: ${username}
+Password: ${password}
+
+L'account non è ancora abilitato. Hai bisogno di accedere a questo url per abilitare l'account.
+${activationLink}
+
+Se non hai richiesto alcuna creazione, puoi ignorare il messaggio.
+
+Best regards,
+${emailDomain}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10856 - in branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms and 2 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 06:26:19 -0400 (Fri, 30 May 2008)
New Revision: 10856
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
Log:
- Core-CMS i18n, contribution from Luca
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-30 10:26:19 UTC (rev 10856)
@@ -96,4 +96,26 @@
CMS_PATH=Location
CMS_EMPTY_FOLDER=This folder is empty.
-
\ No newline at end of file
+
+CMS_ERROR_UPLOADARCHIVE_ASYNC=An error occurred while processing your archive. Please try again with 'Asynchronous Processing' activated
+CMS_MSG_UPLOADARCHIVE_ASYNC=Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished
+
+CMS_REQUIRED=Required
+CMS_LINK_TO_RESOURCES=Links to resources within this portal should be absolute. For example: A link to an image located in default/images/back.gif should be typed in exactly as shown here. Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the preview button in the editor
+CMS_ERROR_PROCESSING=ERROR processing export request
+CMS_YOUR_EXPORT_0=Your export of
+CMS_YOUR_EXPORT_1=is ready for download
+CMS_CLICK_TO_DOWNLOAD=Click to Download
+CMS_ROOT_FOLDER=Root Folder
+CMS_MESSAGES=Messages
+CMS_HOME=Home
+CMS_ERROR=Error
+CMS_PENDING_APPROVAL_QUEUE=Pending Approval Queue
+CMS_CONFIGURE_RESTRICTION=Configure security restrictions on node
+CMS_SELECT_ACTION=Select Action
+CMS_BROWSING=Browsing
+CMS_CONTENT_NOT_FOUND=Content could not be found for the selected file
+CMS_INTRODUCTION=Introduction
+CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
+CMS_TO_MODIFY=To modify how this portlet behaves, please
+CMS_CLICK_HERE=click here
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-30 10:26:19 UTC (rev 10856)
@@ -96,4 +96,23 @@
CMS_PATH=Localit\u00e0
CMS_EMPTY_FOLDER=Questa cartella \u00e8 vuota .
-
\ No newline at end of file
+
+CMS_REQUIRED=Obbligatorio
+CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor
+CMS_ERROR_PROCESSING=ERRORE nel processare l\'esportazione
+CMS_YOUR_EXPORT_0=L\'esportazione di
+CMS_YOUR_EXPORT_1=\u00e8 pronta per il Download
+CMS_CLICK_TO_DOWNLOAD=Clicca per il Download
+CMS_ROOT_FOLDER=Cartella principale
+CMS_MESSAGES=Messaggi
+CMS_HOME=Home
+CMS_ERROR=Errore
+CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione
+CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo
+CMS_SELECT_ACTION=Seleziona l\'azione
+CMS_BROWSING=Navigazione
+CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato
+CMS_INTRODUCTION=Introduzione
+CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra
+CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet,
+CMS_CLICK_HERE=clicca qui
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -27,7 +27,7 @@
<table>
<tr>
<td valign="bottom">
- Destination:
+ ${n:i18n("CMS_DESTINATION")}:
</td>
<td>
<input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -119,7 +119,7 @@
<input
type="text" name="filename"
class="portlet-form-input-field"/>
- : Required
+ : ${n:i18n("CMS_REQUIRED")}
</td>
</tr>
<tr>
@@ -195,11 +195,7 @@
<tr>
<td class="portlet-section-alternate">
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the
- preview button in the editor.
+ alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}.
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -147,14 +147,7 @@
<td class="portlet-section-alternate">
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif"
border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an
- image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking
- on
- the
- preview button in the editor.
+ alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}.
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -20,8 +20,8 @@
<table width="100%">
<tr>
<td align="center">
- Your export of <b><%= sCurrPath %>
- </b> is ready for download.
+ ${n:i18n("CMS_YOUR_EXPORT_0")} <b><%= sCurrPath %>
+ </b> ${n:i18n("CMS_YOUR_EXPORT_1")}.
</td>
</tr>
<tr>
@@ -32,7 +32,7 @@
<a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif"
alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/>
- <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a>
+ <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">${n:i18n("CMS_CLICK_TO_DOWNLOAD")}</a>
<br/>
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}"
name="cancel"
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -19,7 +19,7 @@
<td align="left">
<table width="100%">
<tr>
- <td align="center"><font color="red">ERROR processing export request!</font></td>
+ <td align="center"><font color="red">${n:i18n("CMS_ERROR_PROCESSING")}!</font></td>
</tr>
<tr>
<td align="center"><input class="portlet-form-button" type="button"
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -40,7 +40,7 @@
<img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0"
alt="Expand"/></a>
-<a href="javascript:fillform('/')">Root Folder</a><br>
+<a href="javascript:fillform('/')">${n:i18n("CMS_ROOT_FOLDER")}</a><br>
<%
String sNavPath = (String)request.getAttribute("navpath");
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -21,6 +21,7 @@
String createDate = "";
String modifiedDate = "";
Boolean manageWorkflowAccessible = (Boolean)request.getAttribute("manageWorkflowAccessible");
+ List messages = (List)request.getAttribute("messages");
%>
<div class="admin-ui">
@@ -31,12 +32,29 @@
<div class="cms-tab-container">
+<!-- Displaying any messages that may have occurred during this request -->
+<%if(messages != null && !messages.isEmpty()){%>
+<table width="100%">
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th>
+ <%for(int i=0; i<messages.size(); i++){%>
+ <tr colspan="2" align="center">
+ <td colspan="2">
+ <font color="red">
+ <%=(String)messages.get(i)%>
+ </font>
+ </td>
+ </tr>
+ <%}%>
+</table>
+<br/><br/>
+<%}%>
+
<!-- Currently browsing -->
<ul class="objectpath">
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -319,4 +337,4 @@
%>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -30,7 +30,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -72,7 +72,7 @@
{
%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -87,7 +87,7 @@
<%}%>
<!-- the table listing the pending queue items -->
-<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
+<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div>
<br/>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -24,7 +24,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
</ul>
<br/>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -50,7 +50,7 @@
%>
<tr>
<td colspan="2">
- <font class="portlet-font">Configure security restrictions on node: <%= sCurrPath %>
+ <font class="portlet-font">${n:i18n("CMS_CONFIGURE_RESTRICTION")}: <%= sCurrPath %>
</font>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -57,7 +57,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -109,7 +109,7 @@
<div class="menu">
<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">Select Action...</option>
+ <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
@@ -349,7 +349,7 @@
{
%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -363,7 +363,7 @@
onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
-<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
+<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div>
<br/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -25,7 +25,7 @@
%>
<!-- Currently browsing -->
-Browsing: <a href="<%= url %>">Home</a>
+${n:i18n("CMS_BROWSING")}: <a href="<%= url %>">${n:i18n("CMS_HOME")}</a>
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -138,7 +138,7 @@
</p>
<%}else{%>
<p class="portlet-font">
- Content could not be found for the selected file
+ ${n:i18n("CMS_CONTENT_NOT_FOUND")}
</p>
<%}%>
<%
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-30 10:05:05 UTC (rev 10855)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-30 10:26:19 UTC (rev 10856)
@@ -7,11 +7,9 @@
<h2>CMS Portlet - Help</h2>
-<h2>Introduction</h2>
+<h2>${n:i18n("CMS_INTRODUCTION")}</h2>
-<p class="portlet-font">The CMS Portlet displays content from the file store inside a portlet window, or, in the case of
- binary content, outside of the portlet
- window altogether.</p>
+<p class="portlet-font">${n:i18n("CMS_HELP")}.</p>
-<p class="portlet-font">To modify how this portlet behaves, please
- <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">click here.</a></p>
+<p class="portlet-font">${n:i18n("CMS_TO_MODIFY")}
+ <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">${n:i18n("CMS_CLICK_HERE")}.</a></p>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10855 - in branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF: jsp/content and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 06:05:05 -0400 (Fri, 30 May 2008)
New Revision: 10855
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/portlet.xml
Log:
i18n the content selector
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-30 09:20:48 UTC (rev 10854)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-30 10:05:05 UTC (rev 10855)
@@ -1,3 +1,4 @@
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ page import="org.jboss.portal.common.i18n.LocalizedString" %>
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
@@ -4,19 +5,20 @@
<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %>
<%@ page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
-<%@ page language="java" %>
+<%@ page import="org.jboss.portal.portlet.Portlet" %>
+<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %>
+<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %>
+<%@ page import="org.jboss.portal.portlet.info.PortletInfo" %>
+<%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Locale" %>
+
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%
Collection instances = (Collection)request.getAttribute("INSTANCES");
Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
-<%@page import="org.jboss.portal.portlet.Portlet" %>
-<%@page import="org.jboss.portal.portlet.PortletInvokerException" %>
-<%@page import="org.jboss.portal.portlet.info.MetaInfo" %>
-<%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
-<%@ page import="java.util.Collection" %>
-<%@ page import="java.util.Locale" %>
<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 +64,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();
@@ -95,10 +97,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>
</td>
@@ -150,22 +152,22 @@
</div>
</div>
</div>
- <tr class="<%= rowClass %>">
- <td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <tr class="<%= rowClass %>">
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
<span
onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
id="portlet-instance-link"><%= displayName %>
</a></span>
</td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- </td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+ </div>
+ </td>
</tr>
</table>
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-30 09:20:48 UTC (rev 10854)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-05-30 10:05:05 UTC (rev 10855)
@@ -37,6 +37,7 @@
<portlet-mode>VIEW</portlet-mode>
<portlet-mode>EDIT_CONTENT</portlet-mode>
</supports>
+ <resource-bundle>Resource</resource-bundle>
<portlet-info>
<title>Portlet Content Portlet</title>
<keywords>management,admin</keywords>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10854 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 05:20:48 -0400 (Fri, 30 May 2008)
New Revision: 10854
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet.xml
Log:
- Fix portlet_editor i18n (Resource bundle definition was missing)
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-05-30 08:40:45 UTC (rev 10853)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-05-30 09:20:48 UTC (rev 10854)
@@ -120,6 +120,7 @@
<portlet-mode>VIEW</portlet-mode>
<portlet-mode>EDIT_CONTENT</portlet-mode>
</supports>
+ <resource-bundle>Resource</resource-bundle>
<portlet-info>
<title>Portlet Content Portlet</title>
<keywords>management,admin</keywords>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10853 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-30 04:40:45 -0400 (Fri, 30 May 2008)
New Revision: 10853
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- Fix portlet_editor i18n
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-29 22:26:49 UTC (rev 10852)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-30 08:40:45 UTC (rev 10853)
@@ -1,3 +1,4 @@
+<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ page import="org.jboss.portal.common.i18n.LocalizedString" %>
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
@@ -4,20 +5,20 @@
<%@ page import="org.jboss.portal.core.portlet.info.CorePortletInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %>
-<%@ page language="java" %>
+<%@ page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
+<%@ page import="org.jboss.portal.portlet.Portlet" %>
+<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %>
+<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %>
+<%@ page import="org.jboss.portal.portlet.info.PortletInfo" %>
+<%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Locale" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%
Collection instances = (Collection)request.getAttribute("INSTANCES");
Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
-<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
-<%@page import="org.jboss.portal.portlet.Portlet" %>
-<%@page import="org.jboss.portal.portlet.PortletInvokerException" %>
-<%@page import="org.jboss.portal.portlet.info.MetaInfo" %>
-<%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
-<%@ page import="java.util.Collection" %>
-<%@ page import="java.util.Locale" %>
<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>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10852 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 18:26:49 -0400 (Thu, 29 May 2008)
New Revision: 10852
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- Fixed improper revert that resulted in lost changes and incorrect markup.
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 20:28:17 UTC (rev 10851)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 22:26:49 UTC (rev 10852)
@@ -150,22 +150,15 @@
</div>
</div>
</div>
- <div class="content">
- <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
- </div>
- <div><span class="portlet-form-field-label">Portlet description:</span>
- <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
- </div>
- </div>
- </div>
- </div>
-
<tr class="<%= rowClass %>">
<td>
<img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
- <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
- href="<%= url %>" id="portlet-instance-link"><%= displayName %>
- </a></span></td>
+ <span
+ onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
+ id="portlet-instance-link"><%= displayName %>
+ </a></span>
+ </td>
</tr>
<%
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10851 - in branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates: lostPassword and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-29 16:28:17 -0400 (Thu, 29 May 2008)
New Revision: 10851
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
Log:
added italian templates for internationalization
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl 2008-05-29 20:28:17 UTC (rev 10851)
@@ -0,0 +1,9 @@
+Ciao,
+
+Hai provato a cambiare il tuo indirizzo e-mail su ${emailDomain}
+
+Segui questo link per verificare il nuovo indirizzo:
+${activationLink}
+
+Saluti,
+${emailDomain}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/changeEmail/emailTemplate_it.tpl
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl 2008-05-29 20:28:17 UTC (rev 10851)
@@ -0,0 +1,12 @@
+Ciao,
+
+abbiamo ricevuto la tua richiesta di resettare la password su ${emailDomain}.
+
+Ti mandiamo le informazioni per l'utenza:
+Username: ${username}
+Password: ${password}
+
+E' raccomandato che modifichi la password dopo il prossimo login.
+
+Saluti,
+${emailDomain}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/lostPassword/emailTemplate_it.tpl
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl 2008-05-29 20:28:17 UTC (rev 10851)
@@ -0,0 +1,15 @@
+Ciao,
+
+hai provato a creare un account su ${emailDomain}
+
+Ti mandiamo le informazioni per l'utenza:
+Username: ${username}
+Password: ${password}
+
+L'account non è ancora abilitato. Hai bisogno di accedere a questo url per abilitare l'account.
+${activationLink}
+
+Se non hai richiesto alcuna creazione, puoi ignorare il messaggio.
+
+Best regards,
+${emailDomain}
Property changes on: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/templates/register/emailTemplate_it.tpl
___________________________________________________________________
Name: svn:executable
+ *
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10850 - in branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms and 2 other directories.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2008-05-29 16:21:23 -0400 (Thu, 29 May 2008)
New Revision: 10850
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
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/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
Log:
internationalization updates
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-05-29 20:21:23 UTC (rev 10850)
@@ -99,4 +99,24 @@
CMS_EMPTY_FOLDER=This folder is empty.
CMS_ERROR_UPLOADARCHIVE_ASYNC=An error occurred while processing your archive. Please try again with 'Asynchronous Processing' activated
-CMS_MSG_UPLOADARCHIVE_ASYNC=Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished
\ No newline at end of file
+CMS_MSG_UPLOADARCHIVE_ASYNC=Your archive has been accepted for processing. The resources will appear in your Folder once the processing is finished
+
+CMS_REQUIRED=Required
+CMS_LINK_TO_RESOURCES=Links to resources within this portal should be absolute. For example: A link to an image located in default/images/back.gif should be typed in exactly as shown here. Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the preview button in the editor
+CMS_ERROR_PROCESSING=ERROR processing export request
+CMS_YOUR_EXPORT_0=Your export of
+CMS_YOUR_EXPORT_1=is ready for download
+CMS_CLICK_TO_DOWNLOAD=Click to Download
+CMS_ROOT_FOLDER=Root Folder
+CMS_MESSAGES=Messages
+CMS_HOME=Home
+CMS_ERROR=Error
+CMS_PENDING_APPROVAL_QUEUE=Pending Approval Queue
+CMS_CONFIGURE_RESTRICTION=Configure security restrictions on node
+CMS_SELECT_ACTION=Select Action
+CMS_BROWSING=Browsing
+CMS_CONTENT_NOT_FOUND=Content could not be found for the selected file
+CMS_INTRODUCTION=Introduction
+CMS_HELP=The CMS Portlet displays content from the file store inside a portlet window, or, in the case of binary content, outside of the portlet window altogether
+CMS_TO_MODIFY=To modify how this portlet behaves, please
+CMS_CLICK_HERE=click here
\ No newline at end of file
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-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2008-05-29 20:21:23 UTC (rev 10850)
@@ -100,4 +100,23 @@
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
+
+CMS_REQUIRED=Obbligatorio
+CMS_LINK_TO_RESOURCES=I link alle risorse all\'interno del portale devono essere assoluti. Per esempio: Un link a un\'immagine che si trova in in default/images/back.gif deve essere digitato esattamente come mostrato. Non iniziare mai il percorso con uno (/). Puoi verificare la correttezza del link cliccando sul bottone di anteprima dell1'editor
+CMS_ERROR_PROCESSING=ERRORE nel processare l\'esportazione
+CMS_YOUR_EXPORT_0=L\'esportazione di
+CMS_YOUR_EXPORT_1=\u00e8 pronta per il Download
+CMS_CLICK_TO_DOWNLOAD=Clicca per il Download
+CMS_ROOT_FOLDER=Cartella principale
+CMS_MESSAGES=Messaggi
+CMS_HOME=Home
+CMS_ERROR=Errore
+CMS_PENDING_APPROVAL_QUEUE=Coda in attesa di approvazione
+CMS_CONFIGURE_RESTRICTION=Configura le restrizioni di sicurezza sul nodo
+CMS_SELECT_ACTION=Seleziona l\'azione
+CMS_BROWSING=Navigazione
+CMS_CONTENT_NOT_FOUND=Non ci sono contenuti per il file selezionato
+CMS_INTRODUCTION=Introduzione
+CMS_HELP=La Portlet CMS visualizza e salva i contenuti di un file da dentro la finestra di una Portlet, o, nel caso di un contenuto binario, fuori della finestra
+CMS_TO_MODIFY=Per modificare il comportamento di questa Portlet,
+CMS_CLICK_HERE=clicca qui
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -27,7 +27,7 @@
<table>
<tr>
<td valign="bottom">
- Destination:
+ ${n:i18n("CMS_DESTINATION")}:
</td>
<td>
<input DISABLED type="text" size="40" name="showdestination" value="<%= sCurrPath %>"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -119,7 +119,7 @@
<input
type="text" name="filename"
class="portlet-form-input-field"/>
- : Required
+ : ${n:i18n("CMS_REQUIRED")}
</td>
</tr>
<tr>
@@ -195,11 +195,7 @@
<tr>
<td class="portlet-section-alternate">
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif" border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking on the
- preview button in the editor.
+ alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}.
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -147,14 +147,7 @@
<td class="portlet-section-alternate">
<img src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/info.gif"
border="0"
- alt="Info"> Links to resources within this portal should be absolute. For example: A link to an
- image
- located in default/images/back.gif
- should be typed in exactly as shown here.
- Do not prefix a slash (/) to the path of the resource. You can verify the link is correct by clicking
- on
- the
- preview button in the editor.
+ alt="Info"> ${n:i18n("CMS_LINK_TO_RESOURCES")}.
</td>
</tr>
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -20,8 +20,8 @@
<table width="100%">
<tr>
<td align="center">
- Your export of <b><%= sCurrPath %>
- </b> is ready for download.
+ ${n:i18n("CMS_YOUR_EXPORT_0")} <b><%= sCurrPath %>
+ </b> ${n:i18n("CMS_YOUR_EXPORT_1")}.
</td>
</tr>
<tr>
@@ -32,7 +32,7 @@
<a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank"><img
src="<%= renderRequest.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH%>/export_pickup.gif"
alt="${n:i18n("CMS_DELETE")}" border="0"></a><br/>
- <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">Click to Download</a>
+ <a href="<%= request.getContextPath() %>/cmsexport?og" target="_blank">${n:i18n("CMS_CLICK_TO_DOWNLOAD")}</a>
<br/>
<input class="portlet-form-button" type="button" value="${n:i18n("CMS_BACKTOBROWSER")}"
name="cancel"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive_pickup_error.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -19,7 +19,7 @@
<td align="left">
<table width="100%">
<tr>
- <td align="center"><font color="red">ERROR processing export request!</font></td>
+ <td align="center"><font color="red">${n:i18n("CMS_ERROR_PROCESSING")}!</font></td>
</tr>
<tr>
<td align="center"><input class="portlet-form-button" type="button"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -40,7 +40,7 @@
<img src="<%= request.getContextPath() + CMSAdminConstants.DEFAULT_IMAGES_PATH %>/plus.gif" border="0"
alt="Expand"/></a>
-<a href="javascript:fillform('/')">Root Folder</a><br>
+<a href="javascript:fillform('/')">${n:i18n("CMS_ROOT_FOLDER")}</a><br>
<%
String sNavPath = (String)request.getAttribute("navpath");
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/main.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -35,7 +35,7 @@
<!-- Displaying any messages that may have occurred during this request -->
<%if(messages != null && !messages.isEmpty()){%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Messages:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_MESSAGES")}:</h3></th>
<%for(int i=0; i<messages.size(); i++){%>
<tr colspan="2" align="center">
<td colspan="2">
@@ -54,7 +54,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -30,7 +30,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -72,7 +72,7 @@
{
%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -87,7 +87,7 @@
<%}%>
<!-- the table listing the pending queue items -->
-<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
+<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/searchResults.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -24,7 +24,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
</ul>
<br/>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -50,7 +50,7 @@
%>
<tr>
<td colspan="2">
- <font class="portlet-font">Configure security restrictions on node: <%= sCurrPath %>
+ <font class="portlet-font">${n:i18n("CMS_CONFIGURE_RESTRICTION")}: <%= sCurrPath %>
</font>
</td>
</tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -57,7 +57,7 @@
<li class="pathItem"><a href="<portlet:renderURL>
<portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/>
<portlet:param name="path" value="/"/>
- </portlet:renderURL>">Home</a></li>
+ </portlet:renderURL>">${n:i18n("CMS_HOME")}</a></li>
<%
@@ -109,7 +109,7 @@
<div class="menu">
<select onchange="window.open(this.options[this.selectedIndex].value,'_top')">
- <option value="">Select Action...</option>
+ <option value="">${n:i18n("CMS_SELECT_ACTION")}...</option>
<%
if (sType.equals("text/html") || sType.equals("text/plain"))
{
@@ -349,7 +349,7 @@
{
%>
<table width="100%">
- <th colspan="2"><h3 class="sectionTitle-blue">Error:</h3></th>
+ <th colspan="2"><h3 class="sectionTitle-blue">${n:i18n("CMS_ERROR")}:</h3></th>
<tr colspan="2" align="center">
<td colspan="2">
<font color="red">
@@ -363,7 +363,7 @@
onclick="window.location='<portlet:renderURL><portlet:param name="op" value="<%= CMSAdminConstants.OP_MAIN %>"/><portlet:param name="path" value="/"/></portlet:renderURL>'">
<%}%>
-<div align="center"><font class="portlet-font-dim"><b>Pending Approval Queue</b></font></div>
+<div align="center"><font class="portlet-font-dim"><b>${n:i18n("CMS_PENDING_APPROVAL_QUEUE")}</b></font></div>
<br/>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -25,7 +25,7 @@
%>
<!-- Currently browsing -->
-Browsing: <a href="<%= url %>">Home</a>
+${n:i18n("CMS_BROWSING")}: <a href="<%= url %>">${n:i18n("CMS_HOME")}</a>
<%
StringTokenizer parser = new StringTokenizer(sCurrPath, "/");
String sPathBuilder = "";
@@ -138,7 +138,7 @@
</p>
<%}else{%>
<p class="portlet-font">
- Content could not be found for the selected file
+ ${n:i18n("CMS_CONTENT_NOT_FOUND")}
</p>
<%}%>
<%
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-29 15:28:38 UTC (rev 10849)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/help.jsp 2008-05-29 20:21:23 UTC (rev 10850)
@@ -7,11 +7,9 @@
<h2>CMS Portlet - Help</h2>
-<h2>Introduction</h2>
+<h2>${n:i18n("CMS_INTRODUCTION")}</h2>
-<p class="portlet-font">The CMS Portlet displays content from the file store inside a portlet window, or, in the case of
- binary content, outside of the portlet
- window altogether.</p>
+<p class="portlet-font">${n:i18n("CMS_HELP")}.</p>
-<p class="portlet-font">To modify how this portlet behaves, please
- <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">click here.</a></p>
+<p class="portlet-font">${n:i18n("CMS_TO_MODIFY")}
+ <a href="<portlet:renderURL portletMode="edit"></portlet:renderURL>">${n:i18n("CMS_CLICK_HERE")}.</a></p>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10849 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 11:28:38 -0400 (Thu, 29 May 2008)
New Revision: 10849
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
Rolling back i18n of this file so that Chris can work
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 15:24:39 UTC (rev 10848)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 15:28:38 UTC (rev 10849)
@@ -17,7 +17,6 @@
<%@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>
@@ -63,7 +62,7 @@
<table style="width:500px;">
<tr>
- <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td>
+ <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
</tr>
<%
Locale locale = renderRequest.getLocale();
@@ -96,10 +95,10 @@
<span><%= displayName %></span>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
+ <span class="portlet-form-field-label">Portlet description:</span>
<%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</td>
@@ -151,22 +150,29 @@
</div>
</div>
</div>
- <tr class="<%= rowClass %>">
- <td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
- <span
- onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
- href="javascript:void(0);" onclick="submitForm('<%= url %>');return false"
- id="portlet-instance-link"><%= displayName %>
- </a></span>
- </td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- </td>
+ <div class="content">
+ <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ </div>
+ <div><span class="portlet-form-field-label">Portlet description:</span>
+ <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <tr class="<%= rowClass %>">
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ href="<%= url %>" id="portlet-instance-link"><%= displayName %>
+ </a></span></td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+ </div>
+ </td>
</tr>
</table>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10848 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 11:24:39 -0400 (Thu, 29 May 2008)
New Revision: 10848
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
Rolling back i18n of this file so that Chris can work
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-29 15:23:26 UTC (rev 10847)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-05-29 15:24:39 UTC (rev 10848)
@@ -18,7 +18,6 @@
<%@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>
@@ -34,7 +33,7 @@
<table style="width:500px;">
<tr>
- <td><h3 class="sectionTitle tenpx-top-bottom">${n:i18n("PORTLET_INSTANCE_ASSOCIATED")}:</h3></td>
+ <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
</tr>
<%
Locale locale = renderRequest.getLocale();
@@ -70,10 +69,10 @@
<span><%= displayName %></span>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
+ <span class="portlet-form-field-label">Portlet description:</span>
<%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
@@ -119,9 +118,9 @@
</div>
</div>
<div class="content">
- <div><span class="portlet-form-field-label">${n:i18n("PORTLET_NAME")}:</span><%= displayName %>
+ <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
- <div><span class="portlet-form-field-label">${n:i18n("PORTLET_DESCRIPTION")}:</span>
+ <div><span class="portlet-form-field-label">Portlet description:</span>
<%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</div>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10847 - in branches/JBoss_Portal_Branch_2_6: core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 11:23:26 -0400 (Thu, 29 May 2008)
New Revision: 10847
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/objectNavigation.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
Log:
- Fixed some issues with EL.
- Minor WSRP i18n update.
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-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2008-05-29 15:23:26 UTC (rev 10847)
@@ -1,10 +1,11 @@
<ui:composition 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"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ 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" />
+<f:loadBundle basename="Resource" var="bundle"/>
+
<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div>
<div class="portlet-area-body">
@@ -24,28 +25,29 @@
<h:form>
<!-- defines layout of property form -->
<table>
- <tbody>
+ <tbody>
<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">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
- </td>
- </tr>
- <tr>
- <td>
- <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
- <f:selectItems value="#{properties.propertyItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td align="center">#{bundle.COMMON_OR}</td>
- </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty"
+ styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
+ <f:selectItems value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <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">
- #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
+ #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
</td>
</tr>
<tr>
@@ -57,7 +59,8 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_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>
@@ -80,7 +83,8 @@
<h:form>
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width"
+ <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">#{bundle.COMMON_NAME}</f:facet>
@@ -92,7 +96,7 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet>
- <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText>
+ <h:outputText>#{prop.inherited ? bundle.COMMON_YES : bundle.COMMON_NO}</h:outputText>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_VALUE}</f:facet>
@@ -132,7 +136,8 @@
</h:dataTable>
<!-- ends property list -->
- <h:commandButton value="#{bundle.COMMON_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/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-29 15:23:26 UTC (rev 10847)
@@ -1,11 +1,11 @@
<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"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common"
- xmlns:c="http://java.sun.com/jstl/core">
+ 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"
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
<f:loadBundle basename="Resource" var="bundle"/>
@@ -42,7 +42,7 @@
#{bundle.THEME}
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template')}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}">
| <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
@@ -50,7 +50,7 @@
</h:commandLink>
</h:panelGroup>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
| <h:commandLink action="confirm" styleClass="actionDelete"
actionListener="#{portalobjectmgr.selectDeletingObject}">
<f:param name="id" value="#{object.id}"/>
@@ -129,7 +129,7 @@
<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
<h3 class="sectionTitle">#{bundle.MANAGE_WINDOWS_WITHIN} <span
- class="objectName">#{portalobjectmgr.selectedObject.name}</span>
+ class="objectName">#{portalobjectmgr.selectedObject.name}</span>
#{portalobjectmgr.selectedObject.typeName}</h3>
<ui:param name="maximizedStateExists" value="#{portalobjectmgr.selectedObject.maximizedStateExists}"/>
@@ -144,18 +144,18 @@
</f:facet>
<h:graphicImage
- 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=""/>
+ 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' ? '#{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"
- alt=""/>
+ 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"
+ alt=""/>
<!-- disable edit window for content type widget until JBPORTAL-1561 is fixed -->
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 15:23:26 UTC (rev 10847)
@@ -32,4 +32,4 @@
path_consumers_consumer = Consumer ''{0}'' configuration
path_consumers_active = active
path_consumers_inactive = inactive
-path_consumers_refreshNeeded = refresh needed
+path_consumers_refreshNeeded = (refresh needed)
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 15:23:26 UTC (rev 10847)
@@ -32,4 +32,4 @@
path_consumers_consumer = Configuration du consommateur ''{0}''
path_consumers_active = actif
path_consumers_inactive = inactif
-path_consumers_refreshNeeded = rafra\u00eechissement requis
+path_consumers_refreshNeeded = (rafra\u00eechissement requis)
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 15:23:26 UTC (rev 10847)
@@ -10,7 +10,7 @@
<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="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
@@ -28,9 +28,8 @@
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
<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}"/>)
+ </h:outputFormat> (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
</li>
</c:if>
</ul>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10846 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/jsf/common and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 11:20:44 -0400 (Thu, 29 May 2008)
New Revision: 10846
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/objectNavigation.xhtml
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
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
Log:
- Fixed some EL errors.
- Minor modification to WSRP i18n.
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 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editProperties.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
@@ -1,10 +1,11 @@
<ui:composition 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"
- xmlns:c="http://java.sun.com/jstl/core">
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ 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" />
+<f:loadBundle basename="Resource" var="bundle"/>
+
<div class="portlet-area-header">#{bundle.COMMON_PROPERTIES}</div>
<div class="portlet-area-body">
@@ -24,28 +25,29 @@
<h:form>
<!-- defines layout of property form -->
<table>
- <tbody>
+ <tbody>
<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">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
- </td>
- </tr>
- <tr>
- <td>
- <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
- <f:selectItems value="#{properties.propertyItems}"/>
- </h:selectOneMenu>
- </td>
- </tr>
- <tr>
- <td align="center">#{bundle.COMMON_OR}</td>
- </tr>
+ <tr>
+ <td class="portlet-form-field-label">
+ <h:outputLabel for="predefinedProperty"
+ styleClass="portlet-form-field-label">#{bundle.COMMON_SELECT_PREDEFINED_PROPERTY}:</h:outputLabel>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:selectOneMenu id="predefinedProperty" value="#{properties.action.selectedProperty}">
+ <f:selectItems value="#{properties.propertyItems}"/>
+ </h:selectOneMenu>
+ </td>
+ </tr>
+ <tr>
+ <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">
- #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
+ #{bundle.COMMON_ENTER_PROPERTY_NAME}:</h:outputLabel>
</td>
</tr>
<tr>
@@ -57,7 +59,8 @@
</tbody>
</table>
<!-- ends layout of property form -->
- <h:commandButton value="#{bundle.COMMON_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>
@@ -80,7 +83,8 @@
<h:form>
<!-- defines layout of property table -->
- <h:dataTable value="#{properties.entries}" width="100%" headerClass="portlet-section-header" styleClass="datatable full-width"
+ <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">#{bundle.COMMON_NAME}</f:facet>
@@ -92,7 +96,7 @@
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_INHERITED}</f:facet>
- <h:outputText>#{prop.inherited ? '#{bundle.COMMON_YES}' : '#{bundle.COMMON_NO}'}</h:outputText>
+ <h:outputText>#{prop.inherited ? bundle.COMMON_YES : bundle.COMMON_NO}</h:outputText>
</h:column>
<h:column>
<f:facet name="header">#{bundle.COMMON_VALUE}</f:facet>
@@ -132,7 +136,8 @@
</h:dataTable>
<!-- ends property list -->
- <h:commandButton value="#{bundle.COMMON_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/objectNavigation.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
@@ -1,14 +1,14 @@
<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"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common"
- xmlns:c="http://java.sun.com/jstl/core">
+ 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"
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
<h:form>
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
@@ -42,7 +42,7 @@
#{bundle.THEME}
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template')}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}">
| <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
@@ -50,13 +50,13 @@
</h:commandLink>
</h:panelGroup>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
- actionListener="#{portalobjectmgr.selectDeletingObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.COMMON_DELETE}
- </h:commandLink>
- </h:panelGroup>
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
+ | <h:commandLink action="confirm" styleClass="actionDelete"
+ actionListener="#{portalobjectmgr.selectDeletingObject}">
+ <f:param name="id" value="#{object.id}"/>
+ #{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}"/>
@@ -143,18 +143,18 @@
</f:facet>
<h:graphicImage
- 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=""/>
+ 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' ? '#{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"
- alt=""/>
+ 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"
+ alt=""/>
<!-- disable edit window for content type widget until JBPORTAL-1561 is fixed -->
Modified: 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 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
path_consumers_consumer = Consumer ''{0}'' configuration
path_consumers_active = active
path_consumers_inactive = inactive
-path_consumers_refreshNeeded = refresh needed
+path_consumers_refreshNeeded = (refresh needed)
Modified: 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 2008-05-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 15:20:44 UTC (rev 10846)
@@ -32,4 +32,4 @@
path_consumers_consumer = Configuration du consommateur ''{0}''
path_consumers_active = actif
path_consumers_inactive = inactif
-path_consumers_refreshNeeded = rafra\u00eechissement requis
+path_consumers_refreshNeeded = (rafra\u00eechissement requis)
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-29 14:16:40 UTC (rev 10845)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 15:20:44 UTC (rev 10846)
@@ -10,7 +10,7 @@
<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="#{i18n.nav_tabs_producer_management}" action="management"/></li>
+ <li><h:commandLink value="#{i18n.nav_tabs_producer_management}" action="management"/></li>
</ui:remove>
</ul>
</h:form>
@@ -28,12 +28,11 @@
class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}">
<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}"/>)
+ </h:outputFormat> (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive})
+ #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}
</li>
</c:if>
</ul>
</h:form>
</ui:define>
-</ui:decorate>
\ No newline at end of file
+</ui:decorate>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10845 - branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 10:16:40 -0400 (Thu, 29 May 2008)
New Revision: 10845
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
Log:
- Get the correct Locale from user's profile if available
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:15:15 UTC (rev 10844)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:16:40 UTC (rev 10845)
@@ -42,7 +42,14 @@
import org.jboss.portal.web.ServletContextDispatcher;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestWrapper;
+import javax.servlet.http.HttpServletRequestWrapper;
+
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Locale;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -82,7 +89,21 @@
{
public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
{
- ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
+ HttpServletRequestWrapper request = new HttpServletRequestWrapper(invocation.getServerContext().getClientRequest()) {
+ @Override
+ public Locale getLocale()
+ {
+ return invocation.getRequest().getLocale();
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales()
+ {
+ return null;
+ }
+
+ };
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
rendition.render(markupInfo, dispatcher);
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10844 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 10:15:15 -0400 (Thu, 29 May 2008)
New Revision: 10844
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
Log:
- Get the correct Locale from user's profile if available
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 12:27:50 UTC (rev 10843)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2008-05-29 14:15:15 UTC (rev 10844)
@@ -42,7 +42,14 @@
import org.jboss.portal.web.ServletContextDispatcher;
import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletRequestWrapper;
+import javax.servlet.http.HttpServletRequestWrapper;
+
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Locale;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -82,7 +89,21 @@
{
public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
{
- ServletContextDispatcher dispatcher = new ServletContextDispatcher(invocation.getServerContext().getClientRequest(), invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
+ HttpServletRequestWrapper request = new HttpServletRequestWrapper(invocation.getServerContext().getClientRequest()) {
+ @Override
+ public Locale getLocale()
+ {
+ return invocation.getRequest().getLocale();
+ }
+
+ @Override
+ public Enumeration<Locale> getLocales()
+ {
+ return null;
+ }
+
+ };
+ ServletContextDispatcher dispatcher = new ServletContextDispatcher(request, invocation.getServerContext().getClientResponse(), invocation.getRequest().getServer().getServletContainer());
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
rendition.render(markupInfo, dispatcher);
}
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10843 - in branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war: jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 08:27:50 -0400 (Thu, 29 May 2008)
New Revision: 10843
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml
Log:
minor
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 12:25:36 UTC (rev 10842)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 12:27:50 UTC (rev 10843)
@@ -24,12 +24,13 @@
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
+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
+SAVE=Save
MANAGE=Manage
PORTALS=portals
PORTAL=portal
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 12:25:36 UTC (rev 10842)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 12:27:50 UTC (rev 10843)
@@ -24,12 +24,13 @@
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
+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
+SAVE=Salva
MANAGE=Gestisci
PORTALS=portali
PORTAL=portale
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 12:25:36 UTC (rev 10842)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/confirmDeleteInstance.xhtml 2008-05-29 12:27:50 UTC (rev 10843)
@@ -34,7 +34,7 @@
<span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_CAUSING_REFERENCING_NOT_ABLE}.
</p>
- <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}?</p>
+ <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}</p>
<h:form>
<h:commandButton value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}"
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10842 - in branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF: jsf and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 08:25:36 -0400 (Thu, 29 May 2008)
New Revision: 10842
Modified:
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
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml
Log:
- minor fix
Modified: 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 2008-05-29 12:02:13 UTC (rev 10841)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-05-29 12:25:36 UTC (rev 10842)
@@ -24,12 +24,13 @@
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
+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
+SAVE=Save
MANAGE=Manage
PORTALS=portals
PORTAL=portal
Modified: 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 2008-05-29 12:02:13 UTC (rev 10841)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-05-29 12:25:36 UTC (rev 10842)
@@ -24,12 +24,13 @@
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
+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
+SAVE=Salva
MANAGE=Gestisci
PORTALS=portali
PORTAL=portale
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-29 12:02:13 UTC (rev 10841)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2008-05-29 12:25:36 UTC (rev 10842)
@@ -34,7 +34,7 @@
<span class="objectName">#{instancemgr.selectedInstance.id}</span> #{bundle.PORTLET_CAUSING_REFERENCING_NOT_ABLE}.
</p>
- <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}?</p>
+ <p class="portlet-class">#{bundle.ARE_YOU_SURE_DELETE}</p>
<h:form>
<h:commandButton value="#{bundle.COMMON_DELETE}" action="instances" actionListener="#{instancemgr.deleteInstance}"
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10841 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 08:02:13 -0400 (Thu, 29 May 2008)
New Revision: 10841
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml
Log:
- Fixed obvious problem with i18n. There are more, trickier ones.
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 12:00:17 UTC (rev 10840)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/objectNavigation.xhtml 2008-05-29 12:02:13 UTC (rev 10841)
@@ -128,7 +128,7 @@
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
- <h3 class="sectionTitle">#{bundle.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}"/>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10840 - branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-05-29 08:00:17 -0400 (Thu, 29 May 2008)
New Revision: 10840
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml
Log:
- Fixed obvious issue with i18n. There are more, trickier ones.
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-29 11:20:23 UTC (rev 10839)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2008-05-29 12:00:17 UTC (rev 10840)
@@ -1,14 +1,14 @@
<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"
- xmlns:fn="http://java.sun.com/jsp/jstl/functions"
- xmlns:pfc="http://www.jboss.com/portal/facelet/common"
- xmlns:c="http://java.sun.com/jstl/core">
+ 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"
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common"
+ xmlns:c="http://java.sun.com/jstl/core">
-<f:loadBundle basename="Resource" var="bundle" />
+<f:loadBundle basename="Resource" var="bundle"/>
<h:form>
<c:if test="#{not empty portalobjectmgr.selectedObject.portals}">
@@ -42,7 +42,7 @@
#{bundle.THEME}
</h:commandLink>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template')}">
+ rendered="#{(object.name != 'admin') and (object.name != 'template')}">
| <h:commandLink action="renameObject" actionListener="#{portalobjectmgr.selectObject}"
styleClass="actionRename">
<h:outputText value="#{bundle.RENAME}"/>
@@ -50,13 +50,13 @@
</h:commandLink>
</h:panelGroup>
<h:panelGroup
- rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
- | <h:commandLink action="confirm" styleClass="actionDelete"
- actionListener="#{portalobjectmgr.selectDeletingObject}">
- <f:param name="id" value="#{object.id}"/>
- #{bundle.COMMON_DELETE}
- </h:commandLink>
- </h:panelGroup>
+ rendered="#{(object.name != 'admin') and (object.name != 'template') and (not object.default)}">
+ | <h:commandLink action="confirm" styleClass="actionDelete"
+ actionListener="#{portalobjectmgr.selectDeletingObject}">
+ <f:param name="id" value="#{object.id}"/>
+ #{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}"/>
@@ -128,7 +128,8 @@
</c:if>
<c:if test="#{not empty portalobjectmgr.selectedObject.windows}">
- <h3 class="sectionTitle">#{bundle.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}"/>
@@ -143,18 +144,18 @@
</f:facet>
<h:graphicImage
- 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=""/>
+ 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' ? '#{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"
- alt=""/>
+ 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"
+ alt=""/>
<!-- disable edit window for content type widget until JBPORTAL-1561 is fixed -->
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10839 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 07:20:23 -0400 (Thu, 29 May 2008)
New Revision: 10839
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
Log:
- Removed portlet caching for identity portlets so that language modification is reflected immediately (looked broken)
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-29 11:19:17 UTC (rev 10838)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-29 11:20:23 UTC (rev 10839)
@@ -51,7 +51,6 @@
<name>default-view</name>
<value>/WEB-INF/jsf/index.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -87,7 +86,6 @@
<name>default-view</name>
<value>/WEB-INF/jsf/admin/index.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10838 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 07:19:17 -0400 (Thu, 29 May 2008)
New Revision: 10838
Removed:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/error.jsp
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
- Removed unused error.jsp
Deleted: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/error.jsp 2008-05-29 11:07:00 UTC (rev 10837)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/error.jsp 2008-05-29 11:19:17 UTC (rev 10838)
@@ -1,32 +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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-<!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">
-<head>
-
-</head>
-<body>
- <!--Leaving as stub until release-->
-</body>
-</html>
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 11:07:00 UTC (rev 10837)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2008-05-29 11:19:17 UTC (rev 10838)
@@ -21,6 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
<%@ page pageEncoding="utf-8" %>
+<%@page import="org.jboss.portal.identity.UserStatus"%>
<%@page import="java.util.ResourceBundle"%>
<%
@@ -28,14 +29,7 @@
%>
<!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><%= rb.getString("LOGIN_TITLE") %></title>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10837 - in branches/JBoss_Portal_Branch_2_6: core-identity/src/resources/portal-identity-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 07:07:00 -0400 (Thu, 29 May 2008)
New Revision: 10837
Removed:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
Log:
- Removed unused error.jsp
- Fixed login.jsp
- Removed portlet caching for identity portlets so that language modification is reflected immediately (looked broken)
Deleted: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp 2008-05-29 10:27:17 UTC (rev 10836)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/error.jsp 2008-05-29 11:07:00 UTC (rev 10837)
@@ -1,32 +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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-<!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">
-<head>
-
-</head>
-<body>
- <!--Leaving as stub until release-->
-</body>
-</html>
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-29 10:27:17 UTC (rev 10836)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2008-05-29 11:07:00 UTC (rev 10837)
@@ -21,6 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
<%@ page pageEncoding="utf-8" %>
+<%@page import="org.jboss.portal.identity.UserStatus"%>
<%@page import="java.util.ResourceBundle"%>
<%
@@ -28,14 +29,7 @@
%>
<!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><%= rb.getString("LOGIN_TITLE") %></title>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-29 10:27:17 UTC (rev 10836)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-29 11:07:00 UTC (rev 10837)
@@ -37,7 +37,6 @@
<name>default-view</name>
<value>/WEB-INF/jsf/index.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -73,7 +72,6 @@
<name>default-view</name>
<value>/WEB-INF/jsf/admin/index.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10836 - in branches/JBoss_Portal_Branch_2_6/core-samples/src: resources/portal-jsp-samples-war/WEB-INF/jsp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 06:27:17 -0400 (Thu, 29 May 2008)
New Revision: 10836
Added:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
Removed:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
Log:
- Simple JSP Portlet i18n
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java 2008-05-29 10:23:04 UTC (rev 10835)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java 2008-05-29 10:27:17 UTC (rev 10836)
@@ -26,17 +26,34 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.UnavailableException;
+
import java.io.IOException;
+import java.util.Locale;
-/** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */
+/**
+ * @author <a href="mailto:roy@jboss.org">Roy Russo</a>
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ */
public class JSPPortlet extends GenericPortlet
{
- private static final String JSP_PATH = "/WEB-INF/jsp/jsp";
+ private static final String JSP_PATH = "/WEB-INF/jsp";
protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
{
rResponse.setContentType("text/html");
- javax.portlet.PortletRequestDispatcher pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH + "/view.jsp");
+ Locale locale = rRequest.getLocale();
+
+ javax.portlet.PortletRequestDispatcher pRD = null;
+
+ if (this.getPortletContext().getResource(JSP_PATH + "/view_" + locale.getLanguage() + ".jsp") != null)
+ {
+ pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH + "/view_" + locale.getLanguage() + ".jsp");
+ }
+ else
+ {
+ pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH + "/view.jsp");
+ }
+
pRD.include(rRequest, rResponse);
}
}
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp (from rev 10835, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp 2008-05-29 10:27:17 UTC (rev 10836)
@@ -0,0 +1,64 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ 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" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+ alt="Try the latest release of JBoss Portal, live and online." /></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+ alt="Download JBoss Portal and have it up and running in minutes." /></a>
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+ alt="Download portlets and layouts for your new JBoss Portal installation." /></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <font class="portlet-font">This is a basic installation of <b><%= PortalConstants.VERSION %>
+ </b>. You may
+ log in at any time, using the <i>Login</i> link at the top-right of this page, with the following
+ credentials:</font>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <b>user/user</b> or <b>admin/admin</b>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
+ our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
+ </td>
+ </tr>
+</table>
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp (from rev 10835, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp 2008-05-29 10:27:17 UTC (rev 10836)
@@ -0,0 +1,61 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ 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" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+ alt="Try the latest release of JBoss Portal, live and online." /></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+ alt="Download JBoss Portal and have it up and running in minutes." /></a>
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+ alt="Download portlets and layouts for your new JBoss Portal installation." /></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <font class="portlet-font">Ceci est l'installation par défaut de <b><%= PortalConstants.VERSION %>
+ </b>. Vous pouvez vous connecter en cliquant sur le lien <i>Login</i> en haut à droite de cette page, avec les identifiants suivants:</font>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <b>user/user</b> ou <b>admin/admin</b>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ Si vous avez besoin d'aide pour naviguer, configurer ou pour administrer le portail, veuillez vous référer <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">à la documentation </a>.
+ </td>
+ </tr>
+</table>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10835 - in branches/JBoss_Portal_Branch_2_7/core-samples/src: resources/portal-jsp-samples-war/WEB-INF/jsp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 06:23:04 -0400 (Thu, 29 May 2008)
New Revision: 10835
Added:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
Removed:
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/
Modified:
branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
Log:
- Simple JSP Portlet i18n
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java 2008-05-29 09:43:27 UTC (rev 10834)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java 2008-05-29 10:23:04 UTC (rev 10835)
@@ -26,17 +26,34 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.UnavailableException;
+
import java.io.IOException;
+import java.util.Locale;
-/** @author <a href="mailto:roy@jboss.org">Roy Russo</a> */
+/**
+ * @author <a href="mailto:roy@jboss.org">Roy Russo</a>
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ */
public class JSPPortlet extends GenericPortlet
{
- private static final String JSP_PATH = "/WEB-INF/jsp/jsp";
+ private static final String JSP_PATH = "/WEB-INF/jsp";
protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
{
rResponse.setContentType("text/html");
- javax.portlet.PortletRequestDispatcher pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH + "/view.jsp");
+ Locale locale = rRequest.getLocale();
+
+ javax.portlet.PortletRequestDispatcher pRD = null;
+
+ if (this.getPortletContext().getResource(JSP_PATH + "/view_" + locale.getLanguage() + ".jsp") != null)
+ {
+ pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH + "/view_" + locale.getLanguage() + ".jsp");
+ }
+ else
+ {
+ pRD = this.getPortletContext().getRequestDispatcher(JSP_PATH + "/view.jsp");
+ }
+
pRD.include(rRequest, rResponse);
}
}
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp (from rev 10818, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp)
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view.jsp 2008-05-29 10:23:04 UTC (rev 10835)
@@ -0,0 +1,64 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ 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" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+ alt="Try the latest release of JBoss Portal, live and online." /></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+ alt="Download JBoss Portal and have it up and running in minutes." /></a>
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+ alt="Download portlets and layouts for your new JBoss Portal installation." /></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <font class="portlet-font">This is a basic installation of <b><%= PortalConstants.VERSION %>
+ </b>. You may
+ log in at any time, using the <i>Login</i> link at the top-right of this page, with the following
+ credentials:</font>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <b>user/user</b> or <b>admin/admin</b>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ If you are in need of guidance with regards to navigating, configuring, or operating the portal, please view
+ our <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">online documentation</a>.
+ </td>
+ </tr>
+</table>
Added: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp (rev 0)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/view_fr.jsp 2008-05-29 10:23:04 UTC (rev 10835)
@@ -0,0 +1,61 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
+<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~ 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" %>
+<%@ page isELIgnored="false" %>
+
+<portlet:defineObjects/>
+
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+ <td align="center"><a href="http://portal.demo.jboss.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/dodemo.gif" border="0"
+ alt="Try the latest release of JBoss Portal, live and online." /></a>
+ <a href="http://labs.jboss.com/portal/jbossportal/download/index.html" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/getcode.gif" border="0"
+ alt="Download JBoss Portal and have it up and running in minutes." /></a>
+ <a href="http://www.portletswap.com" target="_blank"><img
+ src="<%= renderRequest.getContextPath() %>/images/accessorize.gif" border="0"
+ alt="Download portlets and layouts for your new JBoss Portal installation." /></a></td>
+ </tr>
+ <tr>
+ <td></td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate">
+ <font class="portlet-font">Ceci est l'installation par défaut de <b><%= PortalConstants.VERSION %>
+ </b>. Vous pouvez vous connecter en cliquant sur le lien <i>Login</i> en haut à droite de cette page, avec les identifiants suivants:</font>
+ </td>
+ </tr>
+ <tr>
+ <td class="portlet-section-alternate" align="center">
+ <b>user/user</b> ou <b>admin/admin</b>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ Si vous avez besoin d'aide pour naviguer, configurer ou pour administrer le portail, veuillez vous référer <a href="http://labs.jboss.com/portal/jbossportal/docs/index.html" target="_blank">à la documentation </a>.
+ </td>
+ </tr>
+</table>
17 years, 7 months
- 1
- 0
JBoss Portal SVN: r10834 - in branches/JBoss_Portal_Branch_2_6: core/src/resources/portal-core-sar/conf/bundles and 20 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-05-29 05:43:27 -0400 (Thu, 29 May 2008)
New Revision: 10834
Added:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties
Removed:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
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-weather-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
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_fr.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-sar/conf/data/default-object.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp
Log:
- Merging Chris' i18n on Branch_2_6
- Adding Russian l10n from Anton in Branch_2_6 ! Thanks !
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/css/login.css 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_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-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -21,14 +21,12 @@
# 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
LOGIN_TITLE=JBoss Portal Login
LOGIN_USERNAME=Username
LOGIN_PASSWORD=Password
LOGIN_CANCEL=Cancel
-LOGIN_SUBMIT=Submit
\ No newline at end of file
+LOGIN_SUBMIT=Submit
Deleted: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_en.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_es.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -21,8 +21,12 @@
# 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
\ No newline at end of file
+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_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-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -22,13 +22,8 @@
################################################################################
# Navigation Portlet
-PAGENAME_default=Home
-PAGENAME_Admin=Amministrazione
-PAGENAME_Test=Test
-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
+LOGIN_SUBMIT=Invia
Copied: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties (from rev 10820, branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/bundles/Resource_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core/src/resources/portal-core-sar/conf/data/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-sar/conf/data/default-object.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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>
Copied: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties (from rev 10820, branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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
+
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-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-server-war/login.jsp 2008-05-29 09:43:27 UTC (rev 10834)
@@ -28,9 +28,17 @@
%>
<!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 {
@@ -58,13 +66,29 @@
<div class="login-container">
+
<div class="login-header">
<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">
Copied: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties (from rev 10820, branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -41,6 +41,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>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -178,4 +178,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_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -292,3 +292,5 @@
IDENTITY_XMMP = Identifiant XMMP
IDENTITY_YIM = Identifiant Yahoo
+
+javax.portlet.title=Utilisateur
Copied: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties (from rev 10820, branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -43,12 +43,10 @@
<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>
- <portlet-info>
- <title>User portlet</title>
- <keywords>management,user</keywords>
- </portlet-info>
+ <resource-bundle>conf.bundles.Identity</resource-bundle>
<portlet-preferences>
<preference>
<!-- Use captcha verification -->
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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>
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes (from rev 10822, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes)
Deleted: branches/JBoss_Portal_Branch_2_6/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 2008-05-27 09:00:03 UTC (rev 10822)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -1,2 +0,0 @@
-javax.portlet.title=Greetings !
-javax.portlet.keywords=sample,test
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties (from rev 10822, branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -0,0 +1,2 @@
+javax.portlet.title=Greetings !
+javax.portlet.keywords=sample,test
\ No newline at end of file
Deleted: branches/JBoss_Portal_Branch_2_6/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 2008-05-27 09:00:03 UTC (rev 10822)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -1,2 +0,0 @@
-javax.portlet.title=Bienvenue !
-javax.portlet.keywords=exemple,test
\ No newline at end of file
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties (from rev 10822, 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_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/classes/Resource_fr.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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>
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties (from rev 10820, 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_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/classes/NewsResource_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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>
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties (from rev 10820, 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_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_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-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -40,6 +40,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>
Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties (from rev 10820, 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_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/classes/WeatherResource_ru.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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>
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes (from rev 10827, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes)
Deleted: branches/JBoss_Portal_Branch_2_6/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 2008-05-27 17:05:45 UTC (rev 10827)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -1,35 +0,0 @@
-################################################################################
-# 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
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties (from rev 10827, branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties)
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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
Deleted: branches/JBoss_Portal_Branch_2_6/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 2008-05-27 17:05:45 UTC (rev 10827)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -1,35 +0,0 @@
-################################################################################
-# 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
Copied: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties (from rev 10827, 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_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/common/template.xhtml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumerTemplate.xhtml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-05-29 09:32:44 UTC (rev 10833)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-05-29 09:43:27 UTC (rev 10834)
@@ -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
17 years, 7 months
- 1
- 0
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>
<!-- TODO: Fix the auto jump in this tag -->
-<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>
<!-- TODO: Fix the auto jump in this tag -->
-<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">
<!-- defines error handeling section -->
<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">
<!-- defines error handeling section -->
<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">
<!-- divide the area body into two panes -->
@@ -15,7 +16,7 @@
<!-- defines property creation section -->
<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>
<!-- ends layout of property form -->
- <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>
<!-- ends property list -->
- <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">
<!-- Common nav -->
+ <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"/>
<!-- Content -->
- <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>
<!-- Portal addition -->
<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>
<!-- Sub page addition -->
<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">
- <!--#{instancemgr.selectedInstance.portlet.info.security}-->
- <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" />
<!-- Common nav -->
<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"/>
<!-- Content -->
- <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">
<!-- Common nav -->
+ <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 @@
<!-- Content -->
<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">
<!-- Common nav -->
+ <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"/>
<!-- Content -->
- <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 @@
<!-- Content -->
<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>
17 years, 7 months
- 1
- 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);
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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">
<!-- defines error handeling section -->
<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">
<!-- defines error handeling section -->
<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">
<!-- divide the area body into two panes -->
@@ -15,7 +16,7 @@
<!-- defines property creation section -->
<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>
<!-- ends layout of property form -->
- <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>
<!-- ends property list -->
- <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">
<!-- Common nav -->
+ <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"/>
<!-- Content -->
- <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>
<!-- Portal addition -->
<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>
<!-- Sub page addition -->
<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" />
<!-- Common nav -->
<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"/>
<!-- Content -->
- <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">
<!-- Common nav -->
+ <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 @@
<!-- Content -->
<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">
<!-- Common nav -->
+ <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"/>
<!-- Content -->
- <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 @@
<!-- Content -->
<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>
17 years, 7 months
- 1
- 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>
<!-- TODO: Fix the auto jump in this tag -->
-<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>
<!-- TODO: Fix the auto jump in this tag -->
-<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>
17 years, 7 months
- 1
- 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:
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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 used to correctly map in IdentityContext registry-->
+ <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 used to correctly map in IdentityContext registry-->
+ <type>UserProfile</type>
+ <implementation>DB</implementation>
+
+ <!--name of service and class for creating mbean-->
+ <service-name>portal:service=Module,type=UserProfile</service-name>
+ <class>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</class>
+
+ <!--set of options that are set in instantiated object-->
+ <config>
+ <option>
+ <name>sessionFactoryJNDIName</name>
+ <value>java:/SessionFactory</value>
+ </option>
+ <option>
+ <name>jNDIName</name>
+ <value>java:/portal/UserProfileModule</value>
+ </option>
+ </config>
+ </module>
+
</modules>
+
+
<options>
<!--Common options section-->
<option-group>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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;
}
}
17 years, 7 months
- 1
- 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
-}
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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"/>
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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"/>
17 years, 7 months
- 1
- 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);
+ }
+
}
17 years, 7 months
- 1
- 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">-->
+
+<!-- This file overrides settings from standardidentity-config.xml.
+ Check default option values that are used there -->
+
<identity-configuration>
<datasources>
<datasource>
@@ -59,17 +63,19 @@
<!--type used to correctly map in IdentityContext registry-->
<type>User</type>
<implementation>LDAP</implementation>
- <class>
+ <!--Use this implementation for more flexible user retrieval-->
+ <!--<class>
org.jboss.portal.identity.ldap.LDAPExtUserModuleImpl
- </class>
+ </class>-->
<config/>
</module>
<module>
<type>Role</type>
<implementation>LDAP</implementation>
- <class>
+ <!--Use this implementation for more flexible user retrieval-->
+ <!--<class>
org.jboss.portal.identity.ldap.LDAPExtRoleModuleImpl
- </class>
+ </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>
+ <!--Uncomment to use with LDAPExtUserModuleImpl-->
+ <!--<option>
<name>userSearchFilter</name>
<value><![CDATA[(&((uid={0})(objectClass=person)))]]></value>
- </option>
+ </option>-->
<option>
<name>roleCtxDN</name>
<value>ou=Roles,o=test,dc=portal,dc=example,dc=com</value>
</option>
- <option>
+ <!--Uncomment to use with LDAPExtRoleModuleImpl-->
+ <!--<option>
<name>roleSearchFilter</name>
<value><![CDATA[(&((cn={0})(objectClass=groupOfNames)))]]></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>
+ <!--<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 @@
<!--
<!DOCTYPE identity-configuration PUBLIC
- "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN"
+ "-//JBoss Portal//DTD JBoss Identity Configuration 1.0//EN"
"http://www.jboss.org/portal/dtd/identity-config_1_0.dtd">
-->
@@ -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>
+ <!--<value>inetUser</value>-->
+ <!--<value>uidObject</value>-->
</option>
<!--Schema requires those to have initial value-->
- <!--<option>
+ <option>
<name>cn</name>
<value>none</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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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 @@
}
}
-
}
-
17 years, 7 months
- 1
- 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);
}
17 years, 7 months
- 1
- 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;
}
}
17 years, 7 months
- 1
- 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>
<!-- Use captcha verification -->
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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 @@
<!-- portal-portlet-samples.war -->
<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();
}
17 years, 7 months
- 1
- 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");
17 years, 7 months
- 1
- 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>
17 years, 7 months
- 1
- 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>
- <!--To configure LDAP support with IdentityLoginModule please check documentation on how to
- configure portal identity modules for this-->
- <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>
+ <!--To configure LDAP support with IdentityLoginModule please check documentation on how to
+ configure portal identity modules for this-->
+ <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
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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>
- <!--
- <value>emailVerification</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>
+ <!-- portal-catalog-samples.war -->
+ <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>
+
<!-- portal-news-samples.war -->
<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 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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 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"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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-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"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!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
+ *
17 years, 7 months
- 1
- 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 @@
<!-- Configure modules -->
<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"/>
17 years, 7 months
- 1
- 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"/>
17 years, 7 months
- 1
- 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);
- }
- }
+ }
+ }
}
17 years, 7 months
- 1
- 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);
17 years, 7 months
- 1
- 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);
+ }
+ }
}
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 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
17 years, 7 months
- 1
- 0