Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed DefaultMessageBus to ApplicationContextMessageBus.

Browse Source
This commit is contained in:
Mark Fisher
2008-10-20 10:43:16 +00:00
parent 3df3961a9a
commit e31520bc64
14 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultMessageBus.java → org.springframework.integration/src/main/java/org/springframework/integration/bus/ApplicationContextMessageBus.java
View File

@@ -54,7 +54,7 @@ import org.springframework.util.Assert;
* @author Mark Fisher
* @author Marius Bogoevici
*/
public class DefaultMessageBus implements MessageBus, ApplicationContextAware, ApplicationListener, DisposableBean {
public class ApplicationContextMessageBus implements MessageBus, ApplicationContextAware, ApplicationListener, DisposableBean {
public static final String ERROR_CHANNEL_BEAN_NAME = "errorChannel";
@@ -287,25 +287,25 @@ public class DefaultMessageBus implements MessageBus, ApplicationContextAware, A
public void preStart() {
for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) {
messageBusInterceptor.preStart(DefaultMessageBus.this);
messageBusInterceptor.preStart(ApplicationContextMessageBus.this);
}
}
public void postStart() {
for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) {
messageBusInterceptor.postStart(DefaultMessageBus.this);
messageBusInterceptor.postStart(ApplicationContextMessageBus.this);
}
}
public void preStop() {
for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) {
messageBusInterceptor.preStop(DefaultMessageBus.this);
messageBusInterceptor.preStop(ApplicationContextMessageBus.this);
}
}
public void postStop() {
for (MessageBusInterceptor messageBusInterceptor : messageBusInterceptors) {
messageBusInterceptor.postStop(DefaultMessageBus.this);
messageBusInterceptor.postStop(ApplicationContextMessageBus.this);
}
}
}

2
org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java
View File

@@ -36,7 +36,7 @@ public class DefaultErrorChannel extends RendezvousChannel {
public DefaultErrorChannel() {
this.addInterceptor(new ErrorLoggingInterceptor());
this.setBeanName(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME);
this.setBeanName(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME);
}

8
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/MessageBusParser.java
View File

@@ -38,7 +38,7 @@ import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.context.event.SimpleApplicationEventMulticaster;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.bus.DefaultMessageBus;
import org.springframework.integration.bus.ApplicationContextMessageBus;
import org.springframework.integration.bus.MessageBus;
import org.springframework.integration.bus.MessageBusAwareBeanPostProcessor;
import org.springframework.integration.channel.QueueChannel;
@@ -84,7 +84,7 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser {
@Override
protected Class<?> getBeanClass(Element element) {
return DefaultMessageBus.class;
return ApplicationContextMessageBus.class;
}
@Override
@@ -100,10 +100,10 @@ public class MessageBusParser extends AbstractSimpleBeanDefinitionParser {
super.doParse(element, parserContext, builder);
String taskSchedulerRef = element.getAttribute(TASK_SCHEDULER_ATTRIBUTE);
TaskExecutor taskExecutor= null;
if (!parserContext.getRegistry().containsBeanDefinition(DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME)) {
if (!parserContext.getRegistry().containsBeanDefinition(ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME)) {
RootBeanDefinition errorChannelDef = new RootBeanDefinition(QueueChannel.class);
BeanDefinitionHolder errorChannelHolder = new BeanDefinitionHolder(
errorChannelDef, DefaultMessageBus.ERROR_CHANNEL_BEAN_NAME);
errorChannelDef, ApplicationContextMessageBus.ERROR_CHANNEL_BEAN_NAME);
BeanDefinitionReaderUtils.registerBeanDefinition(errorChannelHolder, parserContext.getRegistry());
}
if (StringUtils.hasText(taskSchedulerRef)) {