From portal-commits at lists.jboss.org Mon Feb  4 08:57:05 2008
Content-Type: multipart/mixed; boundary="===============2386925539025218194=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r9743 - in modules/portlet/trunk:
 portlet/src/main/java/org/jboss/portal/portlet/impl/jsr168/taglib and 8 other
 directories.
Date: Mon, 04 Feb 2008 08:53:04 -0500
Message-ID: <E1JM1ku-00063G-Qh@committer01.frg.pub.inap.atl.jboss.com>

--===============2386925539025218194==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: bdaw
Date: 2008-02-04 08:53:04 -0500 (Mon, 04 Feb 2008)
New Revision: 9743

Added:
   modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portle=
t/portlet_2_0.tld
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/
   modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portle=
t/jsr286/tck/taglib/DefineObjectsTestCase.java
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB-=
INF/
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB-=
INF/portlet.xml
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB-=
INF/web.xml
   modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/tagl=
ib.jsp
Modified:
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/api/PortletSessionImpl.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/DefineObjectsTag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/DefineObjectsTagTEI.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/GenerateURLTag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/NamespaceTag.java
   modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/imp=
l/jsr168/taglib/PortletTag.java
   modules/portlet/trunk/test/src/test/build.xml
   modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xml
Log:
- strart of Portlet 2.0 taglib
- defineObjects tag and testcase

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/api/PortletSessionImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletSessionImpl.java	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/api/PortletSessionImpl.java	2008-02-04 13:53:04 UTC (rev 9743)
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Collections;
 import java.util.ArrayList;
+import java.util.HashMap;
 =

 /**
  * @author <a href=3D"mailto:julien(a)jboss.org">Julien Viet</a>
@@ -206,12 +207,19 @@
 =

    public Map<String, Object> getAttributeMap()
    {
-      throw new NotYetImplemented();
+      return getAttributeMap(PortletSession.PORTLET_SCOPE);
    }
 =

    public Map<String, Object> getAttributeMap(int i)
    {
-      throw new NotYetImplemented();
+      Enumeration attributes =3D getAttributeNames(i);
+      Map<String, Object> attrs =3D new HashMap<String, Object>();
+      while (attributes.hasMoreElements())
+      {
+         String name =3D (String)attributes.nextElement();
+         attrs.put(name, getAttribute(name));
+      }
+      return Collections.unmodifiableMap(attrs);
    }
 =

    /**

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/DefineObjectsTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/DefineObjectsTag.java	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/DefineObjectsTag.java	2008-02-04 13:53:04 UTC (rev 9743)
@@ -25,12 +25,24 @@
 import javax.portlet.PortletConfig;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.PortletSession;
+import javax.portlet.PortletPreferences;
 import javax.servlet.jsp.JspException;
+import java.util.Map;
 =

 /**
  * The defineObjects tag for the JSR 168 Portlet specification.
  *
  * @author <a href=3D"mailto:sgwood(a)ix.netcom.com">Sherman Wood</a>
+ * @author <a href=3D"mailto:boleslaw dot dawidowicz at redhat anotherdot =
com">Boleslaw Dawidowicz</a>
  * @version $Revision: 5448 $
  * @jsp.tag name=3D"defineObjects" body-content=3D"empty" tei-class=3D"org=
.jboss.portal.portlet.impl.jsr168.taglib.DefineObjectsTagTEI"
  */
@@ -47,12 +59,42 @@
 =

    public int doEndTag() throws JspException
    {
-      RenderRequest rreq =3D getRequest();
-      RenderResponse rresp =3D getResponse();
+      RenderRequest rreq =3D getRenderRequest();
+      RenderResponse rresp =3D getRenderResponse();
+      ActionRequest areq =3D getActionRequest();
+      ActionResponse aresp =3D getActionResponse();
+      EventRequest ereq =3D getEventRequest();
+      EventResponse eresp =3D getEventResponse();
+      ResourceRequest rsreq =3D getResourceRequest();
+      ResourceResponse rsresp =3D getResourceResponse();
       PortletConfig portletConfig =3D getConfig();
+      PortletSession portletSession =3D getSession();
+      Map<String, Object> portletSessionScope =3D getPortletSessionScope();
+      PortletPreferences portletPreferences =3D getPortletPreferences();
+      Map<String, String[]> portletPreferencesValues =3D getPortletPrefere=
nceValues();
       pageContext.setAttribute(DefineObjectsTagTEI.renderRequestVariableNa=
me, rreq);
       pageContext.setAttribute(DefineObjectsTagTEI.renderResponseVariableN=
ame, rresp);
+      pageContext.setAttribute(DefineObjectsTagTEI.actionRequestVariableNa=
me, areq);
+      pageContext.setAttribute(DefineObjectsTagTEI.actionResponseVariableN=
ame, aresp);
+      pageContext.setAttribute(DefineObjectsTagTEI.eventRequestVariableNam=
e, ereq);
+      pageContext.setAttribute(DefineObjectsTagTEI.eventResponseVariableNa=
me, eresp);
+      pageContext.setAttribute(DefineObjectsTagTEI.resourceRequestVariable=
Name, rsreq);
+      pageContext.setAttribute(DefineObjectsTagTEI.resourceResponseVariabl=
eName, rsresp);
       pageContext.setAttribute(DefineObjectsTagTEI.portletConfigVariableNa=
me, portletConfig);
+      pageContext.setAttribute(DefineObjectsTagTEI.portletSessionVariableN=
ame, portletSession);
+      pageContext.setAttribute(DefineObjectsTagTEI.portletSessionScopeVari=
ableName, portletSessionScope);
+      pageContext.setAttribute(DefineObjectsTagTEI.portletPreferencesVaria=
bleName, portletPreferences);
+      pageContext.setAttribute(DefineObjectsTagTEI.portletPreferencesValue=
sVariableName, portletPreferencesValues);
+
+
+//      RenderRequest rreq =3D (RenderRequest)getPortletRequest();
+//      RenderResponse rresp =3D (RenderResponse)getPortletResponse();
+//      PortletConfig portletConfig =3D getConfig();
+//      pageContext.setAttribute(DefineObjectsTagTEI.renderRequestVariable=
Name, rreq);
+//      pageContext.setAttribute(DefineObjectsTagTEI.renderResponseVariabl=
eName, rresp);
+//      pageContext.setAttribute(DefineObjectsTagTEI.portletConfigVariable=
Name, portletConfig);
+
+      =

       return EVAL_PAGE;
    }
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/DefineObjectsTagTEI.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/DefineObjectsTagTEI.java	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/DefineObjectsTagTEI.java	2008-02-04 13:53:04 UTC (rev 9743)
@@ -25,14 +25,25 @@
 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 javax.servlet.jsp.tagext.TagData;
 import javax.servlet.jsp.tagext.TagExtraInfo;
 import javax.servlet.jsp.tagext.VariableInfo;
+import java.util.Map;
+import java.util.HashMap;
 =

 /**
  * The additional variable definitions for the defineObjects tag for the J=
SR 168 Portlet specification.
  *
  * @author <a href=3D"mailto:sgwood(a)ix.netcom.com">Sherman Wood</a>
+ * @author <a href=3D"mailto:boleslaw dot dawidowicz at redhat anotherdot =
com">Boleslaw Dawidowicz</a>
  * @version $Revision: 5448 $
  */
 public class DefineObjectsTagTEI extends TagExtraInfo
@@ -40,6 +51,16 @@
    public static final String portletConfigVariableName =3D "portletConfig=
";
    public static final String renderRequestVariableName =3D "renderRequest=
";
    public static final String renderResponseVariableName =3D "renderRespon=
se";
+   public static final String actionRequestVariableName =3D "actionRequest=
";
+   public static final String actionResponseVariableName =3D "actionRespon=
se";
+   public static final String resourceRequestVariableName =3D "resourceReq=
uest";
+   public static final String resourceResponseVariableName =3D "resourceRe=
sponse";
+   public static final String eventRequestVariableName =3D "eventRequest";
+   public static final String eventResponseVariableName =3D "eventResponse=
";
+   public static final String portletSessionVariableName =3D "portletSessi=
on";
+   public static final String portletSessionScopeVariableName =3D "portlet=
SessionScope";
+   public static final String portletPreferencesVariableName =3D "portletP=
references";
+   public static final String portletPreferencesValuesVariableName =3D "po=
rtletPreferencesValues";
 =

    public VariableInfo[] getVariableInfo(TagData data)
    {
@@ -49,7 +70,30 @@
          RenderRequest.class.getName(), true, VariableInfo.AT_END);
       VariableInfo info3 =3D new VariableInfo(renderResponseVariableName,
          RenderResponse.class.getName(), true, VariableInfo.AT_END);
-      VariableInfo[] info =3D {info1, info2, info3};
+      VariableInfo info4 =3D new VariableInfo(actionRequestVariableName,
+         ActionRequest.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info5 =3D new VariableInfo(actionResponseVariableName,
+         ActionResponse.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info6 =3D new VariableInfo(resourceRequestVariableName,
+         ResourceRequest.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info7 =3D new VariableInfo(resourceResponseVariableName,
+         ResourceResponse.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info8 =3D new VariableInfo(eventRequestVariableName,
+         EventRequest.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info9 =3D new VariableInfo(eventResponseVariableName,
+         EventResponse.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info10 =3D new VariableInfo(portletSessionVariableName,
+         PortletSession.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info11 =3D new VariableInfo(portletSessionScopeVariable=
Name,
+         Map.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info12 =3D new VariableInfo(portletPreferencesVariableN=
ame,
+         PortletPreferences.class.getName(), true, VariableInfo.AT_END);
+      VariableInfo info13 =3D new VariableInfo(portletPreferencesValuesVar=
iableName,
+         Map.class.getName(), true, VariableInfo.AT_END);
+
+
+
+      VariableInfo[] info =3D {info1, info2, info3, info4, info5, info6, i=
nfo7, info8, info9, info10, info11, info12, info13};
       return info;
    }
 }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/GenerateURLTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/GenerateURLTag.java	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/GenerateURLTag.java	2008-02-04 13:53:04 UTC (rev 9743)
@@ -24,6 +24,7 @@
 =

 import org.jboss.portal.portlet.impl.jsr168.api.RenderRequestImpl;
 import org.jboss.portal.portlet.impl.jsr168.api.PortletURLImpl;
+import org.jboss.portal.portlet.impl.jsr168.api.PortletRequestImpl;
 =

 import javax.portlet.PortletMode;
 import javax.portlet.PortletModeException;
@@ -31,6 +32,7 @@
 import javax.portlet.PortletURL;
 import javax.portlet.WindowState;
 import javax.portlet.WindowStateException;
+import javax.portlet.RenderRequest;
 import javax.servlet.jsp.JspException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -186,7 +188,7 @@
     */
    private PortletURL getBasePortletEnvironmentAndURL()
    {
-      RenderRequestImpl preq =3D getRequest();
+      PortletRequestImpl preq =3D (PortletRequestImpl)getPortletRequest();
 =

       // Create the URL
       if ("action".equals(getTypeValue()))

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/NamespaceTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/NamespaceTag.java	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/NamespaceTag.java	2008-02-04 13:53:04 UTC (rev 9743)
@@ -23,6 +23,7 @@
 package org.jboss.portal.portlet.impl.jsr168.taglib;
 =

 import javax.portlet.RenderResponse;
+import javax.portlet.PortletResponse;
 import javax.servlet.jsp.JspException;
 import java.io.IOException;
 =

@@ -54,7 +55,7 @@
    {
       try
       {
-         RenderResponse resp =3D getResponse();
+         PortletResponse resp =3D getPortletResponse();
          String namespace =3D resp.getNamespace();
          pageContext.getOut().print(namespace);
       }

Modified: modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/port=
let/impl/jsr168/taglib/PortletTag.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/PortletTag.java	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/portlet/src/main/java/org/jboss/portal/portlet/im=
pl/jsr168/taglib/PortletTag.java	2008-02-04 13:53:04 UTC (rev 9743)
@@ -28,9 +28,23 @@
 =

 import javax.portlet.PortletConfig;
 import javax.portlet.RenderResponse;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.portlet.RenderRequest;
+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.PortletSession;
+import javax.portlet.PortletPreferences;
 import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.tagext.TagSupport;
+import java.util.Map;
+import java.util.Collections;
+import java.util.HashMap;
 =

 /**
  * Superclass of the portlet tags for the JSR 168 Portlet specification.
@@ -38,6 +52,7 @@
  * Provides hooks into the portlet environment
  *
  * @author <a href=3D"mailto:sgwood(a)ix.netcom.com">Sherman Wood</a>
+ * @author <a href=3D"mailto:boleslaw dot dawidowicz at redhat anotherdot =
com">Boleslaw Dawidowicz</a>
  * @version $Revision: 5448 $
  */
 public class PortletTag extends TagSupport
@@ -52,16 +67,16 @@
       return invocation.getDispatchedRequest();
    }
 =

-   protected RenderRequestImpl getRequest()
+   protected PortletRequest getPortletRequest()
    {
       HttpServletRequest dreq =3D getDispatchedRequest();
-      return (RenderRequestImpl)dreq.getAttribute("javax.portlet.request");
+      return (PortletRequest)dreq.getAttribute("javax.portlet.request");
    }
 =

-   protected RenderResponse getResponse()
+   protected PortletResponse getPortletResponse()
    {
       HttpServletRequest dreq =3D getDispatchedRequest();
-      return (RenderResponse)dreq.getAttribute("javax.portlet.response");
+      return (PortletResponse)dreq.getAttribute("javax.portlet.response");
    }
 =

    protected PortletConfig getConfig()
@@ -70,6 +85,128 @@
       return (PortletConfig)dreq.getAttribute("javax.portlet.config");
    }
 =

+   protected RenderRequest getRenderRequest()
+   {
+      if (getPortletRequest() instanceof RenderRequest)
+      {
+         return (RenderRequest)getPortletRequest();
+      }
+      else
+      {
+         return null;
+      }
+   }
+   protected RenderResponse getRenderResponse()
+   {
+      if (getPortletResponse() instanceof RenderResponse)
+      {
+         return (RenderResponse)getPortletResponse();
+      }
+      else
+      {
+         return null;
+      }
+   }
+
+   protected ActionRequest getActionRequest()
+   {
+      if (getPortletRequest() instanceof ActionRequest)
+      {
+         return (ActionRequest)getPortletRequest();
+      }
+      else
+      {
+         return null;
+      }
+   }
+   protected ActionResponse getActionResponse()
+   {
+      if (getPortletResponse() instanceof ActionResponse)
+      {
+         return (ActionResponse)getPortletResponse();
+      }
+      else
+      {
+         return null;
+      }
+   }
+
+   protected EventRequest getEventRequest()
+   {
+      if (getPortletRequest() instanceof EventRequest)
+      {
+         return (EventRequest)getPortletRequest();
+      }
+      else
+      {
+         return null;
+      }
+   }
+   protected EventResponse getEventResponse()
+   {
+      if (getPortletResponse() instanceof EventResponse)
+      {
+         return (EventResponse)getPortletResponse();
+      }
+      else
+      {
+         return null;
+      }
+   }
+
+   protected ResourceRequest getResourceRequest()
+   {
+      if (getPortletRequest() instanceof ResourceRequest)
+      {
+         return (ResourceRequest)getPortletRequest();
+      }
+      else
+      {
+         return null;
+      }
+   }
+   protected ResourceResponse getResourceResponse()
+   {
+      if (getPortletResponse() instanceof ResourceResponse)
+      {
+         return (ResourceResponse)getPortletResponse();
+      }
+      else
+      {
+         return null;
+      }
+   }
+
+
+
+
+   protected PortletSession getSession()
+   {
+      return getPortletRequest().getPortletSession(false);
+   }
+
+   protected Map<String, Object> getPortletSessionScope()
+   {
+      if (getSession() !=3D null)
+      {
+         return getSession().getAttributeMap();
+      }
+      else
+      {
+         return new HashMap<String, Object>();
+      }
+   }
+
+   protected PortletPreferences getPortletPreferences()
+   {
+      return getPortletRequest().getPreferences();
+   }
+
+   protected Map<String, String[]> getPortletPreferenceValues()
+   {
+      return getPortletPreferences().getMap();
+   }
+
    /**
     * Set up the environment for accessing the portlat environment
     *

Added: modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/po=
rtlet/portlet_2_0.tld
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portl=
et/portlet_2_0.tld	                        (rev 0)
+++ modules/portlet/trunk/portlet/src/main/resources/org/jboss/portal/portl=
et/portlet_2_0.tld	2008-02-04 13:53:04 UTC (rev 9743)
@@ -0,0 +1,108 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+
+   <taglib xmlns=3D"http://java.sun.com/xml/ns/j2ee"
+ 	    xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+ 	    xsi:schemaLocation=3D"http://java.sun.com/xml/ns/j2ee http://java.su=
n.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+ 	    version=3D"2.0">
+
+   <description>Portlet 2.0 Tag Library</description>
+   <display-name>Portlet 2.0 Tags</display-name>
+   <tlib-version>2.0</tlib-version>
+   <short-name>portlet</short-name>
+   <uri>http://java.sun.com/portlet_2_0</uri>
+
+   <tag>
+
+      <name>param</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.URLParameterT=
ag</tag-class>
+      <body-content>empty</body-content>
+
+      <attribute>
+         <name>name</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>value</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>renderURL</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.RenderURLTag<=
/tag-class>
+      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTa=
gTEI</tei-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <name>portletMode</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>secure</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>var</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>windowState</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>defineObjects</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjects=
Tag</tag-class>
+      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.DefineObjects=
TagTEI</tei-class>
+      <body-content>empty</body-content>
+
+   </tag>
+   <tag>
+
+      <name>actionURL</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.ActionURLTag<=
/tag-class>
+      <tei-class>org.jboss.portal.portlet.impl.jsr168.taglib.GenerateURLTa=
gTEI</tei-class>
+      <body-content>JSP</body-content>
+
+      <attribute>
+         <name>portletMode</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>secure</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>var</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <name>windowState</name>
+         <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
+   </tag>
+   <tag>
+
+      <name>namespace</name>
+      <tag-class>org.jboss.portal.portlet.impl.jsr168.taglib.NamespaceTag<=
/tag-class>
+      <body-content>empty</body-content>
+
+   </tag>
+
+</taglib>

Added: modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/po=
rtlet/jsr286/tck/taglib/DefineObjectsTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/DefineObjectsTestCase.java	                        (re=
v 0)
+++ modules/portlet/trunk/portlet/src/test/java/org/jboss/portal/test/portl=
et/jsr286/tck/taglib/DefineObjectsTestCase.java	2008-02-04 13:53:04 UTC (re=
v 9743)
@@ -0,0 +1,148 @@
+/*
+* 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.test.portlet.jsr286.tck.taglib;
+
+import org.jboss.portal.unit.PortletTestCase;
+import org.jboss.portal.unit.PortletTestContext;
+import org.jboss.portal.unit.Assertion;
+import org.jboss.portal.unit.annotations.TestCase;
+import org.jboss.portal.unit.base.AbstractUniversalTestPortlet;
+import org.jboss.portal.unit.actions.PortletRenderTestAction;
+import org.jboss.portal.unit.actions.PortletActionTestAction;
+import org.jboss.portal.unit.actions.PortletEventTestAction;
+import org.jboss.portal.unit.actions.PortletResourceTestAction;
+import org.jboss.portal.test.portlet.framework.UTP1;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetRespons=
e;
+import static org.jboss.unit.api.Assert.*;
+
+import javax.portlet.Portlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+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 java.io.IOException;
+import java.io.Writer;
+
+/**
+ * @author <a href=3D"mailto:boleslaw dot dawidowicz at redhat anotherdot =
com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+(a)TestCase({
+   Assertion.JSR286_113
+   })
+public class DefineObjectsTestCase
+{
+
+   //TODO: doesn't test include from action/event - the actionRequest/acti=
onResponse/eventRequest/eventResponse objects
+
+   private String startTag;
+   private String endTag;
+
+   public DefineObjectsTestCase(PortletTestCase seq)
+   {
+      seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/taglib.jsp");
+
+            startTag =3D "<div id=3D" + response.getNamespace() + ">";
+            endTag =3D "</div>";
+
+            Writer writer =3D response.getWriter();
+
+            writer.write(startTag);
+            dispatcher.include(request, response);
+            writer.write(endTag);
+
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+
+
+      seq.bindAction(1, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            String prevResponse =3D new String(context.getResponseBody());
+
+            String portletResp =3D prevResponse.substring(prevResponse.ind=
exOf(startTag) + startTag.length(), prevResponse.indexOf(endTag));
+
+            assertEquals("jspDispatch,renderRequest,renderResponse,portlet=
Config,portletSession,portletSessionScope," +
+               "portletPreferences,portletPreferencesValues", portletResp.=
trim());
+
+            return new InvokeGetResponse(response.createResourceURL().toSt=
ring());
+         }
+      });
+
+      seq.bindAction(2, UTP1.RESOURCE_JOIN_POINT, new PortletResourceTestA=
ction()
+      {
+         protected DriverResponse run(Portlet portlet, ResourceRequest req=
uest, ResourceResponse response, PortletTestContext context) throws IOExcep=
tion, PortletException
+         {
+            response.setContentType("text/html");
+            PortletRequestDispatcher dispatcher =3D ((AbstractUniversalTes=
tPortlet)portlet).getPortletContext().getRequestDispatcher("/taglib.jsp");
+
+            startTag =3D "<div id=3D" + response.getNamespace() + ">";
+            endTag =3D "</div>";
+
+            Writer writer =3D response.getWriter();
+
+            writer.write(startTag);
+            dispatcher.include(request, response);
+            writer.write(endTag);
+
+            return new InvokeGetResponse(response.createRenderURL().toStri=
ng());
+         }
+      });
+
+      seq.bindAction(3, UTP1.RENDER_JOIN_POINT, new PortletRenderTestActio=
n()
+      {
+         protected DriverResponse run(Portlet portlet, RenderRequest reque=
st, RenderResponse response, PortletTestContext context) throws IOException=
, PortletException
+         {
+            response.setContentType("text/html");
+
+            String prevResponse =3D new String(context.getResponseBody());
+
+            String portletResp =3D prevResponse.substring(prevResponse.ind=
exOf(startTag) + startTag.length(), prevResponse.indexOf(endTag));
+
+            assertEquals("jspDispatch,resourceRequest,resourceResponse,por=
tletConfig,portletSession,portletSessionScope," +
+               "portletPreferences,portletPreferencesValues", portletResp.=
trim());
+
+            return new EndTestResponse();
+         }
+      });
+   }
+}

Modified: modules/portlet/trunk/test/src/test/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/build.xml	2008-02-04 12:27:00 UTC (=
rev 9742)
+++ modules/portlet/trunk/test/src/test/build.xml	2008-02-04 13:53:04 UTC (=
rev 9743)
@@ -304,6 +304,10 @@
             src=3D"${dependency.portal-portlet.jar}"
             includes=3D"org/jboss/portal/portlet/portlet.tld"
             fullpath=3D"META-INF/portlet.tld"/>
+         <zipfileset
+            src=3D"${dependency.portal-portlet.jar}"
+            includes=3D"org/jboss/portal/portlet/portlet_2_0.tld"
+            fullpath=3D"META-INF/portlet_2_0.tld"/>
       </jar>
 =

       <!--<jar jarfile=3D"${test.temp.lib}/test-info.jar">-->
@@ -365,6 +369,7 @@
       <package-jsr286-tck-test test=3D"resourceserving"/>
       <package-jsr286-tck-test test=3D"portleturl"/>
       <package-jsr286-tck-test test=3D"portletfilter"/>
+      <package-jsr286-tck-test test=3D"taglib"/>
       <package-jsr286-api-test test=3D"event"/>
       <package-jsr286-ext-test test=3D"portletrequests"/>
       <package-jsr286-ext-test test=3D"portletfilter"/>
@@ -607,7 +612,7 @@
          <configuration>
             <property name=3D"cargo.servlet.port" value=3D"8080"/>
             <property name=3D"cargo.logging" value=3D"high"/>
-            <!--<property name=3D"cargo.jvmargs" value=3D"-Xdebug -Xnoagen=
t -Djava.compiler=3DNONE -Xrunjdwp:transport=3Ddt_socket,server=3Dy,suspend=
=3Dy,address=3D8000"/>-->
+            <!--<property name=3D"cargo.jvmargs" value=3D"-Xdebug -Xnoagen=
t -Djava.compiler=3DNONE -Xrunjdwp:transport=3Ddt_socket,server=3Dy,suspend=
=3Dy,address=3D9000"/>-->
             <deployable type=3D"war" file=3D"${test.temp.lib}/manager.war"=
/>
             <deployable type=3D"war" file=3D"${test.temp.lib}/tomcat-6.0/p=
ortlet-test.war"/>
         </configuration>

Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
WEB-INF/portlet.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB=
-INF/portlet.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB=
-INF/portlet.xml	2008-02-04 13:53:04 UTC (rev 9743)
@@ -0,0 +1,38 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~~
+  ~ 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.              =
    ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
+
+<portlet-app xmlns=3D"http://java.sun.com/xml/ns/portlet/portlet-app_2_0.x=
sd"
+             xmlns:xsi=3D"http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation=3D"http://java.sun.com/xml/ns/portlet/port=
let-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+             version=3D"2.0">
+
+   <portlet>
+      <portlet-name>UniversalTestPortletA</portlet-name>
+      <portlet-class>org.jboss.portal.test.portlet.framework.UTP1</portlet=
-class>
+      <supports>
+        <mime-type>text/html</mime-type>
+      </supports>
+   </portlet>
+   =

+</portlet-app>

Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
WEB-INF/web.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB=
-INF/web.xml	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/WEB=
-INF/web.xml	2008-02-04 13:53:04 UTC (rev 9743)
@@ -0,0 +1,32 @@
+<?xml version=3D"1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~~
+  ~ 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.              =
    ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
+
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+   <listener>
+      <listener-class>org.jboss.portal.unit.PortletTestSuite</listener-cla=
ss>
+   </listener>
+</web-app>

Added: modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/=
taglib.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/tag=
lib.jsp	                        (rev 0)
+++ modules/portlet/trunk/test/src/test/resources/jsr286/tck/taglib-war/tag=
lib.jsp	2008-02-04 13:53:04 UTC (rev 9743)
@@ -0,0 +1,73 @@
+<%@ page import=3D"org.jboss.unit.api.Assert" %>
+<%@ page import=3D"javax.portlet.RenderRequest" %>
+<%@ page import=3D"javax.portlet.RenderResponse" %>
+<%@ page import=3D"javax.portlet.ActionRequest" %>
+<%@ page import=3D"javax.portlet.ActionResponse" %>
+<%@ page import=3D"javax.portlet.EventRequest" %>
+<%@ page import=3D"javax.portlet.EventResponse" %>
+<%@ page import=3D"javax.portlet.ResourceRequest" %>
+<%@ page import=3D"javax.portlet.ResourceResponse" %>
+<%@ page import=3D"javax.portlet.PortletConfig" %>
+<%@ page import=3D"javax.portlet.PortletSession" %>
+<%@ page import=3D"java.util.Map" %>
+<%@ page import=3D"javax.portlet.PortletPreferences" %>
+<%@ page language=3D"java" %>
+<%@ taglib uri=3D"http://java.sun.com/portlet_2_0" prefix=3D"portlet" %>
+<portlet:defineObjects/>
+<%
+   out.print("jspDispatch");
+
+   if (renderRequest !=3D null && renderRequest instanceof RenderRequest)
+   {
+      out.print(",renderRequest");
+   }
+   if (renderResponse !=3D null && renderResponse instanceof RenderRespons=
e)
+   {
+      out.print(",renderResponse");
+   }
+   if (actionRequest !=3D null && actionRequest instanceof ActionRequest)
+   {
+      out.print(",actionRequest");
+   }
+   if (actionResponse !=3D null && actionResponse instanceof ActionRespons=
e)
+   {
+      out.print(",actionResponse");
+   }
+   if (eventRequest !=3D null && eventRequest instanceof EventRequest)
+   {
+      out.print(",eventRequest");
+   }
+   if (eventResponse !=3D null && eventResponse instanceof EventResponse)
+   {
+      out.print(",eventResponse");
+   }
+   if (resourceRequest !=3D null && resourceRequest instanceof ResourceReq=
uest)
+   {
+      out.print(",resourceRequest");
+   }
+   if (resourceResponse !=3D null && resourceResponse instanceof ResourceR=
esponse)
+   {
+      out.print(",resourceResponse");
+   }
+   if (portletConfig !=3D null && portletConfig instanceof PortletConfig)
+   {
+      out.print(",portletConfig");
+   }
+   if (portletSession !=3D null && portletSession instanceof PortletSessio=
n)
+   {
+      out.print(",portletSession");
+   }
+   if (portletSessionScope !=3D null && portletSessionScope instanceof Map)
+   {
+      out.print(",portletSessionScope");
+   }
+   if (portletPreferences !=3D null && portletPreferences instanceof Portl=
etPreferences)
+   {
+      out.print(",portletPreferences");
+   }
+   if (portletPreferencesValues !=3D null && portletPreferencesValues inst=
anceof Map)
+   {
+      out.print(",portletPreferencesValues");
+   }
+
+%>
\ No newline at end of file

Modified: modules/portlet/trunk/test/src/test/resources/test/remote-jboss-u=
nit.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xm=
l	2008-02-04 12:27:00 UTC (rev 9742)
+++ modules/portlet/trunk/test/src/test/resources/test/remote-jboss-unit.xm=
l	2008-02-04 13:53:04 UTC (rev 9743)
@@ -187,6 +187,10 @@
       <class name=3D"org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
       <property name=3D"archiveId" value=3D"test-jsr286-tck-portletfilter.=
war"/>
    </generic>
+   <generic>
+      <class name=3D"org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+      <property name=3D"archiveId" value=3D"test-jsr286-tck-taglib.war"/>
+   </generic>
 =

    <!--Spec API Assertions tests-->
    <generic>


--===============2386925539025218194==--