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:15:20 UTC

svn commit: r234179 - /cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java

Author: cziegeler
Date: Sun Aug 21 04:15:01 2005
New Revision: 234179

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

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java?rev=234179&r1=234178&r2=234179&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java Sun Aug 21 04:15:01 2005
@@ -39,6 +39,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;
@@ -924,6 +925,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 {