JBoss Portal SVN: r10439 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-31 19:48:01 -0400 (Mon, 31 Mar 2008)
New Revision: 10439
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.3. The jboss-portlet.xml Descriptor
revising content
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-31 22:30:32 UTC (rev 10438)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-31 23:48:01 UTC (rev 10439)
@@ -1279,24 +1279,22 @@
<note>
<title>Is the <filename>portlet-instances.xml</filename> descriptor required?</title>
<para>
- Technically, they are not. The portal object hierarchy, such as creating portals, pages, instances, and organizing them on the page, can be defined using the management portlet, which is accessible to JBoss Portal administrators.
+ Technically, it is not. The portal object hierarchy, such as creating portals, pages, instances, and organizing them on the page, can be defined using the management portlet, which is accessible to JBoss Portal administrators.
</para>
</note>
</sect2>
<sect2>
- <title>jboss-portlet.xml</title>
- <note>
- <emphasis>Is this descriptor mandatory?</emphasis>
- Technically, no, but might be required to access JBoss-specific functionality that is not covered by the
- Portlet specification.
- </note>
- <para>This descriptor is useful when you need to access JBoss-specific functionality within your portlet
- application. It would normally be packaged inside your portlet war, alongside the other descriptors
- in this section.</para>
+ <title>The <filename>jboss-portlet.xml</filename> Descriptor</title>
+ <para>
+ The <filename>jboss-portlet.xml</filename> descriptor allows you to use JBoss-specific functionality within your portlet application. This descriptor is covered by the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>, and would normally be package inside your portlet WAR, alongside the other descriptors in these sections.
+ </para>
<sect3>
<title>Injecting Header Content</title>
<para>
- <programlisting><![CDATA[
+ The following example injects a specific style sheet, <computeroutput>/images/management/management.css</computeroutput>, allowing the porlet to leverage a specific style:
+ </para>
+ <para>
+<screen><![CDATA[
<?xml version="1.0" standalone="yes"?>
<!DOCTYPE portlet-app PUBLIC
"-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
@@ -1309,15 +1307,20 @@
media="screen"/>
</header-content>
</portlet>
-</portlet-app>]]></programlisting>
- The above example will inject a specific style sheet link in the top of the portal page, allowing this
- portlet to leverage its specific style selectors.
+</portlet-app>]]>
+</screen>
+ </para>
+ <para>
+ Use the <computeroutput><header-content></computeroutput> and <computeroutput><link></computeroutput> elements to specify a style sheet to use.
</para>
</sect3>
<sect3>
- <title>Injecting Services in the portlet context</title>
+ <title>Injecting Services in the Portlet Context</title>
+ <para>
+ The following example injects the <computeroutput>UserModule</computeroutput> service as an attribute to the portlet context:
+ </para>
<para>
- <programlisting><![CDATA[
+<screen><![CDATA[
<?xml version="1.0" standalone="yes"?>
<!DOCTYPE portlet-app PUBLIC
"-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
@@ -1328,20 +1331,28 @@
<service-class>org.jboss.portal.identity.UserModule</service-class>
<service-ref>:service=Module,type=User</service-ref>
</service>
-</portlet-app>]]></programlisting>
- Injects the UserModule service as an attribute to the portlet context, allowing a portlet to then leverage the
- service. For example:
- <programlisting><![CDATA[
+</portlet-app>]]>
+</screen>
+ </para>
+ <para>
+ This allows the portlet to leverage the service, for example:
+ </para>
+ <para>
+<screen><![CDATA[
UserModule userModule = (UserModule) getPortletContext().getAttribute("UserModule");
String userId = request.getParameters().getParameter("userid");
User user = userModule.findUserById(userId);
-]]></programlisting>
+]]>
+</screen>
</para>
</sect3>
<sect3>
- <title>Defining extra portlet information</title>
- <para>Since JBoss Portal 2.6.3, icons can be defined for a portlet.
- <programlisting><![CDATA[
+ <title>Defining Extra Portlet Information</title>
+ <para>
+ As of JBoss Portal 2.6.3, icons can be defined for a portlet, by using the <computeroutput><icon></computeroutput>, <computeroutput><small-icon></computeroutput>, and <computeroutput><large-icon></computeroutput> elements:
+ </para>
+ <para>
+<screen><![CDATA[
<?xml version="1.0" standalone="yes"?>
<!DOCTYPE portlet-app PUBLIC
"-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
@@ -1356,10 +1367,12 @@
</icon>
</portlet-info>
</portlet>
-</portlet-app>]]></programlisting>
- The reference can be absolute (http://www.example.com/images/smallIcon.png) or relative to the webapp
- context if starting with a '/'. Those icons can be used by different parts of the portal User Interface.
- </para>
+</portlet-app>]]>
+</screen>
+ </para>
+ <para>
+ The reference can be absolute, for example, <emphasis>http://www.example.com/images/smallIcon.png</emphasis>, or relative to the web application context, by starting with a <computeroutput>/</computeroutput>, as shown above. These icons can be used by different parts of the portlet user interface.
+ </para>
</sect3>
<sect3>
<title>Portlet Session Replication in a Clustered Environment</title>
@@ -1475,6 +1488,14 @@
<note>This is a simple portlet.xml primer, and is not meant as a replacement for what is covered in the
actual Portlet specification.</note>
</para>
+ <para>
+ <note>
+ <title>Is the <filename>jboss-portlet.xml</filename> descriptor required?</title>
+ <para>
+ Technically, it is not; however, it may be required to access JBoss-specific functionality that is not covered by the Portlet specification.
+ </para>
+ </note>
+ </para>
</sect2>
</sect1>
<sect1 id="portaldescriptors">
16 years
JBoss Portal SVN: r10438 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-31 18:30:32 -0400 (Mon, 31 Mar 2008)
New Revision: 10438
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- JBPORTAL-1967: Title could be null as well, added getLocalizedValue method.
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 22:30:00 UTC (rev 10437)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 22:30:32 UTC (rev 10438)
@@ -60,14 +60,6 @@
{
PortletInfo info = portlet.getInfo();
MetaInfo metaInfo = info.getMeta();
-
- LocalizedString localizedDesc = metaInfo.getMetaValue(MetaInfo.DESCRIPTION);
- String desc = "";
- if (localizedDesc != null)
- {
- desc = localizedDesc.getString(locale, true);
- }
-
String iconLocation = getIcon(info);
%>
<tr class="portlet-section-selected">
@@ -79,7 +71,8 @@
<span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ <span class="portlet-form-field-label">Portlet description:</span>
+ <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</td>
@@ -111,13 +104,6 @@
}
String iconLocation = getIcon(info);
-
- LocalizedString localizedDesc = portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION);
- String desc = "";
- if (localizedDesc != null)
- {
- desc = localizedDesc.getString(locale, true);
- }
%>
<portlet:actionURL var="url">
<portlet:param name="content.action.select" value="true"/>
@@ -127,20 +113,17 @@
<div style="display:none">
<div class="darktip" id="info-container-<%= displayName %>">
<div class="toolbar" style="width: 250px;">
- <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
+ <div class="title"><%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.TITLE), locale) %>
</div>
</div>
<div class="content">
-
- <div>
- <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
- <div>
- <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ <div><span class="portlet-form-field-label">Portlet description:</span>
+ <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</div>
</div>
-
</div>
<tr class="<%= rowClass %>">
@@ -176,4 +159,15 @@
return iconLocation;
}
+
+ private String getLocalizedValue(LocalizedString locString, Locale locale)
+ {
+ String value = "";
+ if (locString != null)
+ {
+ value = locString.getString(locale, true);
+ }
+
+ return value;
+ }
%>
\ No newline at end of file
16 years
JBoss Portal SVN: r10437 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-31 18:30:00 -0400 (Mon, 31 Mar 2008)
New Revision: 10437
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- JBPORTAL-1967: Title could be null as well, added getLocalizedValue method.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 17:28:28 UTC (rev 10436)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 22:30:00 UTC (rev 10437)
@@ -61,14 +61,6 @@
{
PortletInfo info = portlet.getInfo();
MetaInfo metaInfo = info.getMeta();
-
- LocalizedString localizedDesc = metaInfo.getMetaValue(MetaInfo.DESCRIPTION);
- String desc = "";
- if (localizedDesc != null)
- {
- desc = localizedDesc.getString(locale, true);
- }
-
String iconLocation = getIcon(info);
%>
<tr class="portlet-section-selected">
@@ -80,7 +72,8 @@
<span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
<div>
- <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ <span class="portlet-form-field-label">Portlet description:</span>
+ <%= getLocalizedValue(metaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</td>
@@ -112,13 +105,6 @@
}
String iconLocation = getIcon(info);
-
- LocalizedString localizedDesc = portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION);
- String desc = "";
- if (localizedDesc != null)
- {
- desc = localizedDesc.getString(locale, true);
- }
%>
<portlet:actionURL var="url">
<portlet:param name="content.action.select" value="true"/>
@@ -128,20 +114,17 @@
<div style="display:none">
<div class="darktip" id="info-container-<%= displayName %>">
<div class="toolbar" style="width: 250px;">
- <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
+ <div class="title"><%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.TITLE), locale) %>
</div>
</div>
<div class="content">
-
- <div>
- <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ <div><span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
</div>
- <div>
- <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ <div><span class="portlet-form-field-label">Portlet description:</span>
+ <%= getLocalizedValue(portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION), locale) %>
</div>
</div>
</div>
-
</div>
<tr class="<%= rowClass %>">
@@ -179,4 +162,15 @@
}
return iconLocation;
}
+
+ private String getLocalizedValue(LocalizedString locString, Locale locale)
+ {
+ String value = "";
+ if (locString != null)
+ {
+ value = locString.getString(locale, true);
+ }
+
+ return value;
+ }
%>
\ No newline at end of file
16 years
JBoss Portal SVN: r10436 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-31 13:28:28 -0400 (Mon, 31 Mar 2008)
New Revision: 10436
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- JBPORTAL-1967: Avoid NPEs, use proper locales.
- Minor improvements (in particular avoid querying for a value when a local variable can be used).
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 17:27:40 UTC (rev 10435)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 17:28:28 UTC (rev 10436)
@@ -1,6 +1,6 @@
+<%@ page import="org.jboss.portal.common.i18n.LocalizedString" %>
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
-<%@ page import="org.jboss.portal.core.portlet.info.CorePortletInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %>
<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %>
<%@ page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
@@ -8,167 +8,172 @@
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%
- Collection instances = (Collection)request.getAttribute("INSTANCES");
- Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
+ Collection instances = (Collection)request.getAttribute("INSTANCES");
+ Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
<%@page import="org.jboss.portal.portlet.Portlet" %>
<%@page import="org.jboss.portal.portlet.PortletInvokerException" %>
<%@page import="org.jboss.portal.portlet.info.MetaInfo" %>
<%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
<%@page import="java.util.Collection" %>
+<%@ page import="java.util.Locale" %>
<portlet:defineObjects/>
<script type='text/javascript' src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script>
<script type='text/javascript' src='/portal-admin/js/domTT.js'></script>
<script type="text/javascript">
- //<![CDATA[
- var domTT_styleClass = 'domTTOverlib';
- var domTT_maxWidth = false;
- //]]>
+ //<![CDATA[
+ var domTT_styleClass = 'domTTOverlib';
+ var domTT_maxWidth = false;
+ //]]>
</script>
<table style="width:500px;">
<tr>
- <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
+ <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
</tr>
<%
- if (selectedInstance != null)
- {
- String displayName = selectedInstance.getDisplayName().getString(renderRequest.getLocale(), true);
- if (displayName == null)
- {
- displayName = selectedInstance.getId();
- }
+ Locale locale = renderRequest.getLocale();
+ if (selectedInstance != null)
+ {
+ String displayName = selectedInstance.getDisplayName().getString(locale, true);
+ if (displayName == null)
+ {
+ displayName = selectedInstance.getId();
+ }
%>
<%
- Portlet portlet = null;
- try
- {
- portlet = selectedInstance.getPortlet();
- }
- catch (PortletInvokerException e)
- {
- e.printStackTrace();
- }
- if (portlet != null)
- {
- MetaInfo metaInfo = portlet.getInfo().getMeta();
+ Portlet portlet = null;
+ try
+ {
+ portlet = selectedInstance.getPortlet();
+ }
+ catch (PortletInvokerException e)
+ {
+ e.printStackTrace();
+ }
+ if (portlet != null)
+ {
+ PortletInfo info = portlet.getInfo();
+ MetaInfo metaInfo = info.getMeta();
- PortletInfo info = portlet.getInfo();
+ LocalizedString localizedDesc = metaInfo.getMetaValue(MetaInfo.DESCRIPTION);
+ String desc = "";
+ if (localizedDesc != null)
+ {
+ desc = localizedDesc.getString(locale, true);
+ }
- String iconLocation = getIcon(info);
-
+ String iconLocation = getIcon(info);
%>
<tr class="portlet-section-selected">
- <td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
- <span><%= displayName %></span>
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <span><%= displayName %></span>
- <div>
- <span
- class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
- </div>
- <div>
- <span
- class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
- </div>
+ <div>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ </div>
+ <div>
+ <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ </div>
- </td>
+ </td>
</tr>
<%
- }
- }
+ }
+ }
%>
<tr>
- <td>
+ <td>
- <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
- <table style="width:100%;" cellspacing="0" cellpadding="0">
- <%
- for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
- {
- Instance instance = (Instance)i.next();
- String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
- String displayName = instance.getDisplayName().getString(renderRequest.getLocale(), true);
- MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta();
+ <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
+ <table style="width:100%;" cellspacing="0" cellpadding="0">
+ <%
+ for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
+ {
+ Instance instance = (Instance)i.next();
+ String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
+ String displayName = instance.getDisplayName().getString(locale, true);
+ PortletInfo info = instance.getPortlet().getInfo();
+ MetaInfo portletMetaInfo = info.getMeta();
- if (displayName == null)
- {
- displayName = instance.getId();
- }
+ if (displayName == null)
+ {
+ displayName = instance.getId();
+ }
- PortletInfo info = instance.getPortlet().getInfo();
+ String iconLocation = getIcon(info);
- String iconLocation = getIcon(info);
+ LocalizedString localizedDesc = portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION);
+ String desc = "";
+ if (localizedDesc != null)
+ {
+ desc = localizedDesc.getString(locale, true);
+ }
+ %>
+ <portlet:actionURL var="url">
+ <portlet:param name="content.action.select" value="true"/>
+ <portlet:param name="content.uri" value="<%= instance.getId() %>"/>
+ </portlet:actionURL>
- %>
- <portlet:actionURL var="url">
- <portlet:param name="content.action.select" value="true"/>
- <portlet:param name="content.uri" value="<%= instance.getId() %>"/>
- </portlet:actionURL>
+ <div style="display:none">
+ <div class="darktip" id="info-container-<%= displayName %>">
+ <div class="toolbar" style="width: 250px;">
+ <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
+ </div>
+ </div>
+ <div class="content">
- <div style="display:none">
- <div class="darktip" id="info-container-<%= displayName %>">
- <div class="toolbar" style="width: 250px;">
- <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
- </div>
- </div>
- <div class="content">
+ <div>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ </div>
+ <div>
+ <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ </div>
+ </div>
+ </div>
- <div>
- <span
- class="portlet-form-field-label">Portlet name:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
- </div>
- <div>
- <span
- class="portlet-form-field-label">Portlet description:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
- </div>
- </div>
- </div>
+ </div>
- </div>
-
- <tr class="<%= rowClass %>">
- <td>
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
- <span
- onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
- href="<%= url %>" id="portlet-instance-link"><%= displayName %>
- </a></span></td>
- </tr>
- <%
- }
- %>
- </table>
- </div>
- </td>
+ <tr class="<%= rowClass %>">
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ href="<%= url %>" id="portlet-instance-link"><%= displayName %>
+ </a></span></td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+ </div>
+ </td>
</tr>
</table>
<%!
- private String getIcon(PortletInfo info)
- {
- String iconLocation = null;
- CorePortletInfo cInfo = info.getAttachment(CorePortletInfo.class);
- if (cInfo != null)
+ private String getIcon(PortletInfo info)
+ {
+ String iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON;
+ PortletInfoInfo portletInfo = info.getAttachment(PortletInfoInfo.class);
+
+ if (portletInfo != null)
+ {
+ PortletIconInfo iconInfo = portletInfo.getPortletIconInfo();
+ if (iconInfo != null && iconInfo.getIconLocation(PortletIconInfo.SMALL) != null)
{
- PortletInfoInfo portletInfo = cInfo.getPortletInfo();
- if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null)
- {
- iconLocation = portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL);
- }
+ iconLocation = iconInfo.getIconLocation(PortletIconInfo.SMALL);
}
- if (iconLocation == null)
- {
- iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON;
- }
- return iconLocation;
- }
+ }
+
+ return iconLocation;
+ }
%>
\ No newline at end of file
16 years
JBoss Portal SVN: r10435 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-03-31 13:27:40 -0400 (Mon, 31 Mar 2008)
New Revision: 10435
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
Log:
- JBPORTAL-1967: Avoid NPEs, use proper locales.
- Minor improvements (in particular avoid querying for a value when a local variable can be used).
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 13:11:00 UTC (rev 10434)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/content/portlet_editor.jsp 2008-03-31 17:27:40 UTC (rev 10435)
@@ -1,166 +1,182 @@
+<%@ page import="org.jboss.portal.common.i18n.LocalizedString" %>
<%@ page import="org.jboss.portal.common.util.IteratorStatus" %>
<%@ page import="org.jboss.portal.core.model.instance.Instance" %>
-<%@ page import="org.jboss.portal.portlet.Portlet" %>
-<%@ page import="org.jboss.portal.portlet.PortletInvokerException" %>
-<%@ page import="org.jboss.portal.portlet.info.MetaInfo" %>
-<%@ page import="java.util.Collection" %>
+<%@ page import="org.jboss.portal.core.portlet.info.CorePortletInfo" %>
+<%@ page import="org.jboss.portal.core.portlet.info.PortletIconInfo" %>
+<%@ page import="org.jboss.portal.core.portlet.info.PortletInfoInfo" %>
<%@ page language="java" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%
- Collection instances = (Collection)request.getAttribute("INSTANCES");
- Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
+ Collection instances = (Collection)request.getAttribute("INSTANCES");
+ Instance selectedInstance = (Instance)request.getAttribute("SELECTED_INSTANCE");
%>
-<%@page import="org.jboss.portal.portlet.info.PortletInfo"%>
-<%@page import="org.jboss.portal.core.portlet.info.CorePortletInfo"%>
-<%@page import="org.jboss.portal.core.portlet.info.PortletInfoInfo"%>
-<%@page import="org.jboss.portal.core.portlet.info.PortletIconInfo"%>
-<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet"%>
+<%@page import="org.jboss.portal.core.ui.content.portlet.PortletContentEditorPortlet" %>
+<%@page import="org.jboss.portal.portlet.Portlet" %>
+<%@page import="org.jboss.portal.portlet.PortletInvokerException" %>
+<%@page import="org.jboss.portal.portlet.info.MetaInfo" %>
+<%@page import="org.jboss.portal.portlet.info.PortletInfo" %>
+<%@ page import="java.util.Collection" %>
+<%@ page import="java.util.Locale" %>
<portlet:defineObjects/>
<script type='text/javascript' src='/portal-admin/js/domLib.js'></script>
<script type="text/javascript" src="/portal-admin/js/fadomatic.js"></script>
<script type='text/javascript' src='/portal-admin/js/domTT.js'></script>
<script type="text/javascript">
- //<![CDATA[
- var domTT_styleClass = 'domTTOverlib';
- var domTT_maxWidth = false;
- //]]>
+ //<![CDATA[
+ var domTT_styleClass = 'domTTOverlib';
+ var domTT_maxWidth = false;
+ //]]>
</script>
<table style="width:500px;">
<tr>
- <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
+ <td><h3 class="sectionTitle tenpx-top-bottom">Portlet instance associated to this window:</h3></td>
</tr>
<%
- if (selectedInstance != null)
- {
- String displayName = selectedInstance.getDisplayName().getString(renderRequest.getLocale(), true);
- if (displayName == null)
- {
- displayName = selectedInstance.getId();
- }
+ Locale locale = renderRequest.getLocale();
+ if (selectedInstance != null)
+ {
+ String displayName = selectedInstance.getDisplayName().getString(locale, true);
+ if (displayName == null)
+ {
+ displayName = selectedInstance.getId();
+ }
%>
- <%
- Portlet portlet = null;
- try
- {
- portlet = selectedInstance.getPortlet();
- }
- catch (PortletInvokerException e)
- {
- e.printStackTrace();
- }
- if (portlet != null)
- {
- MetaInfo metaInfo = portlet.getInfo().getMeta();
+<%
+ Portlet portlet = null;
+ try
+ {
+ portlet = selectedInstance.getPortlet();
+ }
+ catch (PortletInvokerException e)
+ {
+ e.printStackTrace();
+ }
+ if (portlet != null)
+ {
+ PortletInfo info = portlet.getInfo();
+ MetaInfo metaInfo = info.getMeta();
- PortletInfo info = portlet.getInfo();
+ LocalizedString localizedDesc = metaInfo.getMetaValue(MetaInfo.DESCRIPTION);
+ String desc = "";
+ if (localizedDesc != null)
+ {
+ desc = localizedDesc.getString(locale, true);
+ }
- String iconLocation = getIcon(info);
-
- %>
+ String iconLocation = getIcon(info);
+%>
<tr class="portlet-section-selected">
- <td >
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
- <span><%= displayName %></span>
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <span><%= displayName %></span>
- <div>
- <span class="portlet-form-field-label">Portlet name:</span><%= metaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
- </div>
- <div>
- <span class="portlet-form-field-label">Portlet description:</span><%= metaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
- </div>
-
- </td>
- </tr>
- <%
- }
- }
+ <div>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ </div>
+ <div>
+ <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ </div>
- %>
+ </td>
+</tr>
+<%
+ }
+ }
+%>
- <tr>
-<td>
-<div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
- <table style="width:100%;" cellspacing="0" cellpadding="0">
- <%
- for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
- {
+<tr>
+ <td>
+
+ <div style="height:300px; width:500px; overflow: auto; overflow-x: hidden; border: 1px solid #333;">
+ <table style="width:100%;" cellspacing="0" cellpadding="0">
+ <%
+ for (IteratorStatus i = new IteratorStatus(instances); i.hasNext();)
+ {
Instance instance = (Instance)i.next();
String rowClass = instance == selectedInstance ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate");
- String displayName = instance.getDisplayName().getString(renderRequest.getLocale(), true);
- MetaInfo portletMetaInfo = instance.getPortlet().getInfo().getMeta();
+ String displayName = instance.getDisplayName().getString(locale, true);
+ PortletInfo info = instance.getPortlet().getInfo();
+ MetaInfo portletMetaInfo = info.getMeta();
if (displayName == null)
{
- displayName = instance.getId();
+ displayName = instance.getId();
}
-
- PortletInfo info = instance.getPortlet().getInfo();
String iconLocation = getIcon(info);
- %>
- <portlet:actionURL var="url">
- <portlet:param name="content.action.select" value="true"/>
- <portlet:param name="content.uri" value="<%= instance.getId() %>"/>
- </portlet:actionURL>
+ LocalizedString localizedDesc = portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION);
+ String desc = "";
+ if (localizedDesc != null)
+ {
+ desc = localizedDesc.getString(locale, true);
+ }
+ %>
+ <portlet:actionURL var="url">
+ <portlet:param name="content.action.select" value="true"/>
+ <portlet:param name="content.uri" value="<%= instance.getId() %>"/>
+ </portlet:actionURL>
- <div style="display:none">
- <div class="darktip" id="info-container-<%= displayName %>">
- <div class="toolbar" style="width: 250px;">
- <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %></div>
- </div>
- <div class="content">
+ <div style="display:none">
+ <div class="darktip" id="info-container-<%= displayName %>">
+ <div class="toolbar" style="width: 250px;">
+ <div class="title"><%= portletMetaInfo.getMetaValue(MetaInfo.TITLE).getDefaultString() %>
+ </div>
+ </div>
+ <div class="content">
- <div>
- <span class="portlet-form-field-label">Portlet name:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DISPLAY_NAME).getDefaultString() %>
- </div>
- <div>
- <span class="portlet-form-field-label">Portlet description:</span><%= portletMetaInfo.getMetaValue(MetaInfo.DESCRIPTION).getDefaultString() %>
- </div>
- </div>
- </div>
-
- </div>
+ <div>
+ <span class="portlet-form-field-label">Portlet name:</span><%= displayName %>
+ </div>
+ <div>
+ <span class="portlet-form-field-label">Portlet description:</span><%= desc %>
+ </div>
+ </div>
+ </div>
- <tr class="<%= rowClass %>" >
- <td >
- <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0"/>
- <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a href="<%= url %>" id="portlet-instance-link"><%= displayName %></a></span></td>
- </tr>
- <%
- }
- %>
- </table>
-</div>
+ </div>
+
+ <tr class="<%= rowClass %>">
+ <td>
+ <img src="<%= iconLocation %>" align="middle" style="margin:0 4px 0 0" alt="icon"/>
+ <span onmouseover="domTT_activate(this, event, 'content', document.getElementById('info-container-<%= displayName %>'),'delay', 0, 'trail', false, 'fade', 'both', 'fadeMax', 95, 'styleClass', 'none');"><a
+ href="<%= url %>" id="portlet-instance-link"><%= displayName %>
+ </a></span></td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+ </div>
</td>
- </tr>
+</tr>
</table>
<%!
- private String getIcon(PortletInfo info)
- {
- String iconLocation = null;
- if (info instanceof CorePortletInfo)
+ private String getIcon(PortletInfo info)
+ {
+ String iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON;
+ if (info instanceof CorePortletInfo)
+ {
+ CorePortletInfo cInfo = (CorePortletInfo)info;
+ PortletInfoInfo portletInfo = cInfo.getPortletInfo();
+ if (portletInfo != null)
{
- CorePortletInfo cInfo = (CorePortletInfo)info;
- PortletInfoInfo portletInfo = cInfo.getPortletInfo();
- if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null)
- {
- iconLocation = portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL);
- }
+ PortletIconInfo iconInfo = portletInfo.getPortletIconInfo();
+ if (iconInfo != null && iconInfo.getIconLocation(PortletIconInfo.SMALL) != null)
+ {
+ iconLocation = iconInfo.getIconLocation(PortletIconInfo.SMALL);
+ }
}
- if (iconLocation == null)
- {
- iconLocation = PortletContentEditorPortlet.DEFAULT_PORTLET_ICON;
- }
- return iconLocation;
- }
+ }
+ return iconLocation;
+ }
%>
\ No newline at end of file
16 years
JBoss Portal SVN: r10434 - modules/portlet/trunk/build/distrib.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-31 09:11:00 -0400 (Mon, 31 Mar 2008)
New Revision: 10434
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
Log:
update output dir for CR3
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-31 12:57:52 UTC (rev 10433)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-31 13:11:00 UTC (rev 10434)
@@ -2,8 +2,8 @@
<property name="source.dir" value="../.."/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
- <property name="pc.release.version" value="2.0.0.CR2"/>
- <property name="demo.release.version" value="2.0.0.CR2"/>
+ <property name="pc.release.version" value="2.0.0.CR3"/>
+ <property name="demo.release.version" value="2.0.0.CR3"/>
<property name="maven.version" value="2.0.0-SNAPSHOT"/>
<!-- -->
16 years
JBoss Portal SVN: r10433 - in modules/portlet/tags/JBP_PORTLET_2_0_0_CR2: bridge and 13 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-31 08:57:52 -0400 (Mon, 31 Mar 2008)
New Revision: 10433
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/bridge/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/distrib/distrib.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/controller/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/user-guide/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/federation/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/jsr168api/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/management/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/mc/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portal/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portlet/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/samples/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/test/pom.xml
Log:
updating tags for 2.0.0.CR2 of portlet container
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/bridge/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/bridge/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/bridge/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/distrib/distrib.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/distrib/distrib.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/distrib/distrib.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -4,7 +4,7 @@
<property name="src.docs.dir" value="${source.dir}/docs"/>
<property name="pc.release.version" value="2.0.0.CR2"/>
<property name="demo.release.version" value="2.0.0.CR2"/>
- <property name="maven.version" value="2.0.0-SNAPSHOT"/>
+ <property name="maven.version" value="2.0.0.CR2"/>
<!-- -->
<property name="pc.release.name" value="jboss-portletcontainer-${pc.release.version}"/>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/build/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module</name>
<description>JBoss Portal Portlet Module</description>
@@ -33,8 +33,8 @@
<version.jboss-logging>2.0.3.GA</version.jboss-logging>
<version.jbossxb>2.0.0.CR5</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
- <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
+ <version.jboss.portal.common>1.2.0.Beta3</version.jboss.portal.common>
+ <version.jboss.portal.web>1.2.0.Beta3</version.jboss.portal.web>
<version.jboss.unit>1.2.0.Beta2</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/controller/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/controller/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/controller/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -4,13 +4,12 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Docs Aggregator</name>
- <version>2.0-Beta1</version>
<url>http://labs.jboss.com/jbossportal</url>
<modules>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/user-guide/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/user-guide/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/docs/user-guide/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<packaging>jdocbook</packaging>
<name>User_Guide_(${translation})</name>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/federation/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/federation/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/federation/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/jsr168api/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/jsr168api/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/jsr168api/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/management/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/management/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/management/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/mc/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/mc/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/mc/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module Aggregator</name>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portal/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portal/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portal/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portlet/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portlet/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/portlet/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/samples/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/samples/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/samples/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/test/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/test/pom.xml 2008-03-31 12:28:30 UTC (rev 10432)
+++ modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/test/pom.xml 2008-03-31 12:57:52 UTC (rev 10433)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years
JBoss Portal SVN: r10432 - modules/portlet/tags.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-31 08:28:30 -0400 (Mon, 31 Mar 2008)
New Revision: 10432
Added:
modules/portlet/tags/JBP_PORTLET_2_0_0_CR2/
Log:
tagging CR2
Copied: modules/portlet/tags/JBP_PORTLET_2_0_0_CR2 (from rev 10431, modules/portlet/trunk)
16 years
JBoss Portal SVN: r10431 - in modules/portlet/trunk: portal/src/assemble and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-03-31 08:15:42 -0400 (Mon, 31 Mar 2008)
New Revision: 10431
Modified:
modules/portlet/trunk/build/distrib/distrib.xml
modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml
Log:
include log4j jboss logging plugin as if it is not found aop replaces it with system out prinln plugin.
Modified: modules/portlet/trunk/build/distrib/distrib.xml
===================================================================
--- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-31 10:25:34 UTC (rev 10430)
+++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-31 12:15:42 UTC (rev 10431)
@@ -1,4 +1,4 @@
-im<project default="all" name="JBoss Portlet Container">
+<project default="all" name="JBoss Portlet Container">
<property name="source.dir" value="../.."/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
@@ -129,7 +129,7 @@
</copy>
<jar file="${pc.build.bin.tomcat6}/webapps/simple-portal.war">
<fileset
- dir="${source.dir}/portal/target/tomcat60.dir/simple-portal/simple-portal.war"
+ dir="${source.dir}/portal/target/simple-portal-tomcat60.dir/simple-portal/simple-portal.war"
includes="**"/>
</jar>
Modified: modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-03-31 10:25:34 UTC (rev 10430)
+++ modules/portlet/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2008-03-31 12:15:42 UTC (rev 10431)
@@ -21,6 +21,7 @@
<include>apache-xerces:xercesImpl</include>
<include>jboss:jboss-logging-spi</include>
<include>jboss:jboss-logging-jdk</include>
+ <include>jboss:jboss-logging-log4j</include>
<include>apache-taglibs:jstl</include>
<include>apache-taglibs:standard</include>
</includes>
16 years
JBoss Portal SVN: r10430 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-03-31 06:25:34 -0400 (Mon, 31 Mar 2008)
New Revision: 10430
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
6.2.2. The portlet-instances.xml Descriptor
- revising preferences element
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-31 10:22:20 UTC (rev 10429)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-03-31 10:25:34 UTC (rev 10430)
@@ -1188,13 +1188,13 @@
<programlisting><![CDATA[<preferences><preference>...</preference></preferences>]]></programlisting>
</para>
<para>
- The <computeroutput><preference></computeroutput> element configures a preference as a key-value pair. This value can be composed of a single string value, or multiple strings. For example, the preference <emphasis>foo</emphasis> can have <emphasis>value0</emphasis>, or <emphasis>value0</emphasis>, <emphasis>value1</emphasis>, and <emphasis>value2</emphasis>:
+ The <computeroutput><preference></computeroutput> element configures a preference as a key-value pair. This value can be composed of a single string value, for example, the preference <emphasis>fruit</emphasis> can have the <emphasis>apple</emphasis> value. As well, this value can be composed of multiple strings, for example, the preference <emphasis>fruits</emphasis> can have values of <emphasis>apple</emphasis>, <emphasis>orange</emphasis>, and <emphasis>kiwi</emphasis>:
</para>
<para>
<screen><