moved XmlBeanFactoryTests and attendant XML from .testsuite -> .context

org.springframework.context/.classpath

@@ -31,6 +31,7 @@
 	<classpathentry kind="var" path="IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-3.0.0.jar" sourcepath="/IVY_CACHE/edu.emory.mathcs.backport/com.springsource.edu.emory.mathcs.backport/3.0.0/com.springsource.edu.emory.mathcs.backport-sources-3.0.0.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.antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-2.7.6.jar" sourcepath="/IVY_CACHE/org.antlr/com.springsource.antlr/2.7.6/com.springsource.antlr-sources-2.7.6.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-1.2.2.osgi.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi/com.springsource.org.apache.commons.dbcp-sources-1.2.2.osgi.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.expression"/>
 	<classpathentry kind="output" path="target/classes"/>

org.springframework.context/ivy.xml

@@ -42,7 +42,6 @@
 		<dependency org="org.antlr" name="com.springsource.antlr" rev="2.7.6" conf="test->compile"/>
 		<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
 		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="test->compile"/>
 		<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional, aspectj->compile"/>
 		<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
 		<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.5.1" conf="optional, groovy->compile"/>
@@ -55,6 +54,8 @@
 		<!-- test dependencies -->
 		<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="test->compile"/>
 		<dependency org="javax.xml.rpc" name="com.springsource.javax.xml.rpc" rev="1.1.0" conf="test->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="test->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.dbcp" rev="1.2.2.osgi" conf="test->runtime"/>
 		<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>
 		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime"/>
 		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>

org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<bean id="proxy1" class="org.springframework.aop.framework.ProxyFactoryBean">
+		<property name="proxyInterfaces" value="java.io.Serializable"/>
+		<property name="targetName" value="target1"/>
+	</bean>
+
+	<bean id="target1" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean"
+		autowire="constructor"/>
+
+	<bean id="toBeFoundByType" class="org.springframework.beans.TestBean"/>
+
+	<bean id="proxy2" class="org.springframework.aop.framework.ProxyFactoryBean">
+		<property name="proxyInterfaces" value="org.springframework.beans.ITestBean"/>
+		<property name="targetName" value="target2"/>
+	</bean>
+	
+	<bean id="target2" class="org.springframework.beans.factory.xml.DependenciesBean">
+		<property name="spouse">
+			<bean class="org.springframework.beans.TestBean">
+				<property name="someSet">
+					<set>
+						<ref local="proxy1"/>
+					</set>
+				</property>
+			</bean>
+		</property>
+	</bean>
+
+</beans>

org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-depMaterializeThis.xml

@@ -5,10 +5,6 @@
 
 	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"/>
 
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource"><ref local="dataSource"/></property>
-	</bean>
-
 	<bean id="dao" class="org.springframework.beans.factory.xml.DummyDao" autowire="constructor"/>
 
 	<bean id="boPrototype" autowire="constructor" class="org.springframework.beans.factory.xml.DummyBoImpl"
@@ -18,15 +14,9 @@
 		<property name="targetBeanName"><value>boPrototype</value></property>
 	</bean>
 
-	<bean id="prototypeBenchmark" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+	<bean id="prototypeBenchmark" class="org.springframework.aop.framework.ProxyFactoryBean">
-		<property name="transactionManager"><ref local="transactionManager"/></property>
 		<property name="target"><ref local="prototypeTargetSource"/></property>
 		<property name="proxyInterfaces"><value>org.springframework.beans.factory.xml.DummyBo</value></property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="placeOrder">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
 	</bean>
 
 	<bean id="boSingleton" autowire="constructor" class="org.springframework.beans.factory.xml.DummyBoImpl"/>

org.springframework.context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java

@@ -28,8 +28,6 @@ import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.Map;
 
-import javax.servlet.ServletException;
-
 import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
@@ -578,10 +576,10 @@ public final class XmlBeanFactoryTests {
 		XmlBeanFactory xbf = new XmlBeanFactory(COMPLEX_FACTORY_CIRCLE_CONTEXT);
 		xbf.getBean("proxy1");
 		// check that unused instances from autowiring got removed
-		assertEquals(5, xbf.getSingletonCount());
+		assertEquals(4, xbf.getSingletonCount());
 		// properly create the remaining two instances
 		xbf.getBean("proxy2");
-		assertEquals(7, xbf.getSingletonCount());
+		assertEquals(5, xbf.getSingletonCount());
 	}
 
 	public @Test void testNoSuchFactoryBeanMethod() {
@@ -614,7 +612,7 @@ public final class XmlBeanFactoryTests {
 		catch (BeanCreationException ex) {
 			assertTrue(ex.getResourceDescription().indexOf("initializers.xml") != -1);
 			assertEquals("init-method2", ex.getBeanName());
-			assertTrue(ex.getCause() instanceof ServletException);
+			assertTrue(ex.getCause() instanceof IOException);
 		}
 	}
 
@@ -680,7 +678,7 @@ public final class XmlBeanFactoryTests {
 			xbf.getBean("lazy-and-bad");
 		}
 		catch (BeanCreationException ex) {
-			assertTrue(ex.getCause() instanceof ServletException);
+			assertTrue(ex.getCause() instanceof IOException);
 		}
 	}
 
@@ -1387,8 +1385,8 @@ public final class XmlBeanFactoryTests {
 	public static class BadInitializer {
 
 		/** Init method */
-		public void init2() throws ServletException {
+		public void init2() throws IOException {
-			throw new ServletException();
+			throw new IOException();
 		}
 	}
 
@@ -1433,7 +1431,7 @@ public final class XmlBeanFactoryTests {
 		}
 
 		/** Init method */
-		public void customInit() throws ServletException {
+		public void customInit() throws IOException {
 			if (!this.afterPropertiesSetInvoked) {
 				fail();
 			}

org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests-complexFactoryCircle.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
-
-<beans>
-
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"/>
-
-	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
-		<property name="dataSource"><ref local="dataSource"/></property>
-	</bean>
-
-	<bean id="proxy1" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref local="transactionManager"/></property>
-		<property name="target"><ref local="target1"/></property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="target1" class="org.springframework.beans.factory.xml.ConstructorDependenciesBean"
-		autowire="constructor"/>
-
-	<bean id="toBeFoundByType" class="org.springframework.beans.TestBean"/>
-
-	<bean id="proxy2" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref local="transactionManager"/></property>
-		<property name="target"><ref local="target2"/></property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="target2" class="org.springframework.beans.factory.xml.DependenciesBean">
-		<property name="spouse">
-			<bean class="org.springframework.beans.TestBean">
-				<property name="someSet">
-					<set>
-						<ref local="proxy1"/>
-					</set>
-				</property>
-			</bean>
-		</property>
-	</bean>
-
-</beans>