morciuch 2002/11/11 14:35:19
Modified: src/java/org/apache/jetspeed/services/jsp/tags
JetspeedPaneTag.java
xdocs changes.xml
docs/site changes.html
Log:
Added support for maximize mode (see Bugzilla bug# 11264
Revision Changes Path
1.4 +24 -40
jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPaneTag.java
Index: JetspeedPaneTag.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/jsp/tags/JetspeedPaneTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JetspeedPaneTag.java 17 Jul 2001 16:44:41 -0000 1.3
+++ JetspeedPaneTag.java 11 Nov 2002 22:35:18 -0000 1.4
@@ -54,26 +54,20 @@
* <http://www.apache.org/>.
*/
-import java.util.*;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
+//import java.util.*;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
// Turbine Classes
import org.apache.turbine.util.Log;
import org.apache.turbine.services.jsp.JspService;
import org.apache.ecs.ConcreteElement;
-import org.apache.ecs.StringElement;
-import org.apache.jetspeed.om.profile.PSMLDocument;
-import org.apache.jetspeed.services.PortalToolkit;
-import org.apache.jetspeed.services.PsmlManager;
import org.apache.jetspeed.services.resources.JetspeedResources;
import org.apache.jetspeed.services.rundata.JetspeedRunData;
-import org.apache.jetspeed.services.Profiler;
-import org.apache.jetspeed.om.profile.PSMLDocument;
-import org.apache.jetspeed.om.profile.Profile;
-import org.apache.jetspeed.om.profile.ProfileException;
+import org.apache.jetspeed.util.template.JetspeedTool;
/**
* Supporting class for the pane tag.
@@ -81,6 +75,7 @@
* current JSP page
*
* @author <a href="mailto:raphael@;apache.org">Raphaël Luta</a>
+ * @author <a href="mailto:morciuch@;apache.org">Mark Orciuch</a>
* @version $Id$
*/
public class JetspeedPaneTag extends TagSupport
@@ -105,7 +100,7 @@
*/
public int doStartTag() throws JspException
{
- JetspeedRunData data =
(JetspeedRunData)pageContext.getAttribute(JspService.RUNDATA,
PageContext.REQUEST_SCOPE);
+ JetspeedRunData data = (JetspeedRunData)
pageContext.getAttribute(JspService.RUNDATA, PageContext.REQUEST_SCOPE);
// retrieve the name attribute val
if (this.name == null)
@@ -118,44 +113,31 @@
pageContext.getOut().flush();
ConcreteElement result = new ConcreteElement();
-
- if (null != data)
+
+ if (data != null && data.getUser() != null)
{
- Profile profile = data.getProfile();
- try
+ JetspeedTool jt = new JetspeedTool(data);
+ String jspeid = (String) data.getUser().getTemp("js_peid");
+ if (jspeid != null)
{
- if (null == profile)
- {
- profile = Profiler.getProfile(data);
- data.setProfile(profile);
- }
-
- if ((name == null) || Profiler.DEFAULT_PROFILE.equals(name) ||
"".equals(name))
- ;
- else
- profile.setName(name);
-
- PSMLDocument doc = profile.getDocument();
- if (null != doc)
- {
- result =
PortalToolkit.getSet(doc.getPortlets()).getContent(data);
- }
+ data.setMode(JetspeedRunData.MAXIMIZE);
+ result = jt.getPortletById(jspeid);
}
- catch (ProfileException e)
+ else
{
- Log.error(e);
+ result = jt.getPane(this.name);
}
}
-
+
// Check whether this is an "old" screen (that returns a
ConcreteElement)
// or a "new" one that returns null.
- if ( result != null )
+ if (result != null)
{
//The ECS element must serialize in the character encoding
// of the response
- result.setCodeSet( data.getResponse().getCharacterEncoding() );
+ result.setCodeSet(data.getResponse().getCharacterEncoding());
- result.output( data.getResponse().getWriter() );
+ result.output(data.getResponse().getWriter());
}
}
@@ -167,7 +149,9 @@
{
data.getOut().print("Error processing ecs screen '" + name + "'.
See log for more information.");
}
- catch(java.io.IOException ioe) {}
+ catch (java.io.IOException ioe)
+ {
+ }
}
return SKIP_BODY;
}
1.88 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- changes.xml 9 Nov 2002 16:23:26 -0000 1.87
+++ changes.xml 11 Nov 2002 22:35:19 -0000 1.88
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Fix - Bug # 11264 - 2002/11/8 - Modified JetspeedPaneTag to support maximize mode
when JSP is the default template engine (MO)
+</li>
+<li>
Fix - Bug # 11956 - 2002/11/8 - Changed default PSML security settings to improve
security (RL)
</li>
<li>
1.67 +3 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- changes.html 9 Nov 2002 17:01:10 -0000 1.66
+++ changes.html 11 Nov 2002 22:35:19 -0000 1.67
@@ -131,6 +131,9 @@
</li>
-->
<li>
+ Fix - Bug # 11264 - 2002/11/8 - Modified JetspeedPaneTag to support maximize mode
when JSP is the default template engine (MO)
+</li>
+<li>
Fix - Bug # 11956 - 2002/11/8 - Changed default PSML security settings to improve
security (RL)
</li>
<li>
--
To unsubscribe, e-mail: <mailto:jetspeed-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@;jakarta.apache.org>
