From 7bf7e043140d8e50185a3fb6a358771566b29179 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 19 Aug 2011 15:42:50 -0400 Subject: [PATCH] reverting 3.1 BeanDefinitionParserDelegate usage --- .../xml/config/XPathExpressionParser.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java index 71bead6d25..715db852cd 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,18 +19,18 @@ package org.springframework.integration.xml.config; import java.util.HashMap; import java.util.Map; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.core.env.StandardEnvironment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.xml.xpath.XPathExpressionFactory; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * Parser for the <xpath-expression> element. @@ -99,8 +99,8 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { } protected Map parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) { - BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext(), new StandardEnvironment()); - beanParser.initDefaults(element.getOwnerDocument().getDocumentElement(), beanParser); + BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); + beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); return beanParser.parseMapElement(element, parentDefinition); }