[gatein-commits] gatein SVN: r4871 - in portal/trunk: component/wsrp/src/main/java/org/gatein/portal/wsrp and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-10-28 11:55:25 -0400 (Thu, 28 Oct 2010)
New Revision: 4871

Modified:
   portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java
   portal/trunk/pom.xml
Log:
- GTNWSRP-143: Update MOPConsumerStructureProvider to API change and use new specified parameter to update window name so that it's less confusing for users.
- Updated to PC 2.2.0-CR01 and WSRP-2.0.0-CR01-SNAPSHOT.

Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java	2010-10-28 15:29:33 UTC (rev 4870)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/MOPConsumerStructureProvider.java	2010-10-28 15:55:25 UTC (rev 4871)
@@ -160,7 +160,7 @@
       }
    }
 
-   public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId)
+   public void assignPortletToWindow(PortletContext portletContext, String windowId, String pageId, String exportedPortletHandle)
    {
       String uuid = windowIdToUUIDs.get(windowId);
       ParameterValidation.throwIllegalArgExceptionIfNull(uuid, "UUID for " + windowId);
@@ -193,6 +193,10 @@
       // and re-customize
       window.customize(WSRP.CONTENT_TYPE, portletId, wsrp);
 
+      // Change the window's name so that it's less confusing to users
+      Described described = window.adapt(Described.class);
+      described.setName(exportedPortletHandle + " (remote)"); // should be the same as ApplicationRegistryService.REMOTE_DISPLAY_NAME_SUFFIX
+
       // mark page for cache invalidation otherwise DataCache will use the previous customization id when trying to set
       // the portlet state in UIPortlet.setState and will not find it resulting in an error
       Page page = window.getPage();

Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml	2010-10-28 15:29:33 UTC (rev 4870)
+++ portal/trunk/pom.xml	2010-10-28 15:55:25 UTC (rev 4871)
@@ -46,9 +46,9 @@
       <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
       <org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
       <org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
-      <org.gatein.pc.version>2.2.0-Beta06</org.gatein.pc.version>
+      <org.gatein.pc.version>2.2.0-CR01</org.gatein.pc.version>
       <org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
-      <org.gatein.wsrp.version>2.0.0-Beta03</org.gatein.wsrp.version>
+      <org.gatein.wsrp.version>2.0.0-CR01-SNAPSHOT</org.gatein.wsrp.version>
       <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
       <org.slf4j.version>1.5.6</org.slf4j.version>
       <rhino.version>1.6R5</rhino.version>