[portal-commits] JBoss Portal SVN: r6460 - in trunk: core-admin/src/main/org/jboss/portal/core/portlet/management and 5 other directories.

Author: julien(a)jboss.com Date: 2007-02-28 09:58:59 -0500 (Wed, 28 Feb 2007) New Revision: 6460 Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml Log: started to display more portlet meta info Modified: trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml =================================================================== --- trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2007-02-28 14:58:59 UTC (rev 6460) @@ -70,6 +70,7 @@ <resource-bundle>Resource</resource-bundle> <portlet-info> <title>User portlet</title> + <keywords>management,admin</keywords> </portlet-info> <security-role-ref> <role-name>Admin</role-name> @@ -90,6 +91,7 @@ <resource-bundle>Resource</resource-bundle> <portlet-info> <title>Role management</title> + <keywords>management,admin</keywords> </portlet-info> <security-role-ref> <role-name>Admin</role-name> @@ -109,24 +111,6 @@ </portlet-info> </portlet> <portlet> - <description>Administration portlet for portal pages administration</description> - <portlet-name>ManagementPortlet</portlet-name> - <display-name>Portal Management Portlet</display-name> - <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> - <init-param> - <name>default-view</name> - <value>/WEB-INF/jsp/management/index.xhtml</value> - </init-param> - <expiration-cache>-1</expiration-cache> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <portlet-info> - <title>Management Portlet</title> - </portlet-info> - </portlet> - <portlet> <description>Configurator portlet for personal dashboard</description> <portlet-name>ConfiguratorPortlet</portlet-name> <display-name>Dashboard Configurator Portlet</display-name> @@ -137,9 +121,9 @@ </supports> <portlet-info> <title>Dashboard Portlet</title> + <keywords>management,admin</keywords> </portlet-info> </portlet> - <user-attribute> <name>user.name.nickName</name> </user-attribute> Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java =================================================================== --- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/PortalObjectManagerBean.java 2007-02-28 14:58:59 UTC (rev 6460) @@ -107,16 +107,26 @@ }); // + SimpleBeanDecorator localizedStringDecorator = new SimpleBeanDecorator(); + localizedStringDecorator.setProperty("value", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) + { + LocalizedString string = (LocalizedString)bean; + FacesContext ctx = FacesContext.getCurrentInstance(); + Locale locale = ctx.getExternalContext().getRequestLocale(); + return string.getString(locale, true); + } + }); + + // SimpleBeanDecorator portletDecorator = new SimpleBeanDecorator(); portletDecorator.setProperty("name", new AbstractPropertyDecorator(String.class) { public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - LocalizedString displayName = portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); - FacesContext ctx = FacesContext.getCurrentInstance(); - Locale locale = ctx.getExternalContext().getRequestLocale(); - return displayName.getString(locale, true); + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME); } }); portletDecorator.setProperty("description", new AbstractPropertyDecorator(String.class) @@ -124,17 +134,25 @@ public Object getValue(Object bean) throws IllegalArgumentException { Portlet portlet = (Portlet)bean; - LocalizedString displayName = portlet.getInfo().getMeta().getMetaValue(MetaInfo.DESCRIPTION); - FacesContext ctx = FacesContext.getCurrentInstance(); - Locale locale = ctx.getExternalContext().getRequestLocale(); - String name = displayName.getString(locale, true); - if (name == null) - { - name = "-"; - } - return name; + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.DESCRIPTION); } }); + portletDecorator.setProperty("keywords", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.KEYWORDS); + } + }); + portletDecorator.setProperty("title", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getMeta().getMetaValue(MetaInfo.TITLE); + } + }); portletDecorator.setProperty("remotable", new AbstractPropertyDecorator(String.class) { public Object getValue(Object bean) throws IllegalArgumentException @@ -144,10 +162,35 @@ return info.isRemotable(); } }); + portletDecorator.setProperty("modes", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getCapabilities().getModes("text/html"); + } + }); + portletDecorator.setProperty("windowStates", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return portlet.getInfo().getCapabilities().getWindowStates("text/html"); + } + }); + portletDecorator.setProperty("locales", new AbstractPropertyDecorator(String.class) + { + public Object getValue(Object bean) throws IllegalArgumentException + { + Portlet portlet = (Portlet)bean; + return new ArrayList(portlet.getInfo().getCapabilities().getAllLocales()); + } + }); // + DelegatingPropertyResolver.registerDecorator(LocalizedString.class, localizedStringDecorator); + DelegatingPropertyResolver.registerDecorator(RoleModule.class, roleModuleDecorator); DelegatingPropertyResolver.registerDecorator(Portlet.class, portletDecorator); - DelegatingPropertyResolver.registerDecorator(RoleModule.class, roleModuleDecorator); } /** . */ Added: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml (rev 0) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/common/showPortletDetails.xhtml 2007-02-28 14:58:59 UTC (rev 6460) @@ -0,0 +1,18 @@ +<div + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> + + <div><span class="portlet-form-field-label">Portlet name:</span> #{portlet.name.value}</div> + <div><span class="portlet-form-field-label">Portlet description:</span> #{portlet.description.value}</div> + <div><span class="portlet-form-field-label">Portlet title:</span> #{portlet.title.value}</div> + <div><span class="portlet-form-field-label">Portlet keywords:</span> #{portlet.keywords.value}</div> + <c:if test="#{not empty portlet.locales}"> + <div><span class="portlet-form-field-label">Portlet locales:</span> + <c:forEach items="#{portlet.locales}" var="locale"> #{locale} </c:forEach> + </div> + </c:if> + +</div> \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/plugins/portlet/manager.xhtml 2007-02-28 14:58:59 UTC (rev 6460) @@ -2,18 +2,18 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> + xmlns:f="http://java.sun.com/jsf/core" + xmlns:c="http://java.sun.com/jstl/core"> <br/> - <h:panelGrid - rendered="#{portletmgr.selectedPortlet != null}"> - <h:outputText value="Name: #{portletmgr.selectedPortlet.name}"/> - <h:outputText value="Description: #{portletmgr.selectedPortlet.description}"/> - <br/> + <!-- Portlet details --> + <c:if test="#{portletmgr.selectedPortlet != null}"> + <ui:include src="/WEB-INF/jsp/management/common/showPortletDetails.xhtml"> + <ui:param name="portlet" value="#{portletmgr.selectedPortlet}"/> + </ui:include> + </c:if> - </h:panelGrid> - <!-- Instance creation --> <hr/> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsp/management/portlets.xhtml 2007-02-28 14:58:59 UTC (rev 6460) @@ -44,7 +44,7 @@ #{portlet.context.id} </h:commandLink> </td> - <td>#{portlet.name}</td> + <td>#{portlet.name.value}</td> <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remote}"/></td> <td><h:selectBooleanCheckbox disabled="true" value="#{portlet.remotable}"/></td> <td> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-02-28 14:58:59 UTC (rev 6460) @@ -43,6 +43,7 @@ </supports> <portlet-info> <title>Management Portlet</title> + <keywords>management,admin</keywords> </portlet-info> </portlet> </portlet-app> Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml =================================================================== --- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-02-28 14:06:24 UTC (rev 6459) +++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-02-28 14:58:59 UTC (rev 6460) @@ -38,10 +38,11 @@ </supports> <portlet-info> <title>Greetings!</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> - <description>Portlet to test modification of head content.</description> + <description>Portlet to test modification of head content</description> <portlet-name>HeaderContentPortlet</portlet-name> <display-name>Header Content Portlet</display-name> @@ -51,10 +52,11 @@ </supports> <portlet-info> <title>Header Content portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> - <description>This is a test portlet</description> + <description>A test portlet</description> <description xml:lang="fr">C'est une portlet de test</description> <portlet-name>TestPortlet</portlet-name> <display-name>Test Portlet</display-name> @@ -67,6 +69,7 @@ </supports> <portlet-info> <title>Test portlet</title> + <keywords>sample,test</keywords> </portlet-info> <portlet-preferences> <preference> @@ -99,24 +102,22 @@ </security-role-ref> </portlet> <portlet> - <description>Portlet counting and displaying number of it's action/render calls - demonstrating session - behaviour</description> + <description>Portlet displaying the number of it's action/render calls</description> <portlet-name>CounterPortlet</portlet-name> <display-name>Counter Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> </supports> <portlet-info> <title>Counter portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Counter Portlet with cache support</description> <portlet-name>CachedCounterPortlet</portlet-name> <display-name>Cached Counter Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.CounterPortlet</portlet-class> <expiration-cache>60</expiration-cache> <supports> @@ -130,33 +131,32 @@ <description>Portlet for testing behaviour on exceptions</description> <portlet-name>ExceptionPortlet</portlet-name> <display-name>Exception Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.ExceptionPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> </supports> <portlet-info> <title>Exception portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> - <description>Portlet using portlet session - demo purposes</description> + <description>Portlet using portlet session</description> <portlet-name>PortletSessionPortlet</portlet-name> <display-name>Porltet Session Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.PortletSessionPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> </supports> <portlet-info> <title>Portlet session portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet for demonstrating IPC</description> <portlet-name>PortletA</portlet-name> <display-name>Portlet A</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.event.PortletA</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -164,13 +164,13 @@ </supports> <portlet-info> <title>Test Event A</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet for demonstrating IPC</description> <portlet-name>PortletB</portlet-name> <display-name>Portlet B</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.event.PortletB</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -178,6 +178,7 @@ </supports> <portlet-info> <title>Test Event B</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> @@ -192,13 +193,13 @@ </supports> <portlet-info> <title>Test charset</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet for testing encoding</description> <portlet-name>EncodingPortlet</portlet-name> <display-name>Encoding Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.EncodingPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -206,13 +207,13 @@ </supports> <portlet-info> <title>Test charset</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Secured Test Portlet</description> <portlet-name>SecuredTestPortlet</portlet-name> <display-name>Secured Test Portlet</display-name> - <portlet-class>org.jboss.portal.core.portlet.test.TestPortlet</portlet-class> <supports> <mime-type>text/html</mime-type> @@ -222,13 +223,13 @@ </supports> <portlet-info> <title>Secured test portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <description>Portlet providing weather forecast</description> <portlet-name>WeatherPortlet</portlet-name> <display-name>Weather Portlet</display-name> - <portlet-class>org.jboss.samples.portlet.weather.WeatherPortlet</portlet-class> <init-param> <name>default_zipcode</name> @@ -250,6 +251,7 @@ </supports> <portlet-info> <title>Weather Portlet</title> + <keywords>sample,news</keywords> </portlet-info> <portlet-preferences> <preference> @@ -291,6 +293,7 @@ <resource-bundle>NewsResource</resource-bundle> <portlet-info> <title>News Feeds</title> + <keywords>sample,news</keywords> </portlet-info> <portlet-preferences> <preference> @@ -315,17 +318,20 @@ </supports> <portlet-info> <title>URL Portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <portlet> <portlet-name>BasicPortlet</portlet-name> <portlet-class>org.jboss.portal.core.portlet.test.BasicPortlet</portlet-class> + <display-name>Basic Portlet</display-name> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> </supports> <portlet-info> <title>Basic Portlet</title> + <keywords>sample,test</keywords> </portlet-info> </portlet> <user-attribute>