diff --git a/org.springframework.aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java b/org.springframework.aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
index e3df259fdc..de8beff487 100644
--- a/org.springframework.aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
+++ b/org.springframework.aop/src/main/java/org/springframework/aop/config/ConfigBeanDefinitionParser.java
@@ -102,20 +102,17 @@ class ConfigBeanDefinitionParser implements BeanDefinitionParser {
 
 		configureAutoProxyCreator(parserContext, element);
 
-		NodeList childNodes = element.getChildNodes();
-		for (int i = 0; i < childNodes.getLength(); i++) {
-			Node node = childNodes.item(i);
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				String localName = parserContext.getDelegate().getLocalName(node);
-				if (POINTCUT.equals(localName)) {
-					parsePointcut((Element) node, parserContext);
-				}
-				else if (ADVISOR.equals(localName)) {
-					parseAdvisor((Element) node, parserContext);
-				}
-				else if (ASPECT.equals(localName)) {
-					parseAspect((Element) node, parserContext);
-				}
+		List<Element> childElts = DomUtils.getChildElements(element);
+		for (Element elt: childElts) {
+			String localName = parserContext.getDelegate().getLocalName(elt);
+			if (POINTCUT.equals(localName)) {
+				parsePointcut(elt, parserContext);
+			}
+			else if (ADVISOR.equals(localName)) {
+				parseAdvisor(elt, parserContext);
+			}
+			else if (ASPECT.equals(localName)) {
+				parseAspect(elt, parserContext);
 			}
 		}
 
diff --git a/org.springframework.core/build.xml b/org.springframework.core/build.xml
index 9ec442705a..54975892df 100644
--- a/org.springframework.core/build.xml
+++ b/org.springframework.core/build.xml
@@ -22,3 +22,4 @@
 		</ivy:makepom>
 	</target>
 </project>
+ 
\ No newline at end of file
diff --git a/org.springframework.core/src/main/java/org/springframework/util/xml/DomUtils.java b/org.springframework.core/src/main/java/org/springframework/util/xml/DomUtils.java
index 7696d6b23b..62e1328fcf 100644
--- a/org.springframework.core/src/main/java/org/springframework/util/xml/DomUtils.java
+++ b/org.springframework.core/src/main/java/org/springframework/util/xml/DomUtils.java
@@ -38,6 +38,7 @@ import org.springframework.util.Assert;
  * @author Rob Harrop
  * @author Costin Leau
  * @author Arjen Poutsma
+ * @author Luke Taylor
  * @see org.w3c.dom.Node
  * @see org.w3c.dom.Element
  * @since 1.2
@@ -117,6 +118,25 @@ public abstract class DomUtils {
 		return (child != null ? getTextValue(child) : null);
 	}
 
+	/**
+	 * Retrieve all child elements of the given DOM element	
+
+	 * @param ele		   the DOM element to analyze
+	 * @return a List of child <code>org.w3c.dom.Element</code> instances
+	 */
+	public static List<Element> getChildElements(Element ele) {
+		Assert.notNull(ele, "Element must not be null");
+		NodeList nl = ele.getChildNodes();
+		List<Element> childEles = new ArrayList<Element>();
+		for (int i = 0; i < nl.getLength(); i++) {
+			Node node = nl.item(i);
+			if (node instanceof Element) {
+				childEles.add((Element) node);
+			}
+		}
+		return childEles;
+	}
+
 	/**
 	 * Extract the text value from the given DOM element, ignoring XML comments. <p>Appends all CharacterData nodes and
 	 * EntityReference nodes into a single String value, excluding Comment nodes.
diff --git a/org.springframework.oxm/.classpath b/org.springframework.oxm/.classpath
index 7ad7981795..4b30faa179 100644
--- a/org.springframework.oxm/.classpath
+++ b/org.springframework.oxm/.classpath
@@ -5,7 +5,7 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="lib" path="target/artifacts/org.springframework.oxm-sources.jar"/>
-	<classpathentry kind="lib" path="target/artifacts/org.springframework.oxm.jar"/>
+	<classpathentry exported="true" kind="lib" path="target/artifacts/org.springframework.oxm.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.thoughtworks.xstream/com.springsource.com.thoughtworks.xstream/1.3.1/com.springsource.com.thoughtworks.xstream-1.3.1.jar" sourcepath="/IVY_CACHE/com.thoughtworks.xstream/com.springsource.com.thoughtworks.xstream/1.3.1/com.springsource.com.thoughtworks.xstream-sources-1.3.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-2.1.7.jar" sourcepath="/IVY_CACHE/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-sources-2.1.7.jar"/>
diff --git a/org.springframework.web.servlet/.classpath b/org.springframework.web.servlet/.classpath
index 6e73dff6a9..9f097da290 100644
--- a/org.springframework.web.servlet/.classpath
+++ b/org.springframework.web.servlet/.classpath
@@ -12,7 +12,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.jdbc"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.orm"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.oxm"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.transaction"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.web"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.lowagie.text/com.springsource.com.lowagie.text/2.0.8/com.springsource.com.lowagie.text-2.0.8.jar" sourcepath="/IVY_CACHE/com.lowagie.text/com.springsource.com.lowagie.text/2.0.8/com.springsource.com.lowagie.text-sources-2.0.8.jar"/>
diff --git a/org.springframework.web/.classpath b/org.springframework.web/.classpath
index 72ec67a2ce..7752d41685 100644
--- a/org.springframework.web/.classpath
+++ b/org.springframework.web/.classpath
@@ -9,7 +9,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.beans"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.context"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.oxm"/>
 	<classpathentry kind="var" path="IVY_CACHE/com.caucho/com.springsource.com.caucho/3.2.1/com.springsource.com.caucho-3.2.1.jar" sourcepath="/IVY_CACHE/com.caucho/com.springsource.com.caucho/3.2.1/com.springsource.com.caucho-sources-3.2.1.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/1.0.0/com.springsource.javax.el-1.0.0.jar" sourcepath="/IVY_CACHE/javax.el/com.springsource.javax.el/1.0.0/com.springsource.javax.el-sources-1.0.0.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.faces/com.springsource.javax.faces/1.2.0.08/com.springsource.javax.faces-1.2.0.08.jar" sourcepath="/IVY_CACHE/javax.faces/com.springsource.javax.faces/1.2.0.08/com.springsource.javax.faces-sources-1.2.0.08.jar"/>