You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/08/21 13:14:26 UTC

svn commit: r234178 - /cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java

Author: cziegeler
Date: Sun Aug 21 04:14:05 2005
New Revision: 234178

URL: http://svn.apache.org/viewcvs?rev=234178&view=rev
Log:
Fix missing servlet-context exception when configuring ManagedCocoonPortlet

Modified:
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java?rev=234178&r1=234177&r2=234178&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Sun Aug 21 04:14:05 2005
@@ -45,6 +45,7 @@
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.log.ContextMap;
 import org.apache.log.Hierarchy;
+import org.apache.pluto.core.impl.PortletContextImpl;
 
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
@@ -880,6 +881,9 @@
             subcontext.put("context-root", logSCDir.toString());
         } else {
             subcontext.put("context-root", this.portletContextPath);
+        }
+        if ( this.portletContext instanceof PortletContextImpl ) {
+            subcontext.put("servlet-context", ((PortletContextImpl)this.portletContext).getServletContext());
         }
 
         try {