You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by mo...@apache.org on 2002/10/03 23:50:41 UTC
cvs commit: jakarta-jetspeed/xdocs changes.xml portlet_config_common.xml
morciuch 2002/10/03 14:50:41
Modified: docs/site changes.html portlet_config_common.html
src/java/org/apache/jetspeed/services/portaltoolkit
JetspeedPortalToolkitService.java
xdocs changes.xml portlet_config_common.xml
Log:
Implemented "_control" parameter for portlet registry entries. Patch to JetspeedPortalToolkitService submitted by Scott Weaver.
Revision Changes Path
1.59 +4 -1 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- changes.html 15 Sep 2002 14:26:19 -0000 1.58
+++ changes.html 3 Oct 2002 21:50:41 -0000 1.59
@@ -129,6 +129,9 @@
</li>
-->
<li>
+ Add - 2002/10/03 - Implemented "_control" parameter for portlet registry entries (MO) Thanks to Scott Weaver.
+</li>
+<li>
Fix - Bug # 10484 - 2002/09/15 - .xreg file are now read and written in UTF-8 encoding (PS) Thanks to Shinsuke.
</li>
<li>
@@ -154,7 +157,7 @@
screen when the user does not have customize permission. (PS)
</li>
<li>
- Update - 2002/09/01 - Updated the folloing jars: (PS)
+ Update - 2002/09/01 - Updated the following jars: (PS)
<ul>
<li>Log4j to v1.2.6</li>
<li>Xalan to v2.3.1</li>
1.16 +17 -0 jakarta-jetspeed/docs/site/portlet_config_common.html
Index: portlet_config_common.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/portlet_config_common.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- portlet_config_common.html 20 Aug 2002 17:40:00 -0000 1.15
+++ portlet_config_common.html 3 Oct 2002 21:50:41 -0000 1.16
@@ -647,6 +647,23 @@
</font>
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ _control
+ </font>
+</td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
+ <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+
+ Overrides default portlet control with control specified.
+ <p>This parameter can be set in PSML or in the .xreg files.</p>
+ <p>If not present, default portlet control, as specified by <code>services.PortalToolkit.default.control</code>, is used.</p>
+ <p>This parameter was added in version 1.4b2.</p>
+
+ </font>
+</td>
+ </tr>
</table>
</blockquote>
</p>
1.22 +30 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java
Index: JetspeedPortalToolkitService.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- JetspeedPortalToolkitService.java 30 Jun 2002 05:23:19 -0000 1.21
+++ JetspeedPortalToolkitService.java 3 Oct 2002 21:50:41 -0000 1.22
@@ -201,6 +201,34 @@
return pc;
}
+
+
+ protected PortletControl getControl( Control control, PortletEntry entry )
+ {
+ PortletControl pc = null;
+
+ if (control != null)
+ {
+ pc = getControl(control.getName());
+ pc.getConfig().getInitParameters().putAll(getParameters(control));
+ }
+ else
+ {
+ org.apache.jetspeed.om.registry.Parameter dftPortletCtrl =
+ entry.getParameter("_control");
+
+ if (dftPortletCtrl != null)
+ {
+ pc = getControl(dftPortletCtrl.getValue());
+ }
+ else if (defaultControl != null)
+ {
+ pc = getControl(this.defaultControl);
+ }
+ }
+
+ return pc;
+ }
/**
@@ -430,7 +458,7 @@
Map constraints = getParameters(psmlEntry.getLayout());
int position = getPosition( psmlEntry.getLayout() );
- PortletControl control = getControl(psmlEntry.getControl());
+ PortletControl control = getControl(psmlEntry.getControl(), entry);
set.addPortlet( initControl(control,p),
controller.getConstraints( constraints ),
1.77 +5 -2 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- changes.xml 15 Sep 2002 14:26:19 -0000 1.76
+++ changes.xml 3 Oct 2002 21:50:41 -0000 1.77
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Add - 2002/10/03 - Implemented "_control" parameter for portlet registry entries (MO) Thanks to Scott Weaver.
+</li>
+<li>
Fix - Bug # 10484 - 2002/09/15 - .xreg file are now read and written in UTF-8 encoding (PS) Thanks to Shinsuke.
</li>
<li>
@@ -48,7 +51,7 @@
screen when the user does not have customize permission. (PS)
</li>
<li>
- Update - 2002/09/01 - Updated the folloing jars: (PS)
+ Update - 2002/09/01 - Updated the following jars: (PS)
<ul>
<li>Log4j to v1.2.6</li>
<li>Xalan to v2.3.1</li>
1.9 +11 -0 jakarta-jetspeed/xdocs/portlet_config_common.xml
Index: portlet_config_common.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/portlet_config_common.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- portlet_config_common.xml 20 Aug 2002 17:39:35 -0000 1.8
+++ portlet_config_common.xml 3 Oct 2002 21:50:41 -0000 1.9
@@ -336,6 +336,17 @@
<p>This parameter was added in version 1.3a3.</p>
</td>
</tr>
+
+ <tr>
+ <td>_control</td>
+ <td>
+ Overrides default portlet control with control specified.
+ <p>This parameter can be set in PSML or in the .xreg files.</p>
+ <p>If not present, default portlet control, as specified by <code>services.PortalToolkit.default.control</code>, is used.</p>
+ <p>This parameter was added in version 1.4b2.</p>
+ </td>
+ </tr>
+
</table>
</section>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>