From portal-commits at lists.jboss.org Tue May 29 18:53:57 2007
Content-Type: multipart/mixed; boundary="===============8497217292018118221=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r7352 - in trunk/wsrp/src:
 main/org/jboss/portal/test/wsrp/v1/producer and 2 other directories.
Date: Tue, 29 May 2007 18:53:56 -0400
Message-ID: <E1HtAZg-0006Ch-Fy@committer01.frg.pub.inap.atl.jboss.com>

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

Author: chris.laprun(a)jboss.com
Date: 2007-05-29 18:53:56 -0400 (Tue, 29 May 2007)
New Revision: 7352

Added:
   trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-po=
rtlet.xml
Modified:
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.ja=
va
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCas=
e.java
   trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-ser=
vice.xml
Log:
- Added ProducerCache interceptor to Producer stack in test WSRP producer t=
o allow for correct behavior of response processing and CacheControl genera=
tion.
- Made SessionPortlet remotable and simplified the markup.
- Improved robustness of markup checking in MarkupTestCase.

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPor=
tlet.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
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.j=
ava	2007-05-29 19:29:30 UTC (rev 7351)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/portlet/SessionPortlet.j=
ava	2007-05-29 22:53:56 UTC (rev 7352)
@@ -56,12 +56,10 @@
          count =3D ((Integer)session.getAttribute(COUNT)).intValue() + 1;
       }
       session.setAttribute(COUNT, new Integer(count));
-      writer.write("<p>");
-      writer.write("" + count);
-      writer.write("</p>");
+      writer.write("<p>Session id: " + session.getId() + "</p>");
+      writer.write("<p>count =3D " + count + "</p>");
+      writer.write("<a href=3D'" + resp.createRenderURL() + "'>render</a>"=
);
 =

-      writer.write("<div><a href=3D\"" + resp.createRenderURL() + "\">rend=
er</a></div>");
-
       //
       writer.close();
    }

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/Markup=
TestCase.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
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCa=
se.java	2007-05-29 19:29:30 UTC (rev 7351)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCa=
se.java	2007-05-29 22:53:56 UTC (rev 7352)
@@ -490,8 +490,9 @@
       // Markup context
       MarkupContext markupContext =3D response.getMarkupContext();
       ExtendedAssert.assertNotNull(markupContext);
-      ExtendedAssert.assertEquals("<p>" + count + "</p><div><a href=3D\"ws=
rp_rewrite?wsrp-urlType=3Drender" +
-         "&amp;wsrp-navigationalState=3DJBPNS_/wsrp_rewrite\">render</a></=
div>", markupContext.getMarkupString());
+      String markupString =3D markupContext.getMarkupString();
+      ExtendedAssert.assertTrue(markupString.contains("count =3D " + count=
));
+      ExtendedAssert.assertTrue(markupString.contains("<a href=3D'wsrp_rew=
rite?wsrp-urlType=3Drender&amp;wsrp-navigationalState=3DJBPNS_/wsrp_rewrite=
'>render</a>"));
 =

       // checking session
       checkSessionForCurrentlyDeployedPortlet(response);

Added: trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jbos=
s-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
--- trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-p=
ortlet.xml	                        (rev 0)
+++ trunk/wsrp/src/resources/tests/test-session-portlet-war/WEB-INF/jboss-p=
ortlet.xml	2007-05-29 22:53:56 UTC (rev 7352)
@@ -0,0 +1,32 @@
+<?xml version=3D"1.0" encoding=3D"UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~~
+  ~ JBoss, a division of Red Hat                                          =
    ~
+  ~ Copyright 2007, 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 portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN"
+   "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
+
+<portlet-app>
+   <portlet>
+      <portlet-name>Session Test Portlet</portlet-name>
+      <remotable>true</remotable>
+   </portlet>
+</portlet-app>
\ No newline at end of file

Modified: trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jb=
oss-service.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
--- trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-se=
rvice.xml	2007-05-29 19:29:30 UTC (rev 7351)
+++ trunk/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-se=
rvice.xml	2007-05-29 22:53:56 UTC (rev 7352)
@@ -97,6 +97,13 @@
       <xmbean/>
    </mbean>
    <mbean
+      code=3D"org.jboss.portal.portlet.aspects.portlet.ProducerCacheInterc=
eptor"
+      name=3D"portal:service=3DInterceptor,type=3DPortlet,name=3DProducerC=
ache"
+      xmbean-dd=3D""
+      xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
+      <xmbean/>
+   </mbean>
+   <mbean
       code=3D"org.jboss.portal.server.impl.invocation.JBossInterceptorStac=
kFactory"
       name=3D"portal:service=3DInterceptorStackFactory,type=3DContainer"
       xmbean-dd=3D""
@@ -106,6 +113,7 @@
          <depends-list-element>portal:service=3DInterceptor,type=3DPortlet=
,name=3DContextDispatcher</depends-list-element>
          <depends-list-element>portal:service=3DInterceptor,type=3DPortlet=
,name=3DWindowStates</depends-list-element>
          <depends-list-element>portal:service=3DInterceptor,type=3DPortlet=
,name=3DModes</depends-list-element>
+         <depends-list-element>portal:service=3DInterceptor,type=3DPortlet=
,name=3DProducerCache</depends-list-element>
       </depends-list>
    </mbean>
 =



--===============8497217292018118221==--