[gatein-commits] gatein SVN: r109 - in components/pc/trunk: test/src/main/java/org/gatein/pc/test/controller and 1 other directories.

[do-not-reply at jboss.org]

Author: mwringe
Date: 2009-08-27 23:33:57 -0400 (Thu, 27 Aug 2009)
New Revision: 109

Modified:
   components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java
   components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java
   components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java
Log:
Minor code clean up.

Modified: components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java
===================================================================
--- components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java	2009-08-28 03:30:29 UTC (rev 108)
+++ components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/jsp/ControllerFilter.java	2009-08-28 03:33:57 UTC (rev 109)
@@ -22,8 +22,6 @@
  ******************************************************************************/
 package org.gatein.pc.portal.jsp;
 
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
 import org.gatein.pc.controller.impl.PortletURLRenderer;
 import org.gatein.pc.controller.impl.URLParameterConstants;
 import org.gatein.pc.controller.impl.ControllerRequestFactory;

Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java	2009-08-28 03:30:29 UTC (rev 108)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/controller/PortletControllerContextImpl.java	2009-08-28 03:33:57 UTC (rev 109)
@@ -23,8 +23,6 @@
 
 package org.gatein.pc.test.controller;
 
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
 import org.gatein.pc.api.Portlet;
 import org.gatein.pc.api.PortletContext;
 import org.gatein.pc.api.PortletInvoker;
@@ -75,12 +73,7 @@
 
       //
       this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
-      
-      //ExoContainer exoContainer = ExoContainerContext.getCurrentContainer();
-      //this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class);
-      //System.out.println("PORTLET INVOKER PCCI2: " + (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class));
-      
-      
+
       this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
       this.stateControllerContext = new StateControllerContextImpl(this);
       this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext);

Modified: components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java
===================================================================
--- components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java	2009-08-28 03:30:29 UTC (rev 108)
+++ components/pc/trunk/test/src/main/java/org/gatein/pc/test/tck/TCKPortletControllerContext.java	2009-08-28 03:33:57 UTC (rev 109)
@@ -22,8 +22,6 @@
  ******************************************************************************/
 package org.gatein.pc.test.tck;
 
-import org.exoplatform.container.ExoContainer;
-import org.exoplatform.container.ExoContainerContext;
 import org.gatein.pc.controller.impl.AbstractPortletControllerContext;
 import org.gatein.pc.api.Portlet;
 import org.gatein.pc.api.PortletInvokerException;
@@ -76,11 +74,6 @@
       //
       this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
       
-      //ExoContainer exoContainer = ExoContainerContext.getCurrentContainer();
-      //this.portletInvoker = (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class);
-      //System.out.println("PORTLET INVOKER TCKPCC2: " + (PortletInvoker)exoContainer.getComponentInstance(PortletInvoker.class));
-
-      
       this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this));
       this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
       this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext);