[jboss-svn-commits] JBoss Portal SVN: r5484 - in trunk/wsrp/src/main/org/jboss/portal/test/wsrp: framework v1/consumer/behaviors

[jboss-svn-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2006-10-18 18:59:02 -0400 (Wed, 18 Oct 2006)
New Revision: 5484

Modified:
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java
   trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java
Log:
- Forgot to switch implementation of performBlockingInteraction to use behaviors.

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java	2006-10-18 22:38:17 UTC (rev 5483)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestWSRPProducerImpl.java	2006-10-18 22:59:02 UTC (rev 5484)
@@ -79,7 +79,6 @@
 import org.jboss.portal.wsrp.core.UnsupportedMimeTypeFault;
 import org.jboss.portal.wsrp.core.UnsupportedModeFault;
 import org.jboss.portal.wsrp.core.UnsupportedWindowStateFault;
-import org.jboss.portal.wsrp.core.UpdateResponse;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
@@ -277,24 +276,9 @@
       InvalidRegistrationFault, MissingParametersFault, InvalidUserCategoryFault, InconsistentParametersFault,
       InvalidHandleFault, InvalidCookieFault, RemoteException
    {
-      String handle = performBlockingInteraction.getPortletContext().getPortletHandle();
-      String ns = performBlockingInteraction.getMarkupParams().getNavigationalState();
-      if ("redirect".equals(ns))
-      {
-         return WSRPTypeFactory.createBlockingInteractionResponse("http://jboss.com");
-      }
+      updateCurrentBehaviorIfNeeded(performBlockingInteraction.getPortletContext().getPortletHandle());
 
-      if (BasicMarkupBehavior.PORTLET_HANDLE.equals(handle))
-      {
-         ns = "ns1";
-      }
-      if (SessionMarkupBehavior.PORTLET_HANDLE.equals(handle))
-      {
-         ns = "ns2";
-      }
-      UpdateResponse ur = WSRPTypeFactory.createUpdateResponse();
-      ur.setNavigationalState(ns);
-      BlockingInteractionResponse res = WSRPTypeFactory.createBlockingInteractionResponse(ur);
+      BlockingInteractionResponse res = getMarkupBehavior().performBlockingInteraction(performBlockingInteraction);
 
       incrementBehaviorCallCount();
       return res;

Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java	2006-10-18 22:38:17 UTC (rev 5483)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/consumer/behaviors/SessionMarkupBehavior.java	2006-10-18 22:59:02 UTC (rev 5484)
@@ -27,9 +27,12 @@
 import org.jboss.portal.WindowState;
 import org.jboss.portal.test.wsrp.framework.MarkupBehavior;
 import org.jboss.portal.wsrp.WSRPTypeFactory;
+import org.jboss.portal.wsrp.core.BlockingInteractionResponse;
 import org.jboss.portal.wsrp.core.GetMarkup;
 import org.jboss.portal.wsrp.core.MarkupResponse;
+import org.jboss.portal.wsrp.core.PerformBlockingInteraction;
 import org.jboss.portal.wsrp.core.SessionContext;
+import org.jboss.portal.wsrp.core.UpdateResponse;
 
 /**
  * @author <a href="mailto:chris.laprun at jboss.com?subject=org.jboss.portal.test.wsrp.v1.consumer.producer.SessionBehavior">Chris
@@ -41,7 +44,9 @@
 {
    public static final String PORTLET_HANDLE = "SecondPortletHandle";
    public static final String SESSION_ID = "sessionID";
+   public static final String NS = "ns2";
 
+
    private int count = 0;
    private String sessionId;
 
@@ -71,6 +76,12 @@
       return markupString.toString();
    }
 
+   public BlockingInteractionResponse performBlockingInteraction(PerformBlockingInteraction performBlockingInteraction)
+   {
+      UpdateResponse ur = WSRPTypeFactory.createUpdateResponse();
+      ur.setNavigationalState(NS);
+      return WSRPTypeFactory.createBlockingInteractionResponse(ur);
+   }
 
    public void modifyResponseIfNeeded(MarkupResponse markupResponse)
    {