Expose the portlet instance from the managed life cycle of the portle…

…t container
gatein · Apr 2, 2013 · 8784966 · 8784966
1 parent fcf799c
commit 8784966
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 0 deletions.
diff --git a/portlet/src/main/java/org/gatein/pc/portlet/container/managed/ManagedPortletContainer.java b/portlet/src/main/java/org/gatein/pc/portlet/container/managed/ManagedPortletContainer.java
@@ -24,6 +24,8 @@
 
 import org.gatein.pc.api.info.PortletInfo;
 
+import javax.portlet.Portlet;
+
 /**
  * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
  * @version $Revision: 630 $
@@ -37,4 +39,5 @@ public interface ManagedPortletContainer extends ManagedObject
 
    ManagedPortletApplication getManagedPortletApplication();
 
+   Portlet getPortletInstance();
 }
diff --git a/portlet/src/main/java/org/gatein/pc/portlet/container/object/PortletContainerObject.java b/portlet/src/main/java/org/gatein/pc/portlet/container/object/PortletContainerObject.java
@@ -27,6 +27,8 @@
 import org.gatein.pc.portlet.container.PortletContainer;
 import org.gatein.pc.portlet.container.PortletFilter;
 
+import javax.portlet.Portlet;
+
 /**
  * Contains life cycle and wiring details for the kernel environment.
  * 
@@ -87,4 +89,11 @@ public interface PortletContainerObject extends PortletContainer
     * Destroys the portlet container.
     */
    void destroy();
+
+   /**
+    * Returns the current instance held by the container.
+    *
+    * @return the instance
+    */
+   Portlet getPortletInstance();
 }
diff --git a/portlet/src/main/java/org/gatein/pc/portlet/impl/container/PortletContainerLifeCycle.java b/portlet/src/main/java/org/gatein/pc/portlet/impl/container/PortletContainerLifeCycle.java
@@ -30,6 +30,8 @@
 import org.gatein.pc.portlet.container.PortletContainer;
 import org.gatein.pc.api.info.PortletInfo;
 
+import javax.portlet.Portlet;
+
 /**
  * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
  * @version $Revision: 630 $
@@ -102,6 +104,12 @@ protected void invokeStop()
       portletContainer.stop();
    }
 
+   @Override
+   public Portlet getPortletInstance()
+   {
+      return portletContainer.getPortletInstance();
+   }
+
    @Override
    protected void invokeDestroy() throws Exception
    {

diff --git a/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java b/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/PortletContainerImpl.java
@@ -187,6 +187,11 @@ public ContainerPortletInfo getInfo()
       throw new IllegalStateException("Portlet " + info.getName() + " is not started");
    }
 
+   public Portlet getPortletInstance()
+   {
+      return portlet;
+   }
+
    public String getId()
    {
       return info.getName();

diff --git a/portlet/src/test/java/org/gatein/pc/portlet/container/PortletContainerObjectSupport.java b/portlet/src/test/java/org/gatein/pc/portlet/container/PortletContainerObjectSupport.java
@@ -29,6 +29,7 @@
 import org.gatein.pc.api.invocation.response.PortletInvocationResponse;
 import org.gatein.pc.portlet.container.object.PortletContainerObject;
 
+import javax.portlet.Portlet;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -108,4 +109,10 @@ public PortletContainerContext getContext()
    {
       throw new UnsupportedOperationException();
    }
+
+   @Override
+   public Portlet getPortletInstance()
+   {
+      throw new UnsupportedOperationException();
+   }
 }