Author: bdaw Date: 2008-02-04 09:05:42 -0500 (Mon, 04 Feb 2008) New Revision: 9744 Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286Tag.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286TagTEI.java Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portlet/portlet_2_0.tld Log: make 286 taglib impl separate from 168 Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java 2008-02-04 13:53:04 UTC (rev 9743) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTag.java 2008-02-04 14:05:42 UTC (rev 9744) @@ -59,41 +59,13 @@ public int doEndTag() throws JspException { - RenderRequest rreq = getRenderRequest(); - RenderResponse rresp = getRenderResponse(); - ActionRequest areq = getActionRequest(); - ActionResponse aresp = getActionResponse(); - EventRequest ereq = getEventRequest(); - EventResponse eresp = getEventResponse(); - ResourceRequest rsreq = getResourceRequest(); - ResourceResponse rsresp = getResourceResponse(); + + RenderRequest rreq = (RenderRequest)getPortletRequest(); + RenderResponse rresp = (RenderResponse)getPortletResponse(); PortletConfig portletConfig = getConfig(); - PortletSession portletSession = getSession(); - Map<String, Object> portletSessionScope = getPortletSessionScope(); - PortletPreferences portletPreferences = getPortletPreferences(); - Map<String, String[]> portletPreferencesValues = getPortletPreferenceValues(); pageContext.setAttribute(DefineObjectsTagTEI.renderRequestVariableName, rreq); pageContext.setAttribute(DefineObjectsTagTEI.renderResponseVariableName, rresp); - pageContext.setAttribute(DefineObjectsTagTEI.actionRequestVariableName, areq); - pageContext.setAttribute(DefineObjectsTagTEI.actionResponseVariableName, aresp); - pageContext.setAttribute(DefineObjectsTagTEI.eventRequestVariableName, ereq); - pageContext.setAttribute(DefineObjectsTagTEI.eventResponseVariableName, eresp); - pageContext.setAttribute(DefineObjectsTagTEI.resourceRequestVariableName, rsreq); - pageContext.setAttribute(DefineObjectsTagTEI.resourceResponseVariableName, rsresp); pageContext.setAttribute(DefineObjectsTagTEI.portletConfigVariableName, portletConfig); - pageContext.setAttribute(DefineObjectsTagTEI.portletSessionVariableName, portletSession); - pageContext.setAttribute(DefineObjectsTagTEI.portletSessionScopeVariableName, portletSessionScope); - pageContext.setAttribute(DefineObjectsTagTEI.portletPreferencesVariableName, portletPreferences); - pageContext.setAttribute(DefineObjectsTagTEI.portletPreferencesValuesVariableName, portletPreferencesValues); - - -// RenderRequest rreq = (RenderRequest)getPortletRequest(); -// RenderResponse rresp = (RenderResponse)getPortletResponse(); -// PortletConfig portletConfig = getConfig(); -// pageContext.setAttribute(DefineObjectsTagTEI.renderRequestVariableName, rreq); -// pageContext.setAttribute(DefineObjectsTagTEI.renderResponseVariableName, rresp); -// pageContext.setAttribute(DefineObjectsTagTEI.portletConfigVariableName, portletConfig); - return EVAL_PAGE; } Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java 2008-02-04 13:53:04 UTC (rev 9743) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib/DefineObjectsTagTEI.java 2008-02-04 14:05:42 UTC (rev 9744) @@ -51,16 +51,6 @@ public static final String portletConfigVariableName = "portletConfig"; public static final String renderRequestVariableName = "renderRequest"; public static final String renderResponseVariableName = "renderResponse"; - public static final String actionRequestVariableName = "actionRequest"; - public static final String actionResponseVariableName = "actionResponse"; - public static final String resourceRequestVariableName = "resourceRequest"; - public static final String resourceResponseVariableName = "resourceResponse"; - public static final String eventRequestVariableName = "eventRequest"; - public static final String eventResponseVariableName = "eventResponse"; - public static final String portletSessionVariableName = "portletSession"; - public static final String portletSessionScopeVariableName = "portletSessionScope"; - public static final String portletPreferencesVariableName = "portletPreferences"; - public static final String portletPreferencesValuesVariableName = "portletPreferencesValues"; public VariableInfo[] getVariableInfo(TagData data) { @@ -70,30 +60,9 @@ RenderRequest.class.getName(), true, VariableInfo.AT_END); VariableInfo info3 = new VariableInfo(renderResponseVariableName, RenderResponse.class.getName(), true, VariableInfo.AT_END); - VariableInfo info4 = new VariableInfo(actionRequestVariableName, - ActionRequest.class.getName(), true, VariableInfo.AT_END); - VariableInfo info5 = new VariableInfo(actionResponseVariableName, - ActionResponse.class.getName(), true, VariableInfo.AT_END); - VariableInfo info6 = new VariableInfo(resourceRequestVariableName, - ResourceRequest.class.getName(), true, VariableInfo.AT_END); - VariableInfo info7 = new VariableInfo(resourceResponseVariableName, - ResourceResponse.class.getName(), true, VariableInfo.AT_END); - VariableInfo info8 = new VariableInfo(eventRequestVariableName, - EventRequest.class.getName(), true, VariableInfo.AT_END); - VariableInfo info9 = new VariableInfo(eventResponseVariableName, - EventResponse.class.getName(), true, VariableInfo.AT_END); - VariableInfo info10 = new VariableInfo(portletSessionVariableName, - PortletSession.class.getName(), true, VariableInfo.AT_END); - VariableInfo info11 = new VariableInfo(portletSessionScopeVariableName, - Map.class.getName(), true, VariableInfo.AT_END); - VariableInfo info12 = new VariableInfo(portletPreferencesVariableName, - PortletPreferences.class.getName(), true, VariableInfo.AT_END); - VariableInfo info13 = new VariableInfo(portletPreferencesValuesVariableName, - Map.class.getName(), true, VariableInfo.AT_END); - - VariableInfo[] info = {info1, info2, info3, info4, info5, info6, info7, info8, info9, info10, info11, info12, info13}; + VariableInfo[] info = {info1, info2, info3}; return info; } } Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286Tag.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286Tag.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286Tag.java 2008-02-04 14:05:42 UTC (rev 9744) @@ -0,0 +1,86 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.portlet.impl.jsr286.taglib; + +import org.jboss.portal.portlet.impl.jsr168.taglib.PortletTag; + +import javax.servlet.jsp.JspException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.portlet.PortletConfig; +import javax.portlet.PortletSession; +import javax.portlet.PortletPreferences; +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class DefineObjects286Tag extends PortletTag +{ + /** The serialVersionUID */ + private static final long serialVersionUID = -8640865649772583292L; + + public int doStartTag() throws JspException + { + return SKIP_BODY; + } + + public int doEndTag() throws JspException + { + RenderRequest rreq = getRenderRequest(); + RenderResponse rresp = getRenderResponse(); + ActionRequest areq = getActionRequest(); + ActionResponse aresp = getActionResponse(); + EventRequest ereq = getEventRequest(); + EventResponse eresp = getEventResponse(); + ResourceRequest rsreq = getResourceRequest(); + ResourceResponse rsresp = getResourceResponse(); + PortletConfig portletConfig = getConfig(); + PortletSession portletSession = getSession(); + Map<String, Object> portletSessionScope = getPortletSessionScope(); + PortletPreferences portletPreferences = getPortletPreferences(); + Map<String, String[]> portletPreferencesValues = getPortletPreferenceValues(); + pageContext.setAttribute(DefineObjects286TagTEI.renderRequestVariableName, rreq); + pageContext.setAttribute(DefineObjects286TagTEI.renderResponseVariableName, rresp); + pageContext.setAttribute(DefineObjects286TagTEI.actionRequestVariableName, areq); + pageContext.setAttribute(DefineObjects286TagTEI.actionResponseVariableName, aresp); + pageContext.setAttribute(DefineObjects286TagTEI.eventRequestVariableName, ereq); + pageContext.setAttribute(DefineObjects286TagTEI.eventResponseVariableName, eresp); + pageContext.setAttribute(DefineObjects286TagTEI.resourceRequestVariableName, rsreq); + pageContext.setAttribute(DefineObjects286TagTEI.resourceResponseVariableName, rsresp); + pageContext.setAttribute(DefineObjects286TagTEI.portletConfigVariableName, portletConfig); + pageContext.setAttribute(DefineObjects286TagTEI.portletSessionVariableName, portletSession); + pageContext.setAttribute(DefineObjects286TagTEI.portletSessionScopeVariableName, portletSessionScope); + pageContext.setAttribute(DefineObjects286TagTEI.portletPreferencesVariableName, portletPreferences); + pageContext.setAttribute(DefineObjects286TagTEI.portletPreferencesValuesVariableName, portletPreferencesValues); + + return EVAL_PAGE; + } +} Added: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286TagTEI.java =================================================================== --- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286TagTEI.java (rev 0) +++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/impl/jsr286/taglib/DefineObjects286TagTEI.java 2008-02-04 14:05:42 UTC (rev 9744) @@ -0,0 +1,95 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.portal.portlet.impl.jsr286.taglib; + +import javax.servlet.jsp.tagext.VariableInfo; +import javax.servlet.jsp.tagext.TagData; +import javax.servlet.jsp.tagext.TagExtraInfo; +import javax.portlet.PortletConfig; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.ResourceRequest; +import javax.portlet.ResourceResponse; +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.PortletSession; +import javax.portlet.PortletPreferences; +import java.util.Map; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class DefineObjects286TagTEI extends TagExtraInfo +{ + public static final String portletConfigVariableName = "portletConfig"; + public static final String renderRequestVariableName = "renderRequest"; + public static final String renderResponseVariableName = "renderResponse"; + public static final String actionRequestVariableName = "actionRequest"; + public static final String actionResponseVariableName = "actionResponse"; + public static final String resourceRequestVariableName = "resourceRequest"; + public static final String resourceResponseVariableName = "resourceResponse"; + public static final String eventRequestVariableName = "eventRequest"; + public static final String eventResponseVariableName = "eventResponse"; + public static final String portletSessionVariableName = "portletSession"; + public static final String portletSessionScopeVariableName = "portletSessionScope"; + public static final String portletPreferencesVariableName = "portletPreferences"; + public static final String portletPreferencesValuesVariableName = "portletPreferencesValues"; + + public VariableInfo[] getVariableInfo(TagData data) + { + VariableInfo info1 = new VariableInfo(portletConfigVariableName, + PortletConfig.class.getName(), true, VariableInfo.AT_END); + VariableInfo info2 = new VariableInfo(renderRequestVariableName, + RenderRequest.class.getName(), true, VariableInfo.AT_END); + VariableInfo info3 = new VariableInfo(renderResponseVariableName, + RenderResponse.class.getName(), true, VariableInfo.AT_END); + VariableInfo info4 = new VariableInfo(actionRequestVariableName, + ActionRequest.class.getName(), true, VariableInfo.AT_END); + VariableInfo info5 = new VariableInfo(actionResponseVariableName, + ActionResponse.class.getName(), true, VariableInfo.AT_END); + VariableInfo info6 = new VariableInfo(resourceRequestVariableName, + ResourceRequest.class.getName(), true, VariableInfo.AT_END); + VariableInfo info7 = new VariableInfo(resourceResponseVariableName, + ResourceResponse.class.getName(), true, VariableInfo.AT_END); + VariableInfo info8 = new VariableInfo(eventRequestVariableName, + EventRequest.class.getName(), true, VariableInfo.AT_END); + VariableInfo info9 = new VariableInfo(eventResponseVariableName, + EventResponse.class.getName(), true, VariableInfo.AT_END); + VariableInfo info10 = new VariableInfo(portletSessionVariableName, + PortletSession.class.getName(), true, VariableInfo.AT_END); + VariableInfo info11 = new VariableInfo(portletSessionScopeVariableName, + Map.class.getName(), true, VariableInfo.AT_END); + VariableInfo info12 = new VariableInfo(portletPreferencesVariableName, + PortletPreferences.class.getName(), true, VariableInfo.AT_END); + VariableInfo info13 = new VariableInfo(portletPreferencesValuesVariableName, + Map.class.getName(), true, VariableInfo.AT_END); + + + + VariableInfo[] info = {info1, info2, info3, info4, info5, info6, info7, info8, info9, info10, info11, info12, info13}; + return info; + } +} Modified: modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portlet/portlet_2_0.tld =================================================================== --- modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portlet/portlet_2_0.tld 2008-02-04 13:53:04 UTC (rev 9743) +++ modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portlet/portlet_2_0.tld 2008-02-04 14:05:42 UTC (rev 9744) @@ -63,8 +63,8 @@ <tag> <name>defineObjects</name> - <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTag</tag-class> - <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI</tei-class> + <tag-class>org.jboss.portal.portlet.impl.jsr286.taglib.DefineObjects286Tag</tag-class> + <tei-class>org.jboss.portal.portlet.impl.jsr286.taglib.DefineObjects286TagTEI</tei-class> <body-content>empty</body-content> </tag>