Remove duplicate test classes

Prior to this commit many test utility classes and sample beans were
duplicated across projects. This was previously necessary due to the
fact that dependent test sources were not shared during a gradle
build. Since the introduction of the 'test-source-set-dependencies'
gradle plugin this is no longer the case.

This commit attempts to remove as much duplicate code as possible,
co-locating test utilities and beans in the most suitable project.
For example, test beans are now located in the 'spring-beans'
project.

Some of the duplicated code had started to drift apart when
modifications made in one project where not ported to others. All
changes have now been consolidated and when necessary existing tests
have been refactored to account for the differences.

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/factory/ConcurrentBeanFactoryTests.java
	spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
	spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java

spring-test/src/test/java/org/springframework/beans/Colour.java

@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2007 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import org.springframework.core.enums.ShortCodedLabeledEnum;
-
-/**
- * @author Rob Harrop
- */
-@SuppressWarnings({ "serial", "deprecation" })
-public class Colour extends ShortCodedLabeledEnum {
-
-	public static final Colour RED = new Colour(0, "RED");
-	public static final Colour BLUE = new Colour(1, "BLUE");
-	public static final Colour GREEN = new Colour(2, "GREEN");
-	public static final Colour PURPLE = new Colour(3, "PURPLE");
-
-
-	private Colour(int code, String label) {
-		super(code, label);
-	}
-
-}

spring-test/src/test/java/org/springframework/beans/Employee.java

@@ -1,39 +0,0 @@
-
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public class Employee extends TestBean {
-
-	private String co;
-
-	/**
-	 * Constructor for Employee.
-	 */
-	public Employee() {
-		super();
-	}
-
-	public String getCompany() {
-		return co;
-	}
-
-	public void setCompany(String co) {
-		this.co = co;
-	}
-
-}

spring-test/src/test/java/org/springframework/beans/INestedTestBean.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface INestedTestBean {
-
-	public String getCompany();
-
-}

spring-test/src/test/java/org/springframework/beans/IOther.java

@@ -1,24 +0,0 @@
-
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-public interface IOther {
-
-	void absquatulate();
-
-}

spring-test/src/test/java/org/springframework/beans/ITestBean.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-
-/**
- * Interface used for {@link org.springframework.beans.TestBean}.
- *
- * <p>Two methods are the same as on Person, but if this
- * extends person it breaks quite a few tests..
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-public interface ITestBean {
-
-	int getAge();
-
-	void setAge(int age);
-
-	String getName();
-
-	void setName(String name);
-
-	ITestBean getSpouse();
-
-	void setSpouse(ITestBean spouse);
-
-	ITestBean[] getSpouses();
-
-	String[] getStringArray();
-
-	void setStringArray(String[] stringArray);
-
-	/**
-	 * Throws a given (non-null) exception.
-	 */
-	void exceptional(Throwable t) throws Throwable;
-
-	Object returnsThis();
-
-	INestedTestBean getDoctor();
-
-	INestedTestBean getLawyer();
-
-	IndexedTestBean getNestedIndexedBean();
-
-	/**
-	 * Increment the age by one.
-	 * @return the previous age
-	 */
-	int haveBirthday();
-
-	void unreliableFileOperation() throws IOException;
-
-}

spring-test/src/test/java/org/springframework/beans/IndexedTestBean.java

@@ -1,146 +0,0 @@
-/*
- * Copyright 2002-2006 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * @author Juergen Hoeller
- * @since 11.11.2003
- */
-@SuppressWarnings("rawtypes")
-public class IndexedTestBean {
-
-	private TestBean[] array;
-
-	private Collection collection;
-
-	private List list;
-
-	private Set set;
-
-	private SortedSet sortedSet;
-
-	private Map map;
-
-	private SortedMap sortedMap;
-
-
-	public IndexedTestBean() {
-		this(true);
-	}
-
-	public IndexedTestBean(boolean populate) {
-		if (populate) {
-			populate();
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	public void populate() {
-		TestBean tb0 = new TestBean("name0", 0);
-		TestBean tb1 = new TestBean("name1", 0);
-		TestBean tb2 = new TestBean("name2", 0);
-		TestBean tb3 = new TestBean("name3", 0);
-		TestBean tb4 = new TestBean("name4", 0);
-		TestBean tb5 = new TestBean("name5", 0);
-		TestBean tb6 = new TestBean("name6", 0);
-		TestBean tb7 = new TestBean("name7", 0);
-		TestBean tbX = new TestBean("nameX", 0);
-		TestBean tbY = new TestBean("nameY", 0);
-		this.array = new TestBean[] { tb0, tb1 };
-		this.list = new ArrayList();
-		this.list.add(tb2);
-		this.list.add(tb3);
-		this.set = new TreeSet();
-		this.set.add(tb6);
-		this.set.add(tb7);
-		this.map = new HashMap();
-		this.map.put("key1", tb4);
-		this.map.put("key2", tb5);
-		this.map.put("key.3", tb5);
-		List list = new ArrayList();
-		list.add(tbX);
-		list.add(tbY);
-		this.map.put("key4", list);
-	}
-
-	public TestBean[] getArray() {
-		return array;
-	}
-
-	public void setArray(TestBean[] array) {
-		this.array = array;
-	}
-
-	public Collection getCollection() {
-		return collection;
-	}
-
-	public void setCollection(Collection collection) {
-		this.collection = collection;
-	}
-
-	public List getList() {
-		return list;
-	}
-
-	public void setList(List list) {
-		this.list = list;
-	}
-
-	public Set getSet() {
-		return set;
-	}
-
-	public void setSet(Set set) {
-		this.set = set;
-	}
-
-	public SortedSet getSortedSet() {
-		return sortedSet;
-	}
-
-	public void setSortedSet(SortedSet sortedSet) {
-		this.sortedSet = sortedSet;
-	}
-
-	public Map getMap() {
-		return map;
-	}
-
-	public void setMap(Map map) {
-		this.map = map;
-	}
-
-	public SortedMap getSortedMap() {
-		return sortedMap;
-	}
-
-	public void setSortedMap(SortedMap sortedMap) {
-		this.sortedMap = sortedMap;
-	}
-
-}

spring-test/src/test/java/org/springframework/beans/NestedTestBean.java

@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * Simple nested test bean used for testing bean factories, AOP framework etc.
- *
- * @author Trevor D. Cook
- * @since 30.09.2003
- */
-public class NestedTestBean implements INestedTestBean {
-
-	private String company = "";
-
-	public NestedTestBean() {
-	}
-
-	public NestedTestBean(String company) {
-		setCompany(company);
-	}
-
-	public void setCompany(String company) {
-		this.company = (company != null ? company : "");
-	}
-
-	@Override
-	public String getCompany() {
-		return company;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof NestedTestBean)) {
-			return false;
-		}
-		NestedTestBean ntb = (NestedTestBean) obj;
-		return this.company.equals(ntb.company);
-	}
-
-	public int hashCode() {
-		return this.company.hashCode();
-	}
-
-	public String toString() {
-		return "NestedTestBean: " + this.company;
-	}
-
-}

spring-test/src/test/java/org/springframework/beans/Pet.java

@@ -1,54 +0,0 @@
-/*
- * Copyright 2002-2006 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-/**
- * @author Rob Harrop
- * @since 2.0
- */
-public class Pet {
-
-	private String name;
-
-	public Pet(String name) {
-		this.name = name;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String toString() {
-		return getName();
-	}
-
-	public boolean equals(Object o) {
-		if (this == o) return true;
-		if (o == null || getClass() != o.getClass()) return false;
-
-		final Pet pet = (Pet) o;
-
-		if (name != null ? !name.equals(pet.name) : pet.name != null) return false;
-
-		return true;
-	}
-
-	public int hashCode() {
-		return (name != null ? name.hashCode() : 0);
-	}
-
-}

spring-test/src/test/java/org/springframework/beans/TestBean.java

@@ -1,455 +0,0 @@
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.beans;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.BeanNameAware;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Simple test bean used for testing bean factories, the AOP framework etc.
- *
- * @author Rod Johnson
- * @author Juergen Hoeller
- * @since 15 April 2001
- */
-@SuppressWarnings("rawtypes")
-public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
-
-	private String beanName;
-
-	private String country;
-
-	private BeanFactory beanFactory;
-
-	private boolean postProcessed;
-
-	private String name;
-
-	private String sex;
-
-	private int age;
-
-	private boolean jedi;
-
-	private ITestBean[] spouses;
-
-	private String touchy;
-
-	private String[] stringArray;
-
-	private Integer[] someIntegerArray;
-
-	private Date date = new Date();
-
-	private Float myFloat = new Float(0.0);
-
-	private Collection friends = new LinkedList();
-
-	private Set someSet = new HashSet();
-
-	private Map someMap = new HashMap();
-
-	private List someList = new ArrayList();
-
-	private Properties someProperties = new Properties();
-
-	private INestedTestBean doctor = new NestedTestBean();
-
-	private INestedTestBean lawyer = new NestedTestBean();
-
-	private IndexedTestBean nestedIndexedBean;
-
-	private boolean destroyed;
-
-	private Number someNumber;
-
-	private Colour favouriteColour;
-
-	private Boolean someBoolean;
-
-	private List otherColours;
-
-	private List pets;
-
-
-	public TestBean() {
-	}
-
-	public TestBean(String name) {
-		this.name = name;
-	}
-
-	public TestBean(ITestBean spouse) {
-		this.spouses = new ITestBean[] { spouse };
-	}
-
-	public TestBean(String name, int age) {
-		this.name = name;
-		this.age = age;
-	}
-
-	public TestBean(ITestBean spouse, Properties someProperties) {
-		this.spouses = new ITestBean[] { spouse };
-		this.someProperties = someProperties;
-	}
-
-	public TestBean(List someList) {
-		this.someList = someList;
-	}
-
-	public TestBean(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public TestBean(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public TestBean(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public String getBeanName() {
-		return beanName;
-	}
-
-	@Override
-	public void setBeanFactory(BeanFactory beanFactory) {
-		this.beanFactory = beanFactory;
-	}
-
-	public BeanFactory getBeanFactory() {
-		return beanFactory;
-	}
-
-	public void setPostProcessed(boolean postProcessed) {
-		this.postProcessed = postProcessed;
-	}
-
-	public boolean isPostProcessed() {
-		return postProcessed;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSex() {
-		return sex;
-	}
-
-	public void setSex(String sex) {
-		this.sex = sex;
-		if (this.name == null) {
-			this.name = sex;
-		}
-	}
-
-	@Override
-	public int getAge() {
-		return age;
-	}
-
-	@Override
-	public void setAge(int age) {
-		this.age = age;
-	}
-
-	public boolean isJedi() {
-		return jedi;
-	}
-
-	public void setJedi(boolean jedi) {
-		this.jedi = jedi;
-	}
-
-	@Override
-	public ITestBean getSpouse() {
-		return (spouses != null ? spouses[0] : null);
-	}
-
-	@Override
-	public void setSpouse(ITestBean spouse) {
-		this.spouses = new ITestBean[] { spouse };
-	}
-
-	@Override
-	public ITestBean[] getSpouses() {
-		return spouses;
-	}
-
-	public String getTouchy() {
-		return touchy;
-	}
-
-	public void setTouchy(String touchy) throws Exception {
-		if (touchy.indexOf('.') != -1) {
-			throw new Exception("Can't contain a .");
-		}
-		if (touchy.indexOf(',') != -1) {
-			throw new NumberFormatException("Number format exception: contains a ,");
-		}
-		this.touchy = touchy;
-	}
-
-	public String getCountry() {
-		return country;
-	}
-
-	public void setCountry(String country) {
-		this.country = country;
-	}
-
-	@Override
-	public String[] getStringArray() {
-		return stringArray;
-	}
-
-	@Override
-	public void setStringArray(String[] stringArray) {
-		this.stringArray = stringArray;
-	}
-
-	public Integer[] getSomeIntegerArray() {
-		return someIntegerArray;
-	}
-
-	public void setSomeIntegerArray(Integer[] someIntegerArray) {
-		this.someIntegerArray = someIntegerArray;
-	}
-
-	public Date getDate() {
-		return date;
-	}
-
-	public void setDate(Date date) {
-		this.date = date;
-	}
-
-	public Float getMyFloat() {
-		return myFloat;
-	}
-
-	public void setMyFloat(Float myFloat) {
-		this.myFloat = myFloat;
-	}
-
-	public Collection getFriends() {
-		return friends;
-	}
-
-	public void setFriends(Collection friends) {
-		this.friends = friends;
-	}
-
-	public Set getSomeSet() {
-		return someSet;
-	}
-
-	public void setSomeSet(Set someSet) {
-		this.someSet = someSet;
-	}
-
-	public Map getSomeMap() {
-		return someMap;
-	}
-
-	public void setSomeMap(Map someMap) {
-		this.someMap = someMap;
-	}
-
-	public List getSomeList() {
-		return someList;
-	}
-
-	public void setSomeList(List someList) {
-		this.someList = someList;
-	}
-
-	public Properties getSomeProperties() {
-		return someProperties;
-	}
-
-	public void setSomeProperties(Properties someProperties) {
-		this.someProperties = someProperties;
-	}
-
-	@Override
-	public INestedTestBean getDoctor() {
-		return doctor;
-	}
-
-	public void setDoctor(INestedTestBean doctor) {
-		this.doctor = doctor;
-	}
-
-	@Override
-	public INestedTestBean getLawyer() {
-		return lawyer;
-	}
-
-	public void setLawyer(INestedTestBean lawyer) {
-		this.lawyer = lawyer;
-	}
-
-	public Number getSomeNumber() {
-		return someNumber;
-	}
-
-	public void setSomeNumber(Number someNumber) {
-		this.someNumber = someNumber;
-	}
-
-	public Colour getFavouriteColour() {
-		return favouriteColour;
-	}
-
-	public void setFavouriteColour(Colour favouriteColour) {
-		this.favouriteColour = favouriteColour;
-	}
-
-	public Boolean getSomeBoolean() {
-		return someBoolean;
-	}
-
-	public void setSomeBoolean(Boolean someBoolean) {
-		this.someBoolean = someBoolean;
-	}
-
-	@Override
-	public IndexedTestBean getNestedIndexedBean() {
-		return nestedIndexedBean;
-	}
-
-	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
-		this.nestedIndexedBean = nestedIndexedBean;
-	}
-
-	public List getOtherColours() {
-		return otherColours;
-	}
-
-	public void setOtherColours(List otherColours) {
-		this.otherColours = otherColours;
-	}
-
-	public List getPets() {
-		return pets;
-	}
-
-	public void setPets(List pets) {
-		this.pets = pets;
-	}
-
-	/**
-	 * @see ITestBean#exceptional(Throwable)
-	 */
-	@Override
-	public void exceptional(Throwable t) throws Throwable {
-		if (t != null) {
-			throw t;
-		}
-	}
-
-	@Override
-	public void unreliableFileOperation() throws IOException {
-		throw new IOException();
-	}
-
-	/**
-	 * @see ITestBean#returnsThis()
-	 */
-	@Override
-	public Object returnsThis() {
-		return this;
-	}
-
-	/**
-	 * @see IOther#absquatulate()
-	 */
-	@Override
-	public void absquatulate() {
-	}
-
-	@Override
-	public int haveBirthday() {
-		return age++;
-	}
-
-	public void destroy() {
-		this.destroyed = true;
-	}
-
-	public boolean wasDestroyed() {
-		return destroyed;
-	}
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (other == null || !(other instanceof TestBean)) {
-			return false;
-		}
-		TestBean tb2 = (TestBean) other;
-		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
-	}
-
-	public int hashCode() {
-		return this.age;
-	}
-
-	@Override
-	public int compareTo(Object other) {
-		if (this.name != null && other instanceof TestBean) {
-			return this.name.compareTo(((TestBean) other).getName());
-		}
-		else {
-			return 1;
-		}
-	}
-
-	public String toString() {
-		return this.name;
-	}
-
-}

spring-test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ApplicationContext;
 

spring-test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties

@@ -1,2 +1,2 @@
-cat.(class)=org.springframework.beans.Pet
+cat.(class)=org.springframework.tests.sample.beans.Pet
 cat.$0=Garfield

spring-test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml

@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-	<bean id="cat" class="org.springframework.beans.Pet">
+	<bean id="cat" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Garfield" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests-context.properties

@@ -1,4 +1,4 @@
-dog.(class)=org.springframework.beans.Pet
+dog.(class)=org.springframework.tests.sample.beans.Pet
 dog.$0=Fido
 
 testString2.(class)=java.lang.String

spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesAndInheritedLoaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextLoader;

spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests-context.properties

@@ -1,4 +1,4 @@
-dog.(class)=org.springframework.beans.Pet
+dog.(class)=org.springframework.tests.sample.beans.Pet
 dog.$0=Fido
 
 testString2.(class)=java.lang.String

spring-test/src/test/java/org/springframework/test/context/configuration/ContextConfigurationWithPropertiesExtendingPropertiesTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.ContextLoader;

spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml

@@ -3,13 +3,13 @@
 	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="employee" class="org.springframework.beans.Employee">
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
 		<property name="age" value="42" />
 		<property name="company" value="Acme Widgets, Inc." />
 	</bean>
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -23,8 +23,8 @@ import javax.sql.DataSource;
 
 import org.junit.internal.runners.JUnit38ClassRunner;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml

@@ -8,13 +8,13 @@
 	<bean id="databaseSetup"
 		class="org.springframework.test.context.junit4.ConcreteTransactionalJUnit4SpringContextTests$DatabaseSetup" />
 
-	<bean id="employee" class="org.springframework.beans.Employee">
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
 		<property name="age" value="42" />
 		<property name="company" value="Acme Widgets, Inc." />
 	</bean>
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -29,8 +29,8 @@ import javax.sql.DataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

spring-test/src/test/java/org/springframework/test/context/junit4/CustomDefaultContextLoaderClassSpringRunnerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.model.InitializationError;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.support.GenericPropertiesContextLoader;

spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml

@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="employee" class="org.springframework.beans.Employee">
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
 		<property name="age" value="42" />
 		<property name="company" value="Acme Widgets, Inc." />

spring-test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml

@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml

@@ -2,19 +2,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="employee1" class="org.springframework.beans.Employee">
+	<bean id="employee1" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
 		<property name="age" value="42" />
 		<property name="company" value="Acme Widgets, Inc." />
 	</bean>
 
-	<bean id="employee2" class="org.springframework.beans.Employee">
+	<bean id="employee2" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="Jane Smith" />
 		<property name="age" value="38" />
 		<property name="company" value="Acme Widgets, Inc." />
 	</bean>
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -31,8 +31,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;

spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties

@@ -1,4 +1,4 @@
-cat.(class)=org.springframework.beans.Pet
+cat.(class)=org.springframework.tests.sample.beans.Pet
 cat.$0=Garfield
 
 testString.(class)=java.lang.String

spring-test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -24,7 +24,7 @@ import java.util.Properties;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;

spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml

@@ -2,13 +2,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="employee" class="org.springframework.beans.Employee">
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
 		<property name="age" value="42" />
 		<property name="company" value="Acme Widgets, Inc." />
 	</bean>
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -29,8 +29,8 @@ import javax.inject.Named;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.BeansException;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderBeanOverridingDefaultConfigClassesInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesBaseTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderDefaultConfigClassesInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesBaseTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultLoaderExplicitConfigClassesInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,8 +16,8 @@
 
 package org.springframework.test.context.junit4.annotation;
 
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileAnnotationConfigTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DefaultProfileConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.profile.annotation;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.profile.annotation;
 
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;

spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileAnnotationConfigTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DefaultProfileConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.profile.importresource;
 
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;

spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/import.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
 	<beans profile="dev">
-		<bean id="employee" class="org.springframework.beans.Employee">
+		<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 			<property name="name" value="John Smith" />
 			<property name="age" value="42" />
 			<property name="company" value="Acme Widgets, Inc." />

spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml

@@ -2,12 +2,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 
 	<beans profile="dev">
-		<bean id="employee" class="org.springframework.beans.Employee">
+		<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 			<property name="name" value="John Smith" />
 			<property name="age" value="42" />
 			<property name="company" value="Acme Widgets, Inc." />

spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml

@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="employee" class="org.springframework.beans.Employee">
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="Yoda" />
 		<property name="age" value="900" />
 		<property name="company" value="The Force" />

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml

@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="employee" class="org.springframework.beans.Employee">
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee">
 		<property name="name" value="John Smith" />
 		<property name="age" value="42" />
 		<property name="company" value="Acme Widgets, Inc." />

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml

@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="pet" class="org.springframework.beans.Pet">
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet">
 		<constructor-arg value="Fido" />
 	</bean>
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

spring-test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/AbstractTransactionalAnnotatedConfigClassTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -27,7 +27,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;

spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassWithAtConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertSame;
 import javax.sql.DataSource;
 
 import org.junit.Before;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;

spring-test/src/test/java/org/springframework/test/context/junit4/spr9051/TransactionalAnnotatedConfigClassesWithoutAtConfigurationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotSame;
 import javax.sql.DataSource;
 
 import org.junit.Before;
-import org.springframework.beans.Employee;
+import org.springframework.tests.sample.beans.Employee;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.jdbc.core.JdbcTemplate;

spring-test/src/test/java/org/springframework/test/context/junit4/spr9604/LookUpTxMgrViaTransactionManagementConfigurerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9604;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 import org.springframework.transaction.annotation.Transactional;

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpNonexistentTxMgrTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndDefaultNameTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndNameTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -27,7 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.test.context.transaction.TransactionConfiguration;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtClassLevelTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeAndQualifierAtMethodLevelTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 

spring-test/src/test/java/org/springframework/test/context/junit4/spr9645/LookUpTxMgrByTypeTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,7 +16,7 @@
 
 package org.springframework.test.context.junit4.spr9645;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
-import org.springframework.test.transaction.CallCountingTransactionManager;
+import org.springframework.tests.transaction.CallCountingTransactionManager;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 

spring-test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -23,8 +23,8 @@ import static org.testng.Assert.assertNotNull;
 
 import javax.sql.DataSource;
 
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml

@@ -5,10 +5,10 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
-	<bean id="employee" class="org.springframework.beans.Employee" p:name="John Smith" p:age="42"
+	<bean id="employee" class="org.springframework.tests.sample.beans.Employee" p:name="John Smith" p:age="42"
 		p:company="Acme Widgets, Inc." />
 
-	<bean id="pet" class="org.springframework.beans.Pet" c:_="Fido" />
+	<bean id="pet" class="org.springframework.tests.sample.beans.Pet" c:_="Fido" />
 
 	<bean id="foo" class="java.lang.String" c:_="Foo" />
 

spring-test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -25,8 +25,8 @@ import static org.testng.Assert.assertTrue;
 
 import javax.annotation.Resource;
 
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
+import org.springframework.tests.sample.beans.Employee;
+import org.springframework.tests.sample.beans.Pet;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

spring-test/src/test/java/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -20,7 +20,7 @@ import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpSession;

spring-test/src/test/java/org/springframework/test/transaction/CallCountingTransactionManager.java

@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2012 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.test.transaction;
-
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.support.AbstractPlatformTransactionManager;
-import org.springframework.transaction.support.DefaultTransactionStatus;
-
-/**
- * @author Rod Johnson
- * @author Juergen Hoeller
- */
-@SuppressWarnings("serial")
-public class CallCountingTransactionManager extends AbstractPlatformTransactionManager {
-
-	public TransactionDefinition lastDefinition;
-	public int begun;
-	public int commits;
-	public int rollbacks;
-	public int inflight;
-
-
-	@Override
-	protected Object doGetTransaction() {
-		return new Object();
-	}
-
-	@Override
-	protected void doBegin(Object transaction, TransactionDefinition definition) {
-		this.lastDefinition = definition;
-		++begun;
-		++inflight;
-	}
-
-	@Override
-	protected void doCommit(DefaultTransactionStatus status) {
-		++commits;
-		--inflight;
-	}
-
-	@Override
-	protected void doRollback(DefaultTransactionStatus status) {
-		++rollbacks;
-		--inflight;
-	}
-
-	public void clear() {
-		begun = commits = rollbacks = inflight = 0;
-	}
-
-}