June 2008 - portal-commits - Jboss List Archives

JBoss Portal SVN: r10905 - in branches/JBoss_Portal_Branch_2_7: core-wsrp and 1 other directories.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2008-06-02 15:08:03 -0400 (Mon, 02 Jun 2008) New Revision: 10905 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 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/web.xml Log: Move core-wsrp to portletbridge Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -98,7 +98,6 @@ <path refid="sun.jsf.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="facelets.facelets.classpath"/> <path refid="el.el.classpath"/> <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -95,12 +95,15 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="apache.myfaces.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="facelets.facelets.classpath"/> <path refid="junit.junit.classpath"/> + <path refid="sun.jsf.classpath"/> <path refid="el.el.classpath"/> + <path refid="richfaces.richfaces.classpath"/> + <path refid="facelets.facelets.classpath"/> + <path refid="portlet.portlet.classpath"/> + <path refid="jboss/portlet.bridge.classpath"/> </path>  @@ -200,18 +203,21 @@ <property name="build.wsrp-admin.war" value="${build.resources}/portal-wsrp-admin-war"/>  - <copy todir="${build.wsrp-admin.war}/WEB-INF/lib2"> - <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/> + <copy todir="${build.wsrp-admin.war}/WEB-INF/lib"> + <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/> + <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.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"/> <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.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"/> +  <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> - <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> + <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> +  </copy> <copy todir="${build.wsrp-admin.war}/WEB-INF/lib"> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -28,9 +28,17 @@ <faces-config>  + <application> - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> </application> + <factory> + <faces-context-factory> + org.jboss.portletbridge.context.FacesContextFactoryImpl + </faces-context-factory> + </factory> <converter> <converter-for-class>org.jboss.portal.wsrp.registration.LocalizedString</converter-for-class> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -21,7 +21,7 @@ ~ 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"> + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> <portlet-app> <portlet> <portlet-name>WSRPConfigurationPortlet</portlet-name> @@ -29,6 +29,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> <link rel="stylesheet" type="text/css" href="/style.css" media="screen"/> </header-content> </portlet> 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-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -25,25 +25,29 @@ 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> + <description>Configuration portlet for WSRP.</description> + <portlet-name>WSRPConfigurationPortlet</portlet-name> + <display-name>WSRP Configuration</display-name> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> + <init-param> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> + </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</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 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -27,26 +27,39 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> -  <context-param> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + </context-param> + + <context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> + + <context-param> + <param-name>javax.portlet.faces.preserveActionParams</param-name> <param-value>true</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>false</param-value> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name> - <param-value>false</param-value> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>NONE</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> </context-param>  @@ -69,13 +82,31 @@ <param-value>server</param-value> </context-param> -  + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>FacesServlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class> - <load-on-startup>1</load-on-startup> + <servlet-name>FacesServlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> </servlet> + <servlet-mapping> + <servlet-name>FacesServlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + + </web-app>

17 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r10904 - modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2008-06-02 13:09:40 -0400 (Mon, 02 Jun 2008) New Revision: 10904 Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java Log: improve xml stuff Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java 2008-06-02 13:53:29 UTC (rev 10903) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/xml/XMLTools.java 2008-06-02 17:09:40 UTC (rev 10904) @@ -48,6 +48,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.Set; /** * Utilities for dealing with XML. @@ -429,39 +430,134 @@ */ public static List<Element> getChildren(Element element, String uri, String name) throws IllegalArgumentException { - if (element == null) + return getChildren(element, byName(uri, name)); + } + + /** + * <p>Return all the children of the given node that match the provided filter.</p> + * + * <p>The resulting element collection can be safely modified.</p> + * + * @param node the parent element + * @param filter the filter + * @return a list of elements + * @throws IllegalArgumentException if the element is null + */ + @SuppressWarnings("unchecked") + public static <T extends Node> List<T> getChildren(Node node, Filter<T> filter) throws IllegalArgumentException + { + if (node == null) { - throw new IllegalArgumentException("No element found"); + throw new IllegalArgumentException("No node provided"); } - ArrayList<Element> result = new ArrayList<Element>(); - NodeList list = element.getChildNodes(); + if (filter == null) + { + throw new IllegalArgumentException("No filter provided"); + } + + // + ArrayList result = new ArrayList(); + + // + NodeList list = node.getChildNodes(); for (int i = 0; i < list.getLength(); i++) { - Node node = list.item(i); - if (node.getNodeType() == Node.ELEMENT_NODE) + Node child = list.item(i); + + // + Class<T> nodeType = filter.getNodeClass(); + + // + if (nodeType.isInstance(child)) { - Element childElt = (Element)node; + T typedChild = nodeType.cast(child); // + if (filter.accept(typedChild)) + { + result.add(child); + } + } + } + + // It is fine + return result; + } + + public static interface Filter<N extends Node> + { + + Class<N> getNodeClass(); + + boolean accept(N node); + } + + public static Filter<Element> byName(final String uri, final Set<String> names) + { + return new Filter<Element>() + { + public Class<Element> getNodeClass() + { + return Element.class; + } + + public boolean accept(Element element) + { if (uri == null) { - if (name == null || childElt.getTagName().equals(name)) + if (names.contains(element.getTagName())) { - result.add(childElt); + return true; } } - else if (uri.equals(childElt.getNamespaceURI())) + else if (uri.equals(element.getNamespaceURI())) { - if (name == null || childElt.getLocalName().equals(name)) + if (names.contains(element.getLocalName())) { - result.add(childElt); + return true; } } + + // + return false; } - } - return result; + }; + } + public static Filter<Element> byName(final String uri, final String name) + { + return new Filter<Element>() + { + public Class<Element> getNodeClass() + { + return Element.class; + } + + public boolean accept(Element element) + { + if (uri == null) + { + if (name == null || element.getTagName().equals(name)) + { + return true; + } + } + else if (uri.equals(element.getNamespaceURI())) + { + if (name == null || element.getLocalName().equals(name)) + { + return true; + } + } + + // + return false; + } + }; + + } + public static Properties loadXMLProperties(Element propertiesElt) { if (propertiesElt == null)

17 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r10903 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-02 09:53:29 -0400 (Mon, 02 Jun 2008) New Revision: 10903 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties Log: Encoding issue 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-06-02 13:46:10 UTC (rev 10902) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-06-02 13:53:29 UTC (rev 10903) @@ -236,31 +236,31 @@ WINDOW_CONTENT_TYPE_NAME=Tipo Contenuto WINDOW_CONTENT_TYPE_DESCRIPTION=Il tipo di contenuto di una finestra DEFAULT_CHILD_NAME_NAME=Nome di default del figlio -DEFAULT_CHILD_NAME_DESCRIPTION=Il nome del figlio quando non c'\ufffd un nome specificato +DEFAULT_CHILD_NAME_DESCRIPTION=Il nome del figlio quando non c'\u00e8 un nome specificato PAGE_ORDER_NAME=Ordine Etichetta PAGE_ORDER_DESCRIPTION=Il valore dell'ordine per visualizzare le pagine nelle etichette INITIAL_WINDOW_STATE_NAME=Modalit\u00e0 iniziale -INITIAL_WINDOW_STATE_DESCRIPTION=La modalit\ufffd iniziale della finestra -CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando l'accesso alla finestra \ufffd negato -CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla finestra \ufffd negato -CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando la finestra non \ufffd disponibile -CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando la finestra non \ufffd disponibile -CONTROL_POLICY_PAGE_ERROR_NAME=Quando c'\ufffd un errore sulla finestra -CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando c'\ufffd un errore sulla finestra -CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando c'\ufffd un errore nella finestra -CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando c'\ufffd un errore nella finestra +INITIAL_WINDOW_STATE_DESCRIPTION=La modalit\u00e8 iniziale della finestra +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando l'accesso alla finestra \u00e8 negato +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla finestra \u00e8 negato +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando la finestra non \u00e8 disponibile +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando la finestra non \u00e8 disponibile +CONTROL_POLICY_PAGE_ERROR_NAME=Quando c'\u00e8 un errore sulla finestra +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando c'\u00e8 un errore sulla finestra +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando c'\u00e8 un errore nella finestra +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando c'\u00e8 un errore nella finestra CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando la finestra non viene trovata CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando la finestra non viene trovata CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=In caso di errore redireziona sulla risorsa -CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando l'accesso alla pagina \ufffd negato -CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla pagina \ufffd negato -CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando la pagina non \ufffd disponibile -CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando la pagina non \ufffd disponibile -CONTROL_POLICY_PORTAL_ERROR_NAME=Quando c'\ufffd un errore sulla pagina -CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando c'\ufffd un errore sulla pagina -CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando c'\ufffd un errore nella pagina -CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando c'\ufffd un errore nella pagina +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando l'accesso alla pagina \u00e8 negato +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla pagina \u00e8 negato +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando la pagina non \u00e8 disponibile +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando la pagina non \u00e8 disponibile +CONTROL_POLICY_PORTAL_ERROR_NAME=Quando c'\u00e8 un errore sulla pagina +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando c'\u00e8 un errore sulla pagina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando c'\u00e8 un errore nella pagina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando c'\u00e8 un errore nella pagina CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando la pagina non viene trovata CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando la pagina non viene trovata CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa

17 years, 11 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-02 09:46:10 -0400 (Mon, 02 Jun 2008) New Revision: 10902 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/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: More i18n 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-06-02 13:22:58 UTC (rev 10901) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-06-02 13:46:10 UTC (rev 10902) @@ -22,12 +22,23 @@ package org.jboss.portal.core.admin.ui; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.i18n.SimpleResourceBundleFactory; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.control.ControlConstants; +import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; +import javax.portlet.PortletConfig; +import javax.portlet.PortletRequest; + import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; import java.util.List; +import java.util.Locale; +import java.util.Map; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -37,44 +48,66 @@ { /** . */ - private List portalSelectItems; + private Map<Locale, List<SelectItem>> portalSelectItems; /** . */ - private List pageSelectItems; + private Map<Locale, List<SelectItem>> pageSelectItems; /** . */ + private static final String BUNDLE_BASE_NAME = "Resource"; + + /** . */ 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 LocalizedString DISPLAY_THE_DEFAULT_ERROR_MESSAGE = null; + private static LocalizedString REDIRECT_TO_THE_SPECIFIED_RESOURCE = null; + private static LocalizedString REMOVE_THE_RESOURCE_FROM_PAGE = null; public ControlPropertiesBean(PortalObjectManagerBean pomgr) { this.pomgr = pomgr; + + ResourceBundleManager rbm = new ResourceBundleManager(null, new SimpleResourceBundleFactory(BUNDLE_BASE_NAME, PropertiesInfoBuilder.class.getClassLoader())); + // Load all supported locales + PortletRequest portletRequest = (PortletRequest)(FacesContext.getCurrentInstance().getExternalContext().getRequest()); + Enumeration<Locale> locales = ((PortletConfig)portletRequest.getAttribute("javax.portlet.config")).getSupportedLocales(); + while (locales.hasMoreElements()) + { + Locale locale = locales.nextElement(); + rbm.getResourceBundle(locale); + } + DISPLAY_THE_DEFAULT_ERROR_MESSAGE = rbm.getLocalizedValue("DISPLAY_THE_DEFAULT_ERROR_MESSAGE", "Display the default error message"); + REDIRECT_TO_THE_SPECIFIED_RESOURCE = rbm.getLocalizedValue("REDIRECT_TO_THE_SPECIFIED_RESOURCE", "Redirect to the specified resource"); + REMOVE_THE_RESOURCE_FROM_PAGE = rbm.getLocalizedValue("REMOVE_THE_RESOURCE_FROM_PAGE", "Remove the resource from page"); + portalSelectItems = new HashMap<Locale, List<SelectItem>>(); + pageSelectItems = new HashMap<Locale, List<SelectItem>>(); } - public List getPortalSelectItems() + public List<SelectItem> getPortalSelectItems() { - if (portalSelectItems == null) + Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); + if (portalSelectItems.get(locale) == 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)); + List<SelectItem> list = new ArrayList<SelectItem>(); + list.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getString(locale, true))); + list.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getString(locale, true))); + portalSelectItems.put(locale, list); } - return portalSelectItems; + return portalSelectItems.get(locale); } - public List getPageSelectItems() + public List<SelectItem> getPageSelectItems() { - if (pageSelectItems == null) + Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); + if (pageSelectItems.get(locale) == 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)); + List<SelectItem> list = new ArrayList<SelectItem>(); + list.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getString(locale, true))); + list.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE.getString(locale, true))); + list.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getString(locale, true))); + pageSelectItems.put(locale, list); } - return pageSelectItems; + return pageSelectItems.get(locale); } private ControlPropertyBean grabProperty(String name) 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-06-02 13:22:58 UTC (rev 10901) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-06-02 13:46:10 UTC (rev 10902) @@ -215,6 +215,9 @@ WIZARD_PORTLET_PROVIDER=Portlet provider WIZARD_CHANGE=Change +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Display the default error message +REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redirect to the specified resource +REMOVE_THE_RESOURCE_FROM_PAGE=Remove the resource from page THEME_LAYOUT_ID_NAME=Layout id THEME_LAYOUT_ID_DESCRIPTION=The layout value formats a page 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-06-02 13:22:58 UTC (rev 10901) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-06-02 13:46:10 UTC (rev 10902) @@ -215,6 +215,10 @@ WIZARD_PORTLET_PROVIDER=Fornitore di Portlet WIZARD_CHANGE=Cambia +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Visualizza il messaggio di errore di default +REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redireziona alla risorsa specificata +REMOVE_THE_RESOURCE_FROM_PAGE=Rimuovi la risorsa dalla pagina + THEME_LAYOUT_ID_NAME=Id Layout THEME_LAYOUT_ID_DESCRIPTION=Il valore del layout formatta la pagina THEME_THEME_ID_NAME=Id Tema

17 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r10901 - branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-02 09:22:58 -0400 (Mon, 02 Jun 2008) New Revision: 10901 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml Log: Need to specify Italian support 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-06-02 13:14:43 UTC (rev 10900) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-06-02 13:22:58 UTC (rev 10901) @@ -33,6 +33,11 @@ </view-handler> <message-bundle>Resource</message-bundle> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> + <locale-config> + <default-locale>en</default-locale> + <supported-locale>it</supported-locale> + </locale-config> + </application> <factory> <faces-context-factory>

17 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r10900 - in branches/JBoss_Portal_Branch_2_7/core-admin: src/main/org/jboss/portal/core/admin/ui and 2 other directories.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-02 09:14:43 -0400 (Mon, 02 Jun 2008) New Revision: 10900 Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java Modified: branches/JBoss_Portal_Branch_2_7/core-admin/.classpath 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/PropertyBean.java branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml Log: More i18n Modified: branches/JBoss_Portal_Branch_2_7/core-admin/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/.classpath 2008-06-02 07:37:18 UTC (rev 10899) +++ branches/JBoss_Portal_Branch_2_7/core-admin/.classpath 2008-06-02 13:14:43 UTC (rev 10900) @@ -17,11 +17,12 @@ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar" sourcepath="/module-common"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-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"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/> + <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> 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-06-02 07:37:18 UTC (rev 10899) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2008-06-02 13:14:43 UTC (rev 10900) @@ -44,41 +44,41 @@ // - 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); + public static final PropertyInfo THEME_LAYOUT_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_LAYOUT); + public static final PropertyInfo THEME_THEME_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_THEME); + public static final PropertyInfo THEME_RENDER_SET_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_RENDERSET); + public static final PropertyInfo THEME_RENDER_REGION_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_REGION); + public static final PropertyInfo THEME_RENDER_REGION_ORDER = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_ORDER); // - 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 = PropertiesInfoBuilder.getPropertiesInfo().get(DynaRenderOptions.PARTIAL_REFRESH_ENABLED); + public static final PropertyInfo AJAX_DND = PropertiesInfoBuilder.getPropertiesInfo().get(DynaRenderOptions.DND_ENABLED); // - 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 = PropertiesInfoBuilder.getPropertiesInfo().get(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE); + public static final PropertyInfo DEFAULT_CHILD_NAME = PropertiesInfoBuilder.getPropertiesInfo().get(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME); + public static final PropertyInfo PAGE_ORDER = PropertiesInfoBuilder.getPropertiesInfo().get("order"); + public static final PropertyInfo INITIAL_WINDOW_STATE = PropertiesInfoBuilder.getPropertiesInfo().get(WindowImpl.PORTAL_INITIAL_WINDOW_STATE); // - 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 = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_UNAVAILABLE = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_INTERNAL_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_NOT_FOUND = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_RESOURCE_URI = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY); // - 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 = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_UNAVAILABLE = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_INTERNAL_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_NOT_FOUND = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_RESOURCE_URI = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY); /** . */ Added: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java 2008-06-02 13:14:43 UTC (rev 10900) @@ -0,0 +1,173 @@ +/****************************************************************************** + * 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.admin.ui; + +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import javax.faces.context.FacesContext; +import javax.portlet.PortletConfig; +import javax.portlet.PortletRequest; + +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.i18n.SimpleResourceBundleFactory; +import org.jboss.portal.core.impl.model.portal.WindowImpl; +import org.jboss.portal.core.model.portal.control.ControlConstants; +import org.jboss.portal.theme.ThemeConstants; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PropertiesInfoBuilder +{ + private static Map<String, PropertyInfo> map; + + private static final String BUNDLE_BASE_NAME = "Resource"; + + public static Map<String, PropertyInfo> getPropertiesInfo() + { + if (map == null) + { + map = new HashMap<String, PropertyInfo>(); + + ResourceBundleManager rbm = new ResourceBundleManager(null, new SimpleResourceBundleFactory(BUNDLE_BASE_NAME, PropertiesInfoBuilder.class.getClassLoader())); + + // Load all supported locales + PortletRequest portletRequest = (PortletRequest)(FacesContext.getCurrentInstance().getExternalContext().getRequest()); + Enumeration<Locale> locales = ((PortletConfig)portletRequest.getAttribute("javax.portlet.config")).getSupportedLocales(); + while (locales.hasMoreElements()) + { + Locale locale = locales.nextElement(); + rbm.getResourceBundle(locale); + } + + LocalizedString name = rbm.getLocalizedValue("THEME_LAYOUT_ID_NAME", "Layout id"); + LocalizedString desc = rbm.getLocalizedValue("THEME_LAYOUT_ID_DESCRIPTION", "The layout value formats a page"); + map.put(ThemeConstants.PORTAL_PROP_LAYOUT, new PropertyInfo(ThemeConstants.PORTAL_PROP_LAYOUT, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_THEME_ID_NAME", "Theme id"); + desc = rbm.getLocalizedValue("THEME_THEME_ID_DESCRIPTION", "The theme value skins a page"); + map.put(ThemeConstants.PORTAL_PROP_THEME, new PropertyInfo(ThemeConstants.PORTAL_PROP_THEME, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_RENDER_SET_ID_NAME", "Renderset id"); + desc = rbm.getLocalizedValue("THEME_RENDER_SET_ID_DESCRIPTION", "The render set id"); + map.put(ThemeConstants.PORTAL_PROP_RENDERSET, new PropertyInfo(ThemeConstants.PORTAL_PROP_RENDERSET, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_RENDER_REGION_ID_NAME", "Region id"); + desc = rbm.getLocalizedValue("THEME_RENDER_REGION_ID_DESCRIPTION", "The region that will the window"); + map.put(ThemeConstants.PORTAL_PROP_REGION, new PropertyInfo(ThemeConstants.PORTAL_PROP_REGION, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_RENDER_REGION_ORDER_NAME", "Region order"); + desc = rbm.getLocalizedValue("THEME_RENDER_REGION_ORDER_DESCRIPTION", "The vertical or horizontal order of the window within a region"); + map.put(ThemeConstants.PORTAL_PROP_ORDER, new PropertyInfo(ThemeConstants.PORTAL_PROP_ORDER, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + + name = rbm.getLocalizedValue("AJAX_PARTIAL_REFRESH_NAME", "Partial refresh"); + desc = rbm.getLocalizedValue("AJAX_PARTIAL_REFRESH_DESCRIPTION", "Enable partial refresh for portlets"); + map.put(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, new PropertyInfo(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, name, desc, "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + name = rbm.getLocalizedValue("AJAX_DND_NAME", "Drag and drop"); + desc = rbm.getLocalizedValue("AJAX_DND_DESCRIPTION", "Enable window drag and drop"); + map.put(DynaRenderOptions.DND_ENABLED, new PropertyInfo(DynaRenderOptions.DND_ENABLED, name, desc, "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + + name = rbm.getLocalizedValue("WINDOW_CONTENT_TYPE_NAME", "Content type"); + desc = rbm.getLocalizedValue("WINDOW_CONTENT_TYPE_DESCRIPTION", "The type of content of a window"); + map.put(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, new PropertyInfo(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("DEFAULT_CHILD_NAME_NAME", "Default child name"); + desc = rbm.getLocalizedValue("DEFAULT_CHILD_NAME_DESCRIPTION", "The child name used when no specific child name is explicited"); + map.put(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME, new PropertyInfo(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + name = rbm.getLocalizedValue("TAB_ORDER_NAME", "Tab order"); + desc = rbm.getLocalizedValue("TAB_ORDER_DESCRIPTION", "The order value to display pages in tabs"); + map.put("order", new PropertyInfo("order", name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + + name = rbm.getLocalizedValue("INITIAL_WINDOW_STATE_NAME", "Initial Mode"); + desc = rbm.getLocalizedValue("INITIAL_WINDOW_STATE_DESCRIPTION", "The inital mode of the window"); + map.put(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, new PropertyInfo(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + // + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME", "When access to the window is denied"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION", "When access to the window is denied"); + map.put(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_UNAVAILABLE_NAME", "When the window is unavailable"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION", "When the window is unavailable"); + map.put(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ERROR_NAME", "When there is an error on the window"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ERROR_DESCRIPTION", "When there is an error on the window"); + map.put(ControlConstants.PAGE_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME", "When there is an error within the window"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION", "When there is an error within the window"); + map.put(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_NOT_FOUND_NAME", "When the window is not found"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION", "When the window is not found"); + map.put(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_RESOURCE_URI_NAME", "On error redirect to this resource"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION", "On error redirect to this resource"); + map.put(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + // + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME", "When access to the page is denied"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION", "When access to the page is denied"); + map.put(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME", "When the page is unavailable"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION", "When the page is unavailable"); + map.put(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ERROR_NAME", "When there is an error on the page"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION", "When there is an error on the page"); + map.put(ControlConstants.PORTAL_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME", "When there is an error within the page"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION", "When there is an error within the page"); + map.put(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_NOT_FOUND_NAME", "When the page is not found"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION", "When the page is not found"); + map.put(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME", "On error redirect to this resource"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION", "On error redirect to this resource"); + map.put(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + + } + return map; + } +} + Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2008-06-02 07:37:18 UTC (rev 10899) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2008-06-02 13:14:43 UTC (rev 10900) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import javax.faces.context.FacesContext; + import org.jboss.portal.core.model.portal.PortalObject; /** @@ -74,12 +76,12 @@ public String getDescription() { - return info.getDescription().getDefaultString(); + return info.getDescription().getString(FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(), true); } public String getDisplayName() { - return info.getDisplayName().getDefaultString(); + return info.getDisplayName().getString(FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(), true); } public boolean isInherited() 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-06-02 07:37:18 UTC (rev 10899) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-06-02 13:14:43 UTC (rev 10900) @@ -213,4 +213,52 @@ WIZARD_NEXT=Next WIZARD_SUB_PAGES=Sub-Pages WIZARD_PORTLET_PROVIDER=Portlet provider -WIZARD_CHANGE=Change \ No newline at end of file +WIZARD_CHANGE=Change + + +THEME_LAYOUT_ID_NAME=Layout id +THEME_LAYOUT_ID_DESCRIPTION=The layout value formats a page +THEME_THEME_ID_NAME=Theme id +THEME_THEME_ID_DESCRIPTION=The theme value skins a page +THEME_RENDER_SET_ID_NAME=Renderset id +THEME_RENDER_SET_ID_DESCRIPTION=The render set id +THEME_RENDER_REGION_ID_NAME=Region id +THEME_RENDER_REGION_ID_DESCRIPTION=The region that will the window +THEME_RENDER_REGION_ORDER_NAME=Region order +THEME_RENDER_REGION_ORDER_DESCRIPTION=The vertical or horizontal order of the window within a region +AJAX_PARTIAL_REFRESH_NAME=Partial refresh +AJAX_PARTIAL_REFRESH_DESCRIPTION=Enable partial refresh for portlets +AJAX_DND_NAME=Drag and drop +AJAX_DND_DESCRIPTION=Enable window drag and drop +WINDOW_CONTENT_TYPE_NAME=Content type +WINDOW_CONTENT_TYPE_DESCRIPTION=The type of content of a window +DEFAULT_CHILD_NAME_NAME=Default child name +DEFAULT_CHILD_NAME_DESCRIPTION=The child name used when no specific child name is explicited +TAB_ORDER_NAME=Tab order +TAB_ORDER_DESCRIPTION=The order value to display pages in tabs +INITIAL_WINDOW_STATE_NAME=Initial Mode +INITIAL_WINDOW_STATE_DESCRIPTION=The inital mode of the window +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=When access to the window is denied +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=When access to the window is denied +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=When the window is unavailable +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=When the window is unavailable +CONTROL_POLICY_PAGE_ERROR_NAME=When there is an error on the window +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=When there is an error on the window +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=When there is an error within the window +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=When there is an error within the window +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=When the window is not found +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=When the window is not found +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=On error redirect to this resource +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=On error redirect to this resource +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=When access to the page is denied +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=When access to the page is denied +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=When the page is unavailable +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=When the page is unavailable +CONTROL_POLICY_PORTAL_ERROR_NAME=When there is an error on the page +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=When there is an error on the page +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=When there is an error within the page +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=When there is an error within the page +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=When the page is not found +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=When the page is not found +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=On error redirect to this resource +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=On error redirect to this resource 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-06-02 07:37:18 UTC (rev 10899) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-06-02 13:14:43 UTC (rev 10900) @@ -213,4 +213,51 @@ WIZARD_NEXT=Avanti WIZARD_SUB_PAGES=Sotto-Pagine WIZARD_PORTLET_PROVIDER=Fornitore di Portlet -WIZARD_CHANGE=Cambia \ No newline at end of file +WIZARD_CHANGE=Cambia + +THEME_LAYOUT_ID_NAME=Id Layout +THEME_LAYOUT_ID_DESCRIPTION=Il valore del layout formatta la pagina +THEME_THEME_ID_NAME=Id Tema +THEME_THEME_ID_DESCRIPTION=Il valore del tema copre la pagina +THEME_RENDER_SET_ID_NAME=Id Renderset +THEME_RENDER_SET_ID_DESCRIPTION=L'id del renderset +THEME_RENDER_REGION_ID_NAME=Id Regione +THEME_RENDER_REGION_ID_DESCRIPTION=Regione desiderata per la finestra +THEME_RENDER_REGION_ORDER_NAME=Ordine Regione +THEME_RENDER_REGION_ORDER_DESCRIPTION=L'ordine verticale o orizzontale della finestra dentro una regione +AJAX_PARTIAL_REFRESH_NAME=Aggiornamento parziale +AJAX_PARTIAL_REFRESH_DESCRIPTION=Attiva l'aggiornamento parziale per le portlet +AJAX_DND_NAME=Copia e incolla +AJAX_DND_DESCRIPTION=Attiva il copia e incolla per la finestra +WINDOW_CONTENT_TYPE_NAME=Tipo Contenuto +WINDOW_CONTENT_TYPE_DESCRIPTION=Il tipo di contenuto di una finestra +DEFAULT_CHILD_NAME_NAME=Nome di default del figlio +DEFAULT_CHILD_NAME_DESCRIPTION=Il nome del figlio quando non c'\ufffd un nome specificato +PAGE_ORDER_NAME=Ordine Etichetta +PAGE_ORDER_DESCRIPTION=Il valore dell'ordine per visualizzare le pagine nelle etichette +INITIAL_WINDOW_STATE_NAME=Modalit\u00e0 iniziale +INITIAL_WINDOW_STATE_DESCRIPTION=La modalit\ufffd iniziale della finestra +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando l'accesso alla finestra \ufffd negato +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla finestra \ufffd negato +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando la finestra non \ufffd disponibile +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando la finestra non \ufffd disponibile +CONTROL_POLICY_PAGE_ERROR_NAME=Quando c'\ufffd un errore sulla finestra +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando c'\ufffd un errore sulla finestra +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando c'\ufffd un errore nella finestra +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando c'\ufffd un errore nella finestra +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando la finestra non viene trovata +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando la finestra non viene trovata +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=In caso di errore redireziona sulla risorsa +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando l'accesso alla pagina \ufffd negato +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla pagina \ufffd negato +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando la pagina non \ufffd disponibile +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando la pagina non \ufffd disponibile +CONTROL_POLICY_PORTAL_ERROR_NAME=Quando c'\ufffd un errore sulla pagina +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando c'\ufffd un errore sulla pagina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando c'\ufffd un errore nella pagina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando c'\ufffd un errore nella pagina +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando la pagina non viene trovata +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando la pagina non viene trovata +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=In caso di errore redireziona sulla risorsa Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-06-02 07:37:18 UTC (rev 10899) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-06-02 13:14:43 UTC (rev 10900) @@ -32,6 +32,8 @@ <portlet-name>AdminPortlet</portlet-name> <display-name>Administration Portlet</display-name> <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> + <supported-locale>en</supported-locale> + <supported-locale>it</supported-locale> <init-param> <name>javax.portlet.faces.defaultViewId.view</name> <value>/jsf/objects.xhtml</value>

17 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r10899 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-02 03:37:18 -0400 (Mon, 02 Jun 2008) New Revision: 10899 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: Revert i18n changes and compilation breaking 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-06-02 07:23:17 UTC (rev 10898) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-06-02 07:37:18 UTC (rev 10899) @@ -22,18 +22,13 @@ 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$ @@ -49,24 +44,9 @@ /** . */ final PortalObjectManagerBean pomgr; - - 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()); + 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"; public ControlPropertiesBean(PortalObjectManagerBean pomgr) { @@ -79,8 +59,8 @@ if (portalSelectItems == null) { portalSelectItems = new ArrayList(); - 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())); + 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)); } return portalSelectItems; } @@ -90,9 +70,9 @@ if (pageSelectItems == null) { pageSelectItems = new ArrayList(); - 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())); + 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)); } 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-06-02 07:23:17 UTC (rev 10898) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-06-02 07:37:18 UTC (rev 10899) @@ -22,24 +22,6 @@ ******************************************************************************/ 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; @@ -68,6 +50,21 @@ 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 { @@ -169,14 +166,6 @@ /** . */ 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 @@ -883,7 +872,7 @@ { SelectItem[] result = new SelectItem[ids.size() + 1]; int i = 1; - result[0] = new SelectItem("", NO_BOUND_LISTENER.getDisplayName().getDefaultString()); + result[0] = new SelectItem("", "no bound listener"); for (Iterator idsIt = ids.iterator(); idsIt.hasNext();) { result[i++] = new SelectItem(idsIt.next());

17 years, 11 months

1
0
0 / 0

JBoss Portal SVN: r10898 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2008-06-02 03:23:17 -0400 (Mon, 02 Jun 2008) New Revision: 10898 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java Log: Revert i18n changes and compilation breaking 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-06-02 06:48:33 UTC (rev 10897) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2008-06-02 07:23:17 UTC (rev 10898) @@ -31,346 +31,56 @@ 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>(); - private static Map<Locale, String> THEME_LAYOUT_ID_DESCRIPTION = 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_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(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_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_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(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 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 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( - 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_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_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( - 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_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_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(); @@ -496,16 +206,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; } @@ -516,15 +226,14 @@ // 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); } } @@ -540,7 +249,7 @@ public PropertyInfo getPropertyInfo(String name) { - return (PropertyInfo) entries.get(name); + return (PropertyInfo)entries.get(name); } public static boolean isControlProperty(String name) @@ -550,7 +259,7 @@ public static PropertyInfo getControlPropertyInfo(String name) { - return (PropertyInfo) CONTROL_PROPERTIES.get(name); + return (PropertyInfo)CONTROL_PROPERTIES.get(name); } }

17 years, 11 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-06-02 02:48:33 -0400 (Mon, 02 Jun 2008) New Revision: 10897 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: Chapter 8. Error Handling Configuration - revisions. Still need to confirm changes... 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-06-02 05:32:16 UTC (rev 10896) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-02 06:48:33 UTC (rev 10897) @@ -37,7 +37,7 @@ </listitem> <listitem> <para> - <emphasis>Resource unavailable</emphasis>: the resource was found, but it is not serviceable. + <emphasis>Resource unavailable</emphasis>: the resource was found, but was not serviceable. </para> </listitem> </itemizedlist> @@ -118,13 +118,13 @@ <sect2> <title>Portal Policy</title> <para> - 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. + 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 it. 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> <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: + 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> @@ -135,7 +135,7 @@ </listitem> <listitem> <para> - replace the markup of the window by a redirection to a JSP page. + replace the markup of the window using a redirection to a JSP page. </para> </listitem> </itemizedlist> @@ -406,13 +406,13 @@ </listitem> <listitem> <para> - Click the <guibutton>Admin</guibutton> button on the top right-hand of the welcome page. Four tabs will appear on the left-hand side of the screen. Click on the <guibutton>Admin</guibutton> tab to open the portal management application. + Click the <guibutton>Admin</guibutton> button on the top right-hand of the welcome page. Four tabs will appear on the left-hand side of the page. Click on the <guibutton>Admin</guibutton> tab to open the portal management application. </para> </listitem> </orderedlist> </para> <para> - The functionality is available as part of the properties for each configuration level. You can specify the default error handling policy (at the root of the portal object hierachy) for each portal. or each page by clicking on the <guibutton>Properties</guibutton> button for each of these pages or portals: + The functionality is available as part of the properties for each configuration level. You can specify the default error handling policy (at the root of the portal object hierarchy) for each portal, or each page, by clicking on the <guibutton>Properties</guibutton> button for each page or portal: </para> <para> <mediaobject>

17 years, 11 months

1
0
0 / 0

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

by portal-commits＠lists.jboss.org

Author: mmcallis Date: 2008-06-02 01:32:16 -0400 (Mon, 02 Jun 2008) New Revision: 10896 Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml Log: 8.5. Configuration using the Portal Management Application - minor content addition - revising current content 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-06-02 05:28:47 UTC (rev 10895) +++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/errorhandling.xml 2008-06-02 05:32:16 UTC (rev 10896) @@ -150,7 +150,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 possible portal-policy properties: </para> <para> <table frame="all"> @@ -243,7 +243,7 @@ <sect2> <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: + 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 possible page-policy properties: </para> <para> <table frame="all"> @@ -345,7 +345,7 @@ <sect1> <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: + 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 possible request attributes: </para> <para> <table frame="all"> @@ -390,13 +390,41 @@ <sect1> <title>Configuration using the Portal Management Application</title> <para> - The Error handling policy can also be configured via the portal management application. The functionality is - available as part of the properties for each configuration level where it makes sense: you can specify the - default error handling policy (at the root of the portal object hierachy), for each portal or each page by - clicking on the Properties link on each of these pages. You can also specify how dashboards should behave with - respect to error handling by clicking on the Dashboards tab of the Portal management application. + The error handling policy can be configured via the portal management application. To access the portal management application: </para> - <para>Screenshot: + <para> + <orderedlist> + <listitem> + <para> + Use a Web browser to navigate to <ulink url="http://localhost:8080/portal" />. + </para> + </listitem> + <listitem> + <para> + Click the <guibutton>Login</guibutton> button on the top right-hand of the welcome page, and log in as the <option>admin</option> user. + </para> + </listitem> + <listitem> + <para> + Click the <guibutton>Admin</guibutton> button on the top right-hand of the welcome page. Four tabs will appear on the left-hand side of the screen. Click on the <guibutton>Admin</guibutton> tab to open the portal management application. + </para> + </listitem> + </orderedlist> + </para> + <para> + The functionality is available as part of the properties for each configuration level. You can specify the default error handling policy (at the root of the portal object hierachy) for each portal. or each page by clicking on the <guibutton>Properties</guibutton> button for each of these pages or portals: + </para> + <para> + <mediaobject> + <imageobject> + <imagedata fileref="images/errorhandling/errorHandling_management.png" /> + </imageobject> + </mediaobject> + </para> + <para> + As well, you can specify how dashboards should behave with respect to error handling, by clicking on the <guibutton>Dashboards</guibutton> tab of the portal management application: + </para> + <para> <imageobject> <imagedata fileref="images/errorhandling/errorHandlingUI.png" format="png" align="center"/> </imageobject>

17 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits June 2008