X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fant%2FAntSlcApplication.java;h=7c85fc2397ca9d921ccb148ba55951648521208e;hb=b7f351768f4577c0799ab3c5df116ce30270af49;hp=ae1f8ef13dbd2f6cd836bd1d60b271f503b6ef9c;hpb=fa38c56c899d3f7347d960c4684fa293b1502c6c;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java index ae1f8ef13..7c85fc239 100644 --- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java +++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/AntSlcApplication.java @@ -28,6 +28,7 @@ import org.argeo.slc.core.structure.tree.TreeSPath; import org.argeo.slc.core.structure.tree.TreeSRegistry; import org.argeo.slc.logging.Log4jUtils; import org.argeo.slc.runtime.SlcExecutionOutput; +import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; @@ -45,7 +46,7 @@ public class AntSlcApplication { private final static Log log = LogFactory.getLog(AntSlcApplication.class); private Resource contextLocation; - private ApplicationContext parentContext; + private ConfigurableApplicationContext parentContext; private Resource rootDir; private Resource confDir; @@ -248,8 +249,9 @@ public class AntSlcApplication { ListableBeanFactory context = (ListableBeanFactory) project .getReference(AntConstants.REF_ROOT_CONTEXT); // Register build listeners - Map listeners = context.getBeansOfType( - BuildListener.class, false, true); + Map listeners = BeanFactoryUtils + .beansOfTypeIncludingAncestors(context, BuildListener.class, + false, false); for (BuildListener listener : listeners.values()) { project.addBuildListener(listener); } @@ -399,7 +401,7 @@ public class AntSlcApplication { this.workDir = workDir; } - public void setParentContext(ApplicationContext runtimeContext) { + public void setParentContext(ConfigurableApplicationContext runtimeContext) { this.parentContext = runtimeContext; }