You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jh...@apache.org on 2006/03/11 14:59:51 UTC
svn commit: r385083 - in /cocoon/blocks/apples/trunk:
java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java status.xml
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>