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

INT-807 upgraded to Spring 3.0.RC1

Browse Source
This commit is contained in:
Mark Fisher
2009-09-29 04:22:30 +00:00
parent 4ebc214583
commit 92ac1b760a
24 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.integration/.classpath
View File

@@ -11,15 +11,15 @@
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-4.6.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.6.0/com.springsource.org.junit-sources-4.6.0.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.M4/org.springframework.aop-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.M4/org.springframework.asm-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.M4/org.springframework.beans-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.M4/org.springframework.context-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.M4/org.springframework.context.support-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.M4/org.springframework.core-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.M4/org.springframework.expression-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.M4/org.springframework.transaction-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-3.0.0.M4.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.M4/org.springframework.test-sources-3.0.0.M4.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC1/org.springframework.aop-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.aop/3.0.0.RC1/org.springframework.aop-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.RC1/org.springframework.asm-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.asm/3.0.0.RC1/org.springframework.asm-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.beans/3.0.0.RC1/org.springframework.beans-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context/3.0.0.RC1/org.springframework.context-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RC1/org.springframework.context.support-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.context.support/3.0.0.RC1/org.springframework.context.support-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.core/3.0.0.RC1/org.springframework.core-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.expression/3.0.0.RC1/org.springframework.expression-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.transaction/3.0.0.RC1/org.springframework.transaction-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-3.0.0.RC1.jar" sourcepath="/IVY_CACHE/org.springframework/org.springframework.test/3.0.0.RC1/org.springframework.test-sources-3.0.0.RC1.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-1.6.0.jar" sourcepath="/IVY_CACHE/org.mockito/com.springsource.org.mockito/1.6.0/com.springsource.org.mockito-sources-1.6.0.jar" />
<classpathentry kind="var" path="IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-1.0.0.jar" sourcepath="/IVY_CACHE/org.objenesis/com.springsource.org.objenesis/1.0.0/com.springsource.org.objenesis-sources-1.0.0.jar" />
<classpathentry kind="output" path="target/classes" />

5
org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java
View File

@@ -144,7 +144,10 @@ public class MessagePublishingInterceptor implements MethodInterceptor {
String[] headerExpressionStrings = this.expressionSource.getHeaderExpressions(method);
if (headerExpressionStrings != null) {
Map<String, Object> headers = new HashMap<String, Object>();
context.setRootObject(headers);
// TODO: avoid this downcast
((StandardEvaluationContext) context).setRootObject(headers);
for (String headerExpression : headerExpressionStrings) {
if (StringUtils.hasText(headerExpression)) {
Expression expression = this.parser.parseExpression(headerExpression);

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/ExecutorChannel.java
View File

@@ -23,8 +23,8 @@ import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.dispatcher.LoadBalancingStrategy;
import org.springframework.integration.dispatcher.UnicastingDispatcher;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
/**
* An implementation of {@link MessageChannel} that delegates to an instance of

3
org.springframework.integration/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java
View File

@@ -18,7 +18,6 @@ package org.springframework.integration.channel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.integration.context.IntegrationContextUtils;
@@ -26,8 +25,8 @@ import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.message.ErrorMessage;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
/**
* {@link ErrorHandler} implementation that sends an {@link ErrorMessage} to a

2
org.springframework.integration/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java
View File

@@ -21,7 +21,7 @@ import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.dispatcher.BroadcastingDispatcher;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.ErrorHandler;
/**
* A channel that sends Messages to each of its subscribers.

3
org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
View File

@@ -21,7 +21,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
import org.aopalliance.aop.Advice;
import org.springframework.aop.framework.ProxyFactory;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.InitializingBean;
@@ -30,7 +29,6 @@ import org.springframework.integration.channel.BeanFactoryChannelResolver;
import org.springframework.integration.channel.MessagePublishingErrorHandler;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.scheduling.Trigger;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
@@ -39,6 +37,7 @@ import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ErrorHandler;
/**
* @author Mark Fisher

2
org.springframework.integration/src/main/java/org/springframework/integration/util/ErrorHandlingTaskExecutor.java
View File

@@ -17,8 +17,8 @@
package org.springframework.integration.util;
import org.springframework.core.task.TaskExecutor;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.Assert;
import org.springframework.util.ErrorHandler;
/**
* A {@link TaskExecutor} implementation that wraps an existing TaskExecutor

2
org.springframework.integration/src/test/java/org/springframework/integration/config/PublishSubscribeChannelParserTests.java
View File

@@ -30,7 +30,7 @@ import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.channel.PublishSubscribeChannel;
import org.springframework.integration.dispatcher.BroadcastingDispatcher;
import org.springframework.integration.util.ErrorHandlingTaskExecutor;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.ErrorHandler;
/**
* @author Mark Fisher

2
org.springframework.integration/src/test/java/org/springframework/integration/config/TestErrorHandler.java
View File

@@ -16,7 +16,7 @@
package org.springframework.integration.config;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.ErrorHandler;
/**
* @author Mark Fisher

2
org.springframework.integration/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java
View File

@@ -42,7 +42,7 @@ import org.springframework.integration.message.StringMessage;
import org.springframework.scheduling.Trigger;
import org.springframework.scheduling.TriggerContext;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.util.ErrorHandler;
/**
* @author Iwein Fuld

10
org.springframework.integration/src/test/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -17,8 +17,12 @@
package org.springframework.integration.test.util;
import static org.hamcrest.CoreMatchers.is;
import org.hamcrest.Matcher;
import static org.junit.Assert.assertThat;
import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
import org.hamcrest.Matcher;
import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.BeanFactory;
@@ -39,11 +43,9 @@ import org.springframework.integration.message.MessageHandler;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.MessageRejectedException;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.scheduling.support.ErrorHandler;
import org.springframework.scheduling.support.PeriodicTrigger;
import org.springframework.util.Assert;
import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
import org.springframework.util.ErrorHandler;
/**
* @author Mark Fisher