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/30 23:56:13 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld template.tld
morciuch 2002/10/30 14:56:13
Modified: src/java/org/apache/jetspeed/services/jsp/tags
JetspeedPortletTag.java
webapp/WEB-INF/templates/jsp/portlets/html
JSP1_1andJetspeedTagLib.jsp
webapp/WEB-INF/templates/jsp/tld template.tld
Log:
Enhanced JetspeedPortletTag to allow for displaying portlets in psml other than the current one. This is achieved via specifying a psml path in optional "psml" parameter. Updated JSP1_1andJetspeedTagLib portlet with example usage.
Revision Changes Path
1.5 +34 -2 jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java
Index: JetspeedPortletTag.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPortletTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JetspeedPortletTag.java 22 Mar 2002 18:51:56 -0000 1.4
+++ JetspeedPortletTag.java 30 Oct 2002 22:56:13 -0000 1.5
@@ -70,6 +70,10 @@
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
import org.apache.jetspeed.om.profile.Entry;
+import org.apache.jetspeed.om.profile.BaseProfileLocator;
+import org.apache.jetspeed.om.profile.ProfileLocator;
+import org.apache.jetspeed.om.profile.Profile;
+import org.apache.jetspeed.services.Profiler;
/**
* Supporting class for the portlet tag.
@@ -82,6 +86,7 @@
public class JetspeedPortletTag extends TagSupport
{
private String name = null;
+ private String psml = null;
public void setName(String name)
{
@@ -93,6 +98,16 @@
return this.name;
}
+ public void setPsml(String psml)
+ {
+ this.psml = psml;
+ }
+
+ public String getPsml()
+ {
+ return this.psml;
+ }
+
/**
* Method called when the tag is encountered to send attributes to the
* output stream
@@ -114,7 +129,24 @@
pageContext.getOut().flush();
ConcreteElement result = new ConcreteElement();
- Entry entry = data.getProfile().getDocument().getEntry(name);
+ Entry entry = null;
+
+ if (this.psml != null)
+ {
+ ProfileLocator baseLocator = new BaseProfileLocator();
+ baseLocator.createFromPath(this.psml);
+ Profile baseProfile = Profiler.getProfile(baseLocator);
+ if (baseProfile != null)
+ {
+ entry = baseProfile.getDocument().getEntry(name);
+ Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from psml [" + this.psml);
+ }
+ }
+ else
+ {
+ entry = data.getProfile().getDocument().getEntry(name);
+ Log.debug("JetspeedPortletTag: retrieved [" + entry + "] from current psml");
+ }
if (entry != null)
{
1.3 +8 -1 jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/JSP1_1andJetspeedTagLib.jsp
Index: JSP1_1andJetspeedTagLib.jsp
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/portlets/html/JSP1_1andJetspeedTagLib.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JSP1_1andJetspeedTagLib.jsp 11 Oct 2002 16:11:13 -0000 1.2
+++ JSP1_1andJetspeedTagLib.jsp 30 Oct 2002 22:56:13 -0000 1.3
@@ -116,12 +116,19 @@
<table>
<tr>
<th>name</th>
+ <th>psml</th>
<th>Returned Value</th>
</tr>
<tr>
+ <td>HelloVelocity</td>
+ <td>user/turbine/media-type/html/page/default.psml</td>
+ <td><jetspeed:portlet name="HelloVelocity" psml="user/turbine/media-type/html/page/default.psml"/></td>
+ </tr>
+ <tr>
<td>JetspeedFramed <SMALL><p>(you will need JetspeedFramed in your profile in order for this to work)</P></SMALL></td>
+ <td> </td>
<td><jetspeed:portlet name="JetspeedFramed"/></td>
- </tr>
+ </tr>
</table>
<hr/>
1.10 +5 -0 jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld/template.tld
Index: template.tld
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/jsp/tld/template.tld,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- template.tld 6 Jul 2001 16:29:45 -0000 1.9
+++ template.tld 30 Oct 2002 22:56:13 -0000 1.10
@@ -30,6 +30,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
+ <attribute>
+ <name>psml</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
</tag>
<tag>
<name>info</name>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>