[gatein-commits] gatein SVN: r4561 - in portal/branches/wsrp2-integration: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directory.

[do-not-reply at jboss.org]

Author: chris.laprun at jboss.com
Date: 2010-10-06 17:09:46 -0400 (Wed, 06 Oct 2010)
New Revision: 4561

Modified:
   portal/branches/wsrp2-integration/pom.xml
   portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java
   portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
Log:
- Updated to use PC 2.2.0-Beta05 and WSRP 2.0.0-Beta01.
- Use AbstractWindowContext instead of ExoWindowContext since there wasn't any discernible advantage to using a custom implementation at this point.

Modified: portal/branches/wsrp2-integration/pom.xml
===================================================================
--- portal/branches/wsrp2-integration/pom.xml	2010-10-06 20:57:32 UTC (rev 4560)
+++ portal/branches/wsrp2-integration/pom.xml	2010-10-06 21:09:46 UTC (rev 4561)
@@ -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-Beta04</org.gatein.pc.version>
+      <org.gatein.pc.version>2.2.0-Beta05</org.gatein.pc.version>
       <org.picketlink.idm>1.1.5.GA</org.picketlink.idm>
-      <org.gatein.wsrp.version>2.0.0-Beta01-SNAPSHOT</org.gatein.wsrp.version>
+      <org.gatein.wsrp.version>2.0.0-Beta01</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>

Modified: portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java
===================================================================
--- portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java	2010-10-06 20:57:32 UTC (rev 4560)
+++ portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/ExoWindowContext.java	2010-10-06 21:09:46 UTC (rev 4561)
@@ -1,16 +1,16 @@
 /**
  * Copyright (C) 2009 eXo Platform SAS.
- * 
+ *
  * 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
@@ -19,18 +19,15 @@
 
 package org.exoplatform.portal.webui.application;
 
-import org.gatein.pc.api.spi.WindowContext;
+import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
 
 /**
  * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
  * @version $Revision$
  */
-public class ExoWindowContext implements WindowContext
+public class ExoWindowContext extends AbstractWindowContext
 {
 
-   /** . */
-   private final String windowId;
-
    /**
     * Create a new window context.
     *
@@ -39,15 +36,6 @@
     */
    public ExoWindowContext(String windowId) throws NullPointerException
    {
-      if (windowId == null)
-      {
-         throw new NullPointerException();
-      }
-      this.windowId = windowId;
+      super(windowId);
    }
-
-   public String getId()
-   {
-      return windowId;
-   }
 }

Modified: portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java
===================================================================
--- portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java	2010-10-06 20:57:32 UTC (rev 4560)
+++ portal/branches/wsrp2-integration/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java	2010-10-06 21:09:46 UTC (rev 4561)
@@ -76,6 +76,7 @@
 import org.gatein.pc.portlet.impl.spi.AbstractRequestContext;
 import org.gatein.pc.portlet.impl.spi.AbstractSecurityContext;
 import org.gatein.pc.portlet.impl.spi.AbstractServerContext;
+import org.gatein.pc.portlet.impl.spi.AbstractWindowContext;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -765,7 +766,7 @@
       invocation.setServerContext(new AbstractServerContext(servletRequest, prc.getResponse()));
       //TODO: ExoUserContext impl not tested
       invocation.setUserContext(new ExoUserContext(servletRequest, userProfile));
-      invocation.setWindowContext(new ExoWindowContext(storageName));
+      invocation.setWindowContext(new AbstractWindowContext(storageName));
       invocation.setPortalContext(new AbstractPortalContext(Collections.singletonMap(
          "javax.portlet.markup.head.element.support", "true")));
       invocation.setSecurityContext(new AbstractSecurityContext(servletRequest));