Return-Path: 
 <cvs-return-26562-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 72168 invoked from network); 11 Mar 2006 14:00:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 11 Mar 2006 14:00:13 -0000
Received: (qmail 89290 invoked by uid 500); 11 Mar 2006 14:00:13 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 89159 invoked by uid 500); 11 Mar 2006 14:00:12 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 89148 invoked by uid 99); 11 Mar 2006 14:00:12 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 11 Mar 2006 06:00:12 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 11 Mar 2006 06:00:12 -0800
Received: (qmail 72001 invoked by uid 65534); 11 Mar 2006 13:59:51 -0000
Message-ID: <20060311135951.72000.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r385083 - in /cocoon/blocks/apples/trunk:
 java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java status.xml
Date: Sat, 11 Mar 2006 13:59:51 -0000
To: cvs@cocoon.apache.org
From: jheymans@apache.org
X-Mailer: svnmailer-1.0.7
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jheymans
Date: Sat Mar 11 05:59:50 2006
New Revision: 385083

URL: http://svn.apache.org/viewcvs?rev=385083&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/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
    cocoon/blocks/apples/trunk/status.xml

Modified: cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?rev=385083&r1=385082&r2=385083&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java (original)
+++ cocoon/blocks/apples/trunk/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java Sat Mar 11 05:59:50 2006
@@ -17,7 +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;
@@ -63,10 +66,17 @@
             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,  
-                                        null,
-                                        true);
+                                        sitemapManager, new WrapperComponentManager(sitemapManager),
+                                        null, null, true);
         
         processApple(params, redirector, app, wk);
     }

Modified: cocoon/blocks/apples/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/status.xml?rev=385083&r1=385082&r2=385083&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/status.xml (original)
+++ cocoon/blocks/apples/trunk/status.xml Sat Mar 11 05:59:50 2006
@@ -65,6 +65,9 @@
  <!-- The following list contains the changes since the latest 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <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>
   </release>
  </changes>