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

Removed cycles.

Browse Source
This commit is contained in:
Mark Fisher
2008-11-25 21:43:36 +00:00
parent 9ab1e73996
commit 3b8e7e5b4b
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
View File

@@ -32,6 +32,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.endpoint.PollingConsumer;
import org.springframework.integration.message.MessageHandler;
import org.springframework.integration.scheduling.PollerMetadata;
import org.springframework.util.Assert;
/**

1
org.springframework.integration/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
View File

@@ -27,6 +27,7 @@ import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.scheduling.PollerMetadata;
import org.springframework.util.Assert;
/**

3
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
View File

@@ -154,7 +154,8 @@ public abstract class IntegrationNamespaceUtils {
else {
ParserContext childContext = new ParserContext(
parserContext.getReaderContext(), parserContext.getDelegate(), targetBuilder.getBeanDefinition());
BeanDefinition beanDefinition = new PollerParser().parse(pollerElement, childContext);
BeanDefinition beanDefinition = parserContext.getReaderContext().getNamespaceHandlerResolver().resolve(
pollerElement.getNamespaceURI()).parse(pollerElement, childContext);
Assert.notNull(beanDefinition, "BeanDefinition must not be null");
Assert.isInstanceOf(AbstractBeanDefinition.class, beanDefinition);
pollerMetadataRef = BeanDefinitionReaderUtils.registerWithGeneratedName(

2
org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
View File

@@ -26,10 +26,10 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.PollerMetadata;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.scheduling.CronTrigger;
import org.springframework.integration.scheduling.IntervalTrigger;
import org.springframework.integration.scheduling.PollerMetadata;
import org.springframework.transaction.support.DefaultTransactionDefinition;
import org.springframework.util.Assert;
import org.springframework.util.xml.DomUtils;

2
org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
View File

@@ -19,8 +19,8 @@ package org.springframework.integration.context;
import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.config.PollerMetadata;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.scheduling.PollerMetadata;
import org.springframework.integration.scheduling.TaskScheduler;
import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;

3
org.springframework.integration/src/main/java/org/springframework/integration/config/PollerMetadata.java → org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
View File

@@ -14,10 +14,9 @@
* limitations under the License.
*/
package org.springframework.integration.config;
package org.springframework.integration.scheduling;
import org.springframework.core.task.TaskExecutor;
import org.springframework.integration.scheduling.Trigger;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;