cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r385074 - in /cocoon/branches/BRANCH_2_1_X: src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java status.xml
Date Sat, 11 Mar 2006 12:14:37 GMT
Author: jheymans
Date: Sat Mar 11 04:14:37 2006
New Revision: 385074

URL: http://svn.apache.org/viewcvs?rev=385074&view=rev
Log:
    <action dev="JHS" type="fix" fixes-bug="COCOON-1728" due-to="Paul Focke" due-to-email="paul@outerthought.org">
      Apples can now access components declared in mounted sitemaps.
    </action>


Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
    cocoon/branches/BRANCH_2_1_X/status.xml

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?rev=385074&r1=385073&r2=385074&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
(original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
Sat Mar 11 04:14:37 2006
@@ -17,8 +17,10 @@
 
 import java.util.List;
 
+import org.apache.avalon.framework.CascadingRuntimeException;
 import org.apache.avalon.framework.activity.Disposable;
 import org.apache.avalon.framework.component.WrapperComponentManager;
+import org.apache.avalon.framework.context.ContextException;
 import org.apache.avalon.framework.context.DefaultContext;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -64,8 +66,16 @@
             appleContext.put("continuation-id", wk.getId());
         }
         
+//      Use the current sitemap's service manager for components
+        ServiceManager sitemapManager;
+        try {
+            sitemapManager = (ServiceManager)avalonContext.get(ContextHelper.CONTEXT_SITEMAP_SERVICE_MANAGER);
+        } catch (ContextException e) {
+            throw new CascadingRuntimeException("Cannot get sitemap service manager", e);
+        }
+        
         LifecycleHelper.setupComponent( app, getLogger(), appleContext, 
-                                        this.serviceManager, new WrapperComponentManager(this.serviceManager),
 
+                                        sitemapManager, new WrapperComponentManager(sitemapManager),
 
                                         null, null, true);
         
         processApple(params, redirector, app, wk);

Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=385074&r1=385073&r2=385074&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Sat Mar 11 04:14:37 2006
@@ -180,6 +180,9 @@
   <release version="@version@" date="@date@">
 -->
   <release version="2.1.9" date="TBD">
+    <action dev="JHS" type="fix" fixes-bug="COCOON-1728" due-to="Paul Focke" due-to-email="paul@outerthought.org">
+      Apples can now access components declared in mounted sitemaps.
+    </action>
     <action dev="AG" type="update">
       Updated xercesImpl to 2.8.0 and xml-apis to 1.3.03.
     </action>



Mime
View raw message