From portal-commits at lists.jboss.org Thu Sep 24 06:18:46 2009
Content-Type: multipart/mixed; boundary="===============6277970179753583233=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r13808 - in
 branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src:
 main/org/jboss/portal/widget/google and 3 other directories.
Date: Thu, 24 Sep 2009 06:18:46 -0400
Message-ID: <200909241018.n8OAIkfX022083@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: mageshbk(a)jboss.com
Date: 2009-09-24 06:18:46 -0400 (Thu, 24 Sep 2009)
New Revision: 13808

Modified:
   branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/mai=
n/org/jboss/portal/widget/AbstractWidgetPortlet.java
   branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/mai=
n/org/jboss/portal/widget/google/GGWidgetPortlet.java
   branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/mai=
n/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java
   branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/res=
ources/portal-widget-netvibes-war/WEB-INF/portlet.xml
   branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/res=
ources/portal-widget-war/WEB-INF/portlet.xml
Log:
[JBEPP-120] - Additional parameters for gadgets are lost when the gadgets a=
re displayed - merged from EPP branch

Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/=
src/main/org/jboss/portal/widget/AbstractWidgetPortlet.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
--- branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/ma=
in/org/jboss/portal/widget/AbstractWidgetPortlet.java	2009-09-24 05:04:24 U=
TC (rev 13807)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/ma=
in/org/jboss/portal/widget/AbstractWidgetPortlet.java	2009-09-24 10:18:46 U=
TC (rev 13808)
@@ -28,6 +28,7 @@
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
 import javax.portlet.PortletMode;
+import javax.xml.namespace.QName;
 =

 /**
  * @author <a href=3D"mailto:emuckenh(a)redhat.com">Emanuel Muckenhuber</a>
@@ -53,6 +54,10 @@
    /** .*/
    protected final PortletMode EDIT_CONTENT =3D new PortletMode("edit_cont=
ent");
 =

+   protected static final QName CONTENT_SELECT =3D new QName("urn:jboss:po=
rtal:content", "select");
+   =

+   public static final String CONTENT_PARAMETER_PREFIX =3D "content.param.=
";
+
    /**
     * @return WidgetProvider
     */

Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/=
src/main/org/jboss/portal/widget/google/GGWidgetPortlet.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
--- branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/ma=
in/org/jboss/portal/widget/google/GGWidgetPortlet.java	2009-09-24 05:04:24 =
UTC (rev 13807)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/ma=
in/org/jboss/portal/widget/google/GGWidgetPortlet.java	2009-09-24 10:18:46 =
UTC (rev 13808)
@@ -35,7 +35,6 @@
 import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.xml.namespace.QName;
 =

 import java.io.IOException;
 import java.io.PrintWriter;
@@ -50,8 +49,6 @@
  */
 public class GGWidgetPortlet extends AbstractWidgetPortlet
 {
-   private static final QName CONTENT_SELECT =3D new QName("urn:jboss:port=
al:content", "select");
-
    /** . */
    private GGProvider provider =3D new GGProvider();
 =

@@ -81,11 +78,11 @@
             {
                Map.Entry<String, String[]> entry =3D (Map.Entry<String, St=
ring[]>)i.next();
                String contentParamName =3D (String)entry.getKey();
-               if (contentParamName.startsWith("content.param"))
+               if (contentParamName.startsWith(CONTENT_PARAMETER_PREFIX))
                {
                   String[] contentParamValue =3D (String[])entry.getValue(=
);
                   params.put(contentParamName, contentParamValue);
-                  widgetParams.put(contentParamName, contentParamValue[0]);
+                  widgetParams.put(contentParamName.substring(CONTENT_PARA=
METER_PREFIX.length()), contentParamValue[0]);
                }
             }
 =


Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/=
src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.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
--- branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/ma=
in/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java	2009-09-24 0=
5:04:24 UTC (rev 13807)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/ma=
in/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java	2009-09-24 1=
0:18:46 UTC (rev 13808)
@@ -36,7 +36,6 @@
 import javax.portlet.PortletSecurityException;
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
-import javax.xml.namespace.QName;
 =

 import org.jboss.portal.api.content.SelectedContent;
 import org.jboss.portal.widget.AbstractWidgetPortlet;
@@ -51,8 +50,6 @@
 public class NetvibesWidgetPortlet extends AbstractWidgetPortlet
 {
    =

-   private static final QName CONTENT_SELECT =3D new QName("urn:jboss:port=
al:content", "select");
-
    /** . */
    private static final org.jboss.logging.Logger log =3D org.jboss.logging=
.Logger.getLogger(NetvibesWidgetPortlet.class);
    =

@@ -112,11 +109,11 @@
             {
                Map.Entry<String, String[]> entry =3D (Map.Entry<String, St=
ring[]>)i.next();
                String contentParamName =3D (String)entry.getKey();
-               if (contentParamName.startsWith("content.param"))
+               if (contentParamName.startsWith(CONTENT_PARAMETER_PREFIX))
                {
                   String[] contentParamValue =3D (String[])entry.getValue(=
);
                   params.put(contentParamName, contentParamValue);
-                  widgetParams.put(contentParamName.substring("content.par=
am.".length()), contentParamValue[0]);
+                  widgetParams.put(contentParamName.substring(CONTENT_PARA=
METER_PREFIX.length()), contentParamValue[0]);
                }
             }
 =


Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/=
src/resources/portal-widget-netvibes-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
--- branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/re=
sources/portal-widget-netvibes-war/WEB-INF/portlet.xml	2009-09-24 05:04:24 =
UTC (rev 13807)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/re=
sources/portal-widget-netvibes-war/WEB-INF/portlet.xml	2009-09-24 10:18:46 =
UTC (rev 13808)
@@ -66,7 +66,7 @@
          <title>Netvibes Widget</title>
          <keywords>widget,netvibes</keywords>
       </portlet-info>
-      <supported-publishing-event xmlns:x=3D"urn:jboss:portal:content">x:s=
elect</supported-publishing-event>
+      <supported-publishing-event><qname xmlns:x=3D"urn:jboss:portal:conte=
nt">x:select</qname></supported-publishing-event>
       <supported-public-render-parameter>uri</supported-public-render-para=
meter>
       <supported-public-render-parameter>parameters</supported-public-rend=
er-parameter>
    </portlet>

Modified: branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/=
src/resources/portal-widget-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
--- branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/re=
sources/portal-widget-war/WEB-INF/portlet.xml	2009-09-24 05:04:24 UTC (rev =
13807)
+++ branches/Enterprise_Portal_Platform_4_3_GA_CP02_JBEPP-120/widget/src/re=
sources/portal-widget-war/WEB-INF/portlet.xml	2009-09-24 10:18:46 UTC (rev =
13808)
@@ -61,8 +61,9 @@
          <title>Google Widget</title>
          <keywords>widget,google</keywords>
       </portlet-info>
-      <supported-publishing-event xmlns:x=3D"urn:jboss:portal:content">x:s=
elect</supported-publishing-event>
+      <supported-publishing-event><qname xmlns:x=3D"urn:jboss:portal:conte=
nt">x:select</qname></supported-publishing-event>
       <supported-public-render-parameter>uri</supported-public-render-para=
meter>
+      <supported-public-render-parameter>parameters</supported-public-rend=
er-parameter>
    </portlet>
    =

    <event-definition>
@@ -75,4 +76,8 @@
       <qname xmlns:c=3D"urn:jboss:portal:content">c:uri</qname>
    </public-render-parameter>
    =

+   <public-render-parameter>
+      <identifier>parameters</identifier>
+      <qname xmlns:c=3D"urn:jboss:portal:content">c:parameters</qname>
+   </public-render-parameter>
 </portlet-app>


--===============6277970179753583233==--