diff --git a/org.springframework.beans/src/test/java/common/beans/core/SideEffectBean.java b/org.springframework.beans/src/test/java/common/beans/core/SideEffectBean.java deleted file mode 100644 index 39d1f88db17..00000000000 --- a/org.springframework.beans/src/test/java/common/beans/core/SideEffectBean.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2005 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 common.beans.core; - -/** - * Bean that changes state on a business invocation, so that - * we can check whether it's been invoked - * @author Rod Johnson - */ -public class SideEffectBean { - - private int count; - - public void setCount(int count) { - this.count = count; - } - - public int getCount() { - return this.count; - } - - public void doWork() { - ++count; - } - -} diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanUtilsTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/BeanUtilsTests.java index 8089c829967..bae404235d7 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/BeanUtilsTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/BeanUtilsTests.java @@ -31,6 +31,8 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceEditor; import test.beans.DerivedTestBean; +import test.beans.ITestBean; +import test.beans.TestBean; /** * Unit tests for {@link BeanUtils}. diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java index cbbdef1a34e..7348aa5ee8a 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperGenericsTests.java @@ -39,6 +39,9 @@ import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; import test.beans.GenericBean; +import test.beans.GenericIntegerBean; +import test.beans.GenericSetOfIntegerBean; +import test.beans.TestBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java index cd3e4c181d7..d7ab4846408 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/BeanWrapperTests.java @@ -49,6 +49,10 @@ import org.springframework.util.StopWatch; import org.springframework.util.StringUtils; import test.beans.BooleanTestBean; +import test.beans.ITestBean; +import test.beans.IndexedTestBean; +import test.beans.NumberTestBean; +import test.beans.TestBean; /** * @author Rod Johnson diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java index 514d2b2984c..5e42a92584c 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/CachedIntrospectionResultsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2008 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,6 +21,8 @@ import static org.junit.Assert.*; import org.junit.Test; import org.springframework.core.OverridingClassLoader; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @author Chris Beams @@ -35,7 +37,7 @@ public final class CachedIntrospectionResultsTests { assertTrue(CachedIntrospectionResults.classCache.containsKey(TestBean.class)); ClassLoader child = new OverridingClassLoader(getClass().getClassLoader()); - Class tbClass = child.loadClass("org.springframework.beans.TestBean"); + Class tbClass = child.loadClass("test.beans.TestBean"); assertFalse(CachedIntrospectionResults.classCache.containsKey(tbClass)); CachedIntrospectionResults.acceptClassLoader(child); bw = new BeanWrapperImpl(tbClass); diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java index e27ccaccce7..4866cc101b6 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/ConcurrentBeanWrapperTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2005 the original author or authors. + * Copyright 2002-2008 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. diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java index 3b4fbc6af51..dd52eea7b82 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/annotation/RequiredAnnotationBeanPostProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2008 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. @@ -39,7 +39,7 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; * @author Chris Beams * @since 2.0 */ -public class RequiredAnnotationBeanPostProcessorTests { +public final class RequiredAnnotationBeanPostProcessorTests { @Test public void testWithRequiredPropertyOmitted() { diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java index 98bcb441d5c..4d660eb6a5b 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java @@ -24,9 +24,10 @@ import junit.framework.Assert; import org.springframework.beans.BeansException; import org.springframework.beans.PropertyBatchUpdateException; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.config.ConfigurableBeanFactory; +import test.beans.TestBean; + /** * Subclasses must implement setUp() to initialize bean factory * and any other variables they need. diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java index d683491a1f6..692525d6e92 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java @@ -18,7 +18,7 @@ package org.springframework.beans.factory; import junit.framework.Assert; -import org.springframework.beans.TestBean; +import test.beans.TestBean; /** * @author Rod Johnson diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java index 46b797f2f22..a2437df04c3 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/BeanFactoryUtilsTests.java @@ -26,15 +26,16 @@ import net.sf.cglib.proxy.NoOp; import org.junit.Before; import org.junit.Test; -import org.springframework.beans.ITestBean; -import org.springframework.beans.IndexedTestBean; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.StaticListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.util.ObjectUtils; +import test.beans.ITestBean; +import test.beans.IndexedTestBean; +import test.beans.TestBean; + /** * @author Rod Johnson * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java index 158b3e0d1ee..34b0a130eb3 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/CountingFactory.java @@ -16,7 +16,7 @@ package org.springframework.beans.factory; -import org.springframework.beans.TestBean; +import test.beans.TestBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java index 7049fa2f2ea..eba4cf13431 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java @@ -39,14 +39,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.springframework.beans.BeansException; -import org.springframework.beans.ITestBean; import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.NestedTestBean; import org.springframework.beans.NotWritablePropertyException; import org.springframework.beans.PropertyEditorRegistrar; import org.springframework.beans.PropertyEditorRegistry; import org.springframework.beans.PropertyValue; -import org.springframework.beans.TestBean; import org.springframework.beans.TypeConverter; import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; @@ -73,8 +70,9 @@ import org.springframework.core.io.UrlResource; import org.springframework.util.StopWatch; import test.beans.DerivedTestBean; - -import common.beans.core.SideEffectBean; +import test.beans.ITestBean; +import test.beans.NestedTestBean; +import test.beans.TestBean; /** * Tests properties population and autowire behavior. @@ -452,7 +450,7 @@ public class DefaultListableBeanFactoryTests { public void testPropertiesPopulationWithNullPrefix() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("test.(class)", "org.springframework.beans.TestBean"); + p.setProperty("test.(class)", TestBean.class.getName()); p.setProperty("test.name", "Tony"); p.setProperty("test.age", "48"); int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); @@ -465,7 +463,7 @@ public class DefaultListableBeanFactoryTests { String PREFIX = "beans."; DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty(PREFIX + "test.(class)", "org.springframework.beans.TestBean"); + p.setProperty(PREFIX + "test.(class)", TestBean.class.getName()); p.setProperty(PREFIX + "test.name", "Tony"); p.setProperty(PREFIX + "test.age", "0x30"); int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p, PREFIX); @@ -479,10 +477,10 @@ public class DefaultListableBeanFactoryTests { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty(PREFIX + "rod.(class)", "org.springframework.beans.TestBean"); + p.setProperty(PREFIX + "rod.(class)", TestBean.class.getName()); p.setProperty(PREFIX + "rod.name", "Rod"); - p.setProperty(PREFIX + "kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty(PREFIX + "kerry.(class)", TestBean.class.getName()); p.setProperty(PREFIX + "kerry.name", "Kerry"); p.setProperty(PREFIX + "kerry.age", "35"); p.setProperty(PREFIX + "kerry.spouse(ref)", "rod"); @@ -502,7 +500,7 @@ public class DefaultListableBeanFactoryTests { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("tb.(class)", "org.springframework.beans.TestBean"); + p.setProperty("tb.(class)", TestBean.class.getName()); p.setProperty("tb.someMap[my.key]", "my.value"); int count = (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); @@ -520,7 +518,7 @@ public class DefaultListableBeanFactoryTests { Properties p = new Properties(); try { - p.setProperty(PREFIX + "kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty(PREFIX + "kerry.(class)", TestBean.class.getName()); p.setProperty(PREFIX + "kerry.name", "Kerry"); p.setProperty(PREFIX + "kerry.age", "35"); p.setProperty(PREFIX + "kerry.spouse(ref)", "rod"); @@ -569,7 +567,7 @@ public class DefaultListableBeanFactoryTests { public void testPrototype() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty("kerry.(class)", TestBean.class.getName()); p.setProperty("kerry.age", "35"); (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); TestBean kerry1 = (TestBean) lbf.getBean("kerry"); @@ -579,7 +577,7 @@ public class DefaultListableBeanFactoryTests { lbf = new DefaultListableBeanFactory(); p = new Properties(); - p.setProperty("kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty("kerry.(class)", TestBean.class.getName()); p.setProperty("kerry.(scope)", "prototype"); p.setProperty("kerry.age", "35"); (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); @@ -590,7 +588,7 @@ public class DefaultListableBeanFactoryTests { lbf = new DefaultListableBeanFactory(); p = new Properties(); - p.setProperty("kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty("kerry.(class)", TestBean.class.getName()); p.setProperty("kerry.(scope)", "singleton"); p.setProperty("kerry.age", "35"); (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); @@ -604,11 +602,11 @@ public class DefaultListableBeanFactoryTests { public void testPrototypeCircleLeadsToException() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty("kerry.(class)", TestBean.class.getName()); p.setProperty("kerry.(singleton)", "false"); p.setProperty("kerry.age", "35"); p.setProperty("kerry.spouse", "*rod"); - p.setProperty("rod.(class)", "org.springframework.beans.TestBean"); + p.setProperty("rod.(class)", TestBean.class.getName()); p.setProperty("rod.(singleton)", "false"); p.setProperty("rod.age", "34"); p.setProperty("rod.spouse", "*kerry"); @@ -628,7 +626,7 @@ public class DefaultListableBeanFactoryTests { public void testPrototypeExtendsPrototype() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("wife.(class)", "org.springframework.beans.TestBean"); + p.setProperty("wife.(class)", TestBean.class.getName()); p.setProperty("wife.name", "kerry"); p.setProperty("kerry.(parent)", "wife"); @@ -642,7 +640,7 @@ public class DefaultListableBeanFactoryTests { lbf = new DefaultListableBeanFactory(); p = new Properties(); - p.setProperty("wife.(class)", "org.springframework.beans.TestBean"); + p.setProperty("wife.(class)", TestBean.class.getName()); p.setProperty("wife.name", "kerry"); p.setProperty("wife.(singleton)", "false"); p.setProperty("kerry.(parent)", "wife"); @@ -657,7 +655,7 @@ public class DefaultListableBeanFactoryTests { lbf = new DefaultListableBeanFactory(); p = new Properties(); - p.setProperty("kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty("kerry.(class)", TestBean.class.getName()); p.setProperty("kerry.(singleton)", "true"); p.setProperty("kerry.age", "35"); (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); @@ -696,7 +694,7 @@ public class DefaultListableBeanFactoryTests { public void testNameAlreadyBound() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("kerry.(class)", "org.springframework.beans.TestBean"); + p.setProperty("kerry.(class)", TestBean.class.getName()); p.setProperty("kerry.age", "35"); (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); try { @@ -883,7 +881,7 @@ public class DefaultListableBeanFactoryTests { public void testRegisterExistingSingletonWithReference() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("test.(class)", "org.springframework.beans.TestBean"); + p.setProperty("test.(class)", TestBean.class.getName()); p.setProperty("test.name", "Tony"); p.setProperty("test.age", "48"); p.setProperty("test.spouse(ref)", "singletonObject"); @@ -910,11 +908,11 @@ public class DefaultListableBeanFactoryTests { public void testRegisterExistingSingletonWithNameOverriding() { DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); Properties p = new Properties(); - p.setProperty("test.(class)", "org.springframework.beans.TestBean"); + p.setProperty("test.(class)", TestBean.class.getName()); p.setProperty("test.name", "Tony"); p.setProperty("test.age", "48"); p.setProperty("test.spouse(ref)", "singletonObject"); - p.setProperty("singletonObject.(class)", "org.springframework.beans.factory.config.PropertiesFactoryBean"); + p.setProperty("singletonObject.(class)", org.springframework.beans.factory.config.PropertiesFactoryBean.class.getName()); (new PropertiesBeanDefinitionReader(lbf)).registerBeanDefinitions(p); Object singletonObject = new TestBean(); lbf.registerSingleton("singletonObject", singletonObject); @@ -2348,5 +2346,28 @@ public class DefaultListableBeanFactoryTests { return this.userName; } } + + /** + * Bean that changes state on a business invocation, so that + * we can check whether it's been invoked + * @author Rod Johnson + */ + private static class SideEffectBean { + + private int count; + + public void setCount(int count) { + this.count = count; + } + + public int getCount() { + return this.count; + } + + public void doWork() { + ++count; + } + + } } diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/DummyFactory.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/DummyFactory.java index 006228975a7..d4f5906d839 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/DummyFactory.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/DummyFactory.java @@ -17,9 +17,10 @@ package org.springframework.beans.factory; import org.springframework.beans.BeansException; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; +import test.beans.TestBean; + /** * Simple factory to allow testing of FactoryBean support in AbstractBeanFactory. * Depending on whether its singleton property is set, it will return a singleton diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java index aa72ee42da9..41b178117e0 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/SharedBeanRegistryTests.java @@ -21,10 +21,10 @@ import java.util.Arrays; import junit.framework.TestCase; import org.springframework.beans.BeansException; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry; import test.beans.DerivedTestBean; +import test.beans.TestBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index 18bdc08026c..243bcfd8dd0 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -26,10 +26,6 @@ import java.util.List; import java.util.Map; import org.junit.Test; -import org.springframework.beans.ITestBean; -import org.springframework.beans.IndexedTestBean; -import org.springframework.beans.NestedTestBean; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.FactoryBean; @@ -38,6 +34,11 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.GenericBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; +import test.beans.ITestBean; +import test.beans.IndexedTestBean; +import test.beans.NestedTestBean; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @author Mark Fisher diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java index c00c22de600..a649dd0e0e2 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/CustomEditorConfigurerTests.java @@ -30,11 +30,12 @@ import org.springframework.beans.FatalBeanException; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.PropertyEditorRegistrar; import org.springframework.beans.PropertyEditorRegistry; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.propertyeditors.CustomDateEditor; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @since 31.07.2004 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java index a51b2a662fe..962f0efa215 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/FieldRetrievingFactoryBeanTests.java @@ -20,11 +20,12 @@ import java.sql.Connection; import junit.framework.TestCase; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @since 31.07.2004 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java index ec6fae46b5e..9dc28049d06 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyPathFactoryBeanTests.java @@ -18,11 +18,12 @@ package org.springframework.beans.factory.config; import junit.framework.TestCase; -import org.springframework.beans.ITestBean; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.xml.XmlBeanFactory; import org.springframework.core.io.ClassPathResource; +import test.beans.ITestBean; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @since 04.10.2004 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java index f4d59e4738e..6958b718547 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/PropertyResourceConfigurerTests.java @@ -28,9 +28,7 @@ import java.util.prefs.Preferences; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.beans.IndexedTestBean; import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -43,6 +41,9 @@ import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import test.beans.IndexedTestBean; +import test.beans.TestBean; + /** * Unit tests for various {@link PropertyResourceConfigurer} implementations including: * {@link PropertyPlaceholderConfigurer}, {@link PropertyOverrideConfigurer} and diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java index 1d013c30c66..4f0df32484c 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/SimpleScopeTests.java @@ -23,11 +23,12 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; +import test.beans.TestBean; + /** * Simple test to illustrate and verify scope usage. * diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/simpleScope.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/simpleScope.xml index 2bd9706f77e..f6f4f4a0a23 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/simpleScope.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/config/simpleScope.xml @@ -5,6 +5,6 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd"> - + diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/leaf.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/leaf.xml index 4183c20b691..bf756e1bbc5 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/leaf.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/leaf.xml @@ -3,7 +3,7 @@ - + custom 25 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/middle.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/middle.xml index ced3b8f2ea1..2d124050745 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/middle.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/middle.xml @@ -4,7 +4,7 @@ - + custom 666 @@ -13,7 +13,7 @@ Check that invoker is automatically added to wrap target. Non pointcut bean name should be wrapped in invoker. --> - + diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java index 5581384221e..61f404c2ade 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CustomProblemReporterTests.java @@ -21,11 +21,12 @@ import java.util.List; import junit.framework.TestCase; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * @author Rob Harrop * @since 2.0 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/root.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/root.xml index a5dbab5d43d..3f1289ae7e8 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/root.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/root.xml @@ -6,12 +6,12 @@ - + - + - + custom 25 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java index 143c929c74c..6eecc322e84 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionBuilderTests.java @@ -20,7 +20,7 @@ import java.util.Arrays; import junit.framework.TestCase; -import org.springframework.beans.TestBean; +import test.beans.TestBean; /** * @author Rod Johnson diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java index 786e41f08df..5adb1c49ce0 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanDefinitionTests.java @@ -18,9 +18,10 @@ package org.springframework.beans.factory.support; import junit.framework.TestCase; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.config.BeanDefinitionHolder; +import test.beans.TestBean; + /** * @author Juergen Hoeller */ diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java index 494aaa5ee4d..2ffa9c1d119 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java @@ -31,8 +31,6 @@ import java.util.Map; import java.util.Set; import org.junit.Test; -import org.springframework.beans.GenericIntegerBean; -import org.springframework.beans.GenericSetOfIntegerBean; import org.springframework.beans.PropertyEditorRegistrar; import org.springframework.beans.PropertyEditorRegistry; import org.springframework.beans.factory.xml.XmlBeanFactory; @@ -41,6 +39,8 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.UrlResource; import test.beans.GenericBean; +import test.beans.GenericIntegerBean; +import test.beans.GenericSetOfIntegerBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java index 48985a82e32..266bc56d530 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/DefinitionMetadataEqualsHashCodeTests.java @@ -18,10 +18,11 @@ package org.springframework.beans.factory.support; import junit.framework.TestCase; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; +import test.beans.TestBean; + /** * @author Rob Harrop */ diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java index 7f7618914d6..3442e720d4c 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReaderTests.java @@ -18,7 +18,8 @@ package org.springframework.beans.factory.support; import junit.framework.TestCase; import org.springframework.core.io.ClassPathResource; -import org.springframework.beans.TestBean; + +import test.beans.TestBean; /** * @author Rob Harrop diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml index 63614f687ca..6c9d11f210a 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/support/genericBeanTests.xml @@ -43,7 +43,7 @@ autowire="constructor"> - + @@ -53,7 +53,7 @@ - + diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java index a381e50ed76..6deeeb47c93 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/wiring/BeanConfigurerSupportTests.java @@ -19,11 +19,12 @@ package org.springframework.beans.factory.wiring; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.DefaultListableBeanFactory; +import test.beans.TestBean; + /** * @author Rick Evans * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java index 8e586b2ae9e..4c0bb7900df 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/AutowireWithExclusionTests.java @@ -19,7 +19,6 @@ package org.springframework.beans.factory.xml; import junit.framework.TestCase; import junit.framework.Assert; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.CountingFactory; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.beans.factory.config.RuntimeBeanReference; @@ -28,6 +27,8 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * @author Rob Harrop * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java index 42fae8868da..55f7f920f5c 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionMergingTests.java @@ -24,11 +24,12 @@ import java.util.Set; import junit.framework.TestCase; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.BeanDefinitionReader; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * Unit and integration tests for the collection merging support. * diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java index ae298609c1f..d4458a894c3 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/CollectionsWithDefaultTypesTests.java @@ -2,7 +2,8 @@ package org.springframework.beans.factory.xml; import junit.framework.TestCase; import org.springframework.core.io.ClassPathResource; -import org.springframework.beans.TestBean; + +import test.beans.TestBean; import java.util.List; import java.util.Set; diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java index 2d9f4a2b46b..72f32f07ef6 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ConstructorDependenciesBean.java @@ -18,8 +18,8 @@ package org.springframework.beans.factory.xml; import java.io.Serializable; -import org.springframework.beans.IndexedTestBean; -import org.springframework.beans.TestBean; +import test.beans.IndexedTestBean; +import test.beans.TestBean; /** * Simple bean used to check constructor dependency checking. diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java index 0ca614e051f..2a2b5dcdabc 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DependenciesBean.java @@ -16,10 +16,11 @@ package org.springframework.beans.factory.xml; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; +import test.beans.TestBean; + /** * Simple bean used to test dependency checking. * diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java index 95cd7410e3a..bd8caf869c2 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DummyReferencer.java @@ -16,9 +16,10 @@ package org.springframework.beans.factory.xml; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.DummyFactory; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @since 21.07.2003 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java index 8dcb1fa6cb9..e2b3213ad82 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethodTests.java @@ -24,12 +24,13 @@ import java.util.List; import java.util.Properties; import org.junit.Test; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @author Chris Beams diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java index c164d8fae73..38666e188cb 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/FactoryMethods.java @@ -19,7 +19,7 @@ package org.springframework.beans.factory.xml; import java.util.Collections; import java.util.List; -import org.springframework.beans.TestBean; +import test.beans.TestBean; /** * Test class for Spring's ability to create objects using static diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java index 8a43857fb76..f67a7189498 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/InstanceFactory.java @@ -16,7 +16,7 @@ package org.springframework.beans.factory.xml; -import org.springframework.beans.TestBean; +import test.beans.TestBean; /** * Test class for Spring's ability to create objects using diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java index 3679c5a0e3e..8344d0b5298 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/SchemaValidationTests.java @@ -20,10 +20,11 @@ import junit.framework.TestCase; import org.xml.sax.SAXParseException; import org.springframework.beans.BeansException; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * @author Rob Harrop */ diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ShortcutTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ShortcutTests.java index 389e468b0ca..05ba9139116 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ShortcutTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ShortcutTests.java @@ -18,11 +18,12 @@ package org.springframework.beans.factory.xml; import junit.framework.TestCase; -import org.springframework.beans.ITestBean; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.core.io.ClassPathResource; +import test.beans.ITestBean; +import test.beans.TestBean; + /** * @author Rob Harrop * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java index 8658bc5a12a..ffd13f4630d 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/TestBeanCreator.java @@ -16,7 +16,7 @@ package org.springframework.beans.factory.xml; -import org.springframework.beans.TestBean; +import test.beans.TestBean; /** * Test class for Spring's ability to create diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java index 31398eb9d96..bd0c7c99df2 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/UtilNamespaceHandlerTests.java @@ -25,7 +25,6 @@ import java.util.TreeMap; import junit.framework.TestCase; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.parsing.CollectingReaderEventListener; import org.springframework.beans.factory.parsing.ComponentDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -35,6 +34,8 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.beans.factory.config.FieldRetrievingFactoryBean; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * @author Rob Harrop * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java index 75b3ac657ea..581ab3591a2 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanCollectionTests.java @@ -31,7 +31,6 @@ import java.util.TreeMap; import java.util.TreeSet; import org.junit.Test; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.HasMap; @@ -40,6 +39,8 @@ import org.springframework.beans.factory.config.MapFactoryBean; import org.springframework.beans.factory.config.SetFactoryBean; import org.springframework.core.io.ClassPathResource; +import test.beans.TestBean; + /** * Tests for collections in XML bean definitions. * diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java index efeab901716..ca4090771c6 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReaderTests.java @@ -21,7 +21,6 @@ import java.util.Arrays; import junit.framework.TestCase; import org.xml.sax.InputSource; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.DefaultListableBeanFactory; @@ -30,6 +29,8 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; import org.springframework.core.io.Resource; +import test.beans.TestBean; + /** * @author Rick Evans * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java index 29b88cbb44f..237286610fd 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/XmlListableBeanFactoryTests.java @@ -24,9 +24,7 @@ import java.util.Map; import junit.framework.Assert; import org.springframework.beans.BeansException; -import org.springframework.beans.ITestBean; import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.AbstractListableBeanFactoryTests; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.DummyFactory; @@ -36,6 +34,9 @@ import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.core.io.ClassPathResource; +import test.beans.ITestBean; +import test.beans.TestBean; + /** * @author Juergen Hoeller * @since 09.11.2003 diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/collections.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/collections.xml index eafd9ff15d7..9e1f1908471 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/collections.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/collections.xml @@ -3,7 +3,7 @@ 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"> - + Jenny 30 @@ -12,7 +12,7 @@ - + Simple bean, without any collections. @@ -23,7 +23,7 @@ 27 - + Rod 32 @@ -35,7 +35,7 @@ - + Jenny 30 @@ -44,12 +44,12 @@ - + David 27 - + Rod 32 @@ -63,7 +63,7 @@ - + loner 26 @@ -97,15 +97,15 @@ - + verbose - + - + diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/factory-methods.xml b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/factory-methods.xml index 04ef7d542a6..30c0b1e26f4 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/factory-methods.xml +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/factory-methods.xml @@ -92,7 +92,7 @@ - + Juergen @@ -117,7 +117,7 @@ - + diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java index 19394f52a3b..f90eea7a6d9 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/propertyeditors/CustomEditorTests.java @@ -42,14 +42,14 @@ import org.junit.Test; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; import org.springframework.beans.BeansException; -import org.springframework.beans.ITestBean; -import org.springframework.beans.IndexedTestBean; import org.springframework.beans.MutablePropertyValues; -import org.springframework.beans.NumberTestBean; import org.springframework.beans.PropertyValue; -import org.springframework.beans.TestBean; import test.beans.BooleanTestBean; +import test.beans.ITestBean; +import test.beans.IndexedTestBean; +import test.beans.NumberTestBean; +import test.beans.TestBean; /** * Unit tests for the various PropertyEditors in Spring. @@ -572,9 +572,9 @@ public class CustomEditorTests { @Test public void testClassEditor() { PropertyEditor classEditor = new ClassEditor(); - classEditor.setAsText("org.springframework.beans.TestBean"); + classEditor.setAsText(TestBean.class.getName()); assertEquals(TestBean.class, classEditor.getValue()); - assertEquals("org.springframework.beans.TestBean", classEditor.getAsText()); + assertEquals(TestBean.class.getName(), classEditor.getAsText()); classEditor.setAsText(null); assertEquals("", classEditor.getAsText()); @@ -593,9 +593,9 @@ public class CustomEditorTests { @Test public void testClassEditorWithArray() { PropertyEditor classEditor = new ClassEditor(); - classEditor.setAsText("org.springframework.beans.TestBean[]"); + classEditor.setAsText("test.beans.TestBean[]"); assertEquals(TestBean[].class, classEditor.getValue()); - assertEquals("org.springframework.beans.TestBean[]", classEditor.getAsText()); + assertEquals("test.beans.TestBean[]", classEditor.getAsText()); } /* diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java index 42b04bf6c02..0d1712048fa 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java @@ -27,7 +27,8 @@ import junit.framework.TestCase; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; -import org.springframework.beans.TestBean; + +import test.beans.TestBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/Colour.java b/org.springframework.beans/src/test/java/test/beans/Colour.java similarity index 96% rename from org.springframework.beans/src/test/java/org/springframework/beans/Colour.java rename to org.springframework.beans/src/test/java/test/beans/Colour.java index 60dc333e0b4..f67b96cc0a6 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/Colour.java +++ b/org.springframework.beans/src/test/java/test/beans/Colour.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; import org.springframework.core.enums.ShortCodedLabeledEnum; diff --git a/org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java b/org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java index 918a91e6bde..0dc065dd7b0 100644 --- a/org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/DerivedTestBean.java @@ -18,7 +18,6 @@ package test.beans; import java.io.Serializable; -import org.springframework.beans.TestBean; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.DisposableBean; diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/GenericIntegerBean.java b/org.springframework.beans/src/test/java/test/beans/GenericIntegerBean.java similarity index 91% rename from org.springframework.beans/src/test/java/org/springframework/beans/GenericIntegerBean.java rename to org.springframework.beans/src/test/java/test/beans/GenericIntegerBean.java index 76f294eed3b..43b6465df08 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/GenericIntegerBean.java +++ b/org.springframework.beans/src/test/java/test/beans/GenericIntegerBean.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; -import test.beans.GenericBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/GenericSetOfIntegerBean.java b/org.springframework.beans/src/test/java/test/beans/GenericSetOfIntegerBean.java similarity index 91% rename from org.springframework.beans/src/test/java/org/springframework/beans/GenericSetOfIntegerBean.java rename to org.springframework.beans/src/test/java/test/beans/GenericSetOfIntegerBean.java index 7c3ff5688c7..021c0cd1c16 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/GenericSetOfIntegerBean.java +++ b/org.springframework.beans/src/test/java/test/beans/GenericSetOfIntegerBean.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; import java.util.Set; -import test.beans.GenericBean; /** * @author Juergen Hoeller diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/INestedTestBean.java b/org.springframework.beans/src/test/java/test/beans/INestedTestBean.java similarity index 95% rename from org.springframework.beans/src/test/java/org/springframework/beans/INestedTestBean.java rename to org.springframework.beans/src/test/java/test/beans/INestedTestBean.java index 7d87547b5f7..228109c284a 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/INestedTestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/INestedTestBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; public interface INestedTestBean { diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/IOther.java b/org.springframework.beans/src/test/java/test/beans/IOther.java similarity index 94% rename from org.springframework.beans/src/test/java/org/springframework/beans/IOther.java rename to org.springframework.beans/src/test/java/test/beans/IOther.java index 797486ec44e..734235aa068 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/IOther.java +++ b/org.springframework.beans/src/test/java/test/beans/IOther.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; public interface IOther { diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/ITestBean.java b/org.springframework.beans/src/test/java/test/beans/ITestBean.java similarity index 93% rename from org.springframework.beans/src/test/java/org/springframework/beans/ITestBean.java rename to org.springframework.beans/src/test/java/test/beans/ITestBean.java index cdf5ef510dd..9397b175503 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/ITestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/ITestBean.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; import java.io.IOException; /** - * Interface used for {@link org.springframework.beans.TestBean}. + * Interface used for {@link test.beans.TestBean}. * *

Two methods are the same as on Person, but if this * extends person it breaks quite a few tests.. diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/IndexedTestBean.java b/org.springframework.beans/src/test/java/test/beans/IndexedTestBean.java similarity index 97% rename from org.springframework.beans/src/test/java/org/springframework/beans/IndexedTestBean.java rename to org.springframework.beans/src/test/java/test/beans/IndexedTestBean.java index 9185a486c6c..bd2a72662f6 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/IndexedTestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/IndexedTestBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 the original author or authors. + * Copyright 2002-2008 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; import java.util.ArrayList; import java.util.Collection; diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/NestedTestBean.java b/org.springframework.beans/src/test/java/test/beans/NestedTestBean.java similarity index 97% rename from org.springframework.beans/src/test/java/org/springframework/beans/NestedTestBean.java rename to org.springframework.beans/src/test/java/test/beans/NestedTestBean.java index a06e15d150b..d3fde438b67 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/NestedTestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/NestedTestBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; /** * Simple nested test bean used for testing bean factories, AOP framework etc. diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/NumberTestBean.java b/org.springframework.beans/src/test/java/test/beans/NumberTestBean.java similarity index 98% rename from org.springframework.beans/src/test/java/org/springframework/beans/NumberTestBean.java rename to org.springframework.beans/src/test/java/test/beans/NumberTestBean.java index 8ac721c82c2..2a4db759b66 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/NumberTestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/NumberTestBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/TestBean.java b/org.springframework.beans/src/test/java/test/beans/TestBean.java similarity index 99% rename from org.springframework.beans/src/test/java/org/springframework/beans/TestBean.java rename to org.springframework.beans/src/test/java/test/beans/TestBean.java index ef4aef309ea..97e7ad694a0 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/TestBean.java +++ b/org.springframework.beans/src/test/java/test/beans/TestBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.beans; +package test.beans; import java.io.IOException; import java.util.ArrayList; diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml index 564920e6d3a..b9c8625b2f8 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/fieldRetrieving.xml @@ -3,7 +3,7 @@ - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml index ceacc6bc44b..b33b3c9c65a 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/config/propertyPath.xml @@ -3,19 +3,19 @@ - + 10 - + 11 - + 98 - + 99 @@ -23,7 +23,7 @@ - + 12 @@ -46,10 +46,10 @@ tb spouse - org.springframework.beans.TestBean + test.beans.TestBean - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/parsing/withErrors.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/parsing/withErrors.xml index 218056302c7..d0c52278445 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/parsing/withErrors.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/parsing/withErrors.xml @@ -6,7 +6,7 @@ - + @@ -14,9 +14,9 @@ - + - + @@ -26,5 +26,5 @@ - + \ No newline at end of file diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties index fa36ea20e7b..5beaf6d5982 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/multiConstructorArgs.properties @@ -1,3 +1,3 @@ -testBean.(class)=org.springframework.beans.TestBean +testBean.(class)=test.beans.TestBean testBean.$0=Rob Harrop testBean.$1=23 \ No newline at end of file diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties index 05b6f9a00e7..c33326c8574 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/refConstructorArg.properties @@ -1,5 +1,5 @@ -sally.(class)=org.springframework.beans.TestBean +sally.(class)=test.beans.TestBean sally.name=Sally -rob.(class)=org.springframework.beans.TestBean +rob.(class)=test.beans.TestBean rob.$0(ref)=sally \ No newline at end of file diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties index 92a216ca41d..be6700e1423 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/support/simpleConstructorArg.properties @@ -1,2 +1,2 @@ -testBean.(class)=org.springframework.beans.TestBean +testBean.(class)=test.beans.TestBean testBean.$0=Rob Harrop \ No newline at end of file diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml index 5952fa0c540..6363230a06c 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-constructor-with-exclusion.xml @@ -3,9 +3,9 @@ - + - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml index 041092cdd92..3dc2b598750 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-exclusion.xml @@ -3,9 +3,9 @@ - + - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml index 271e66f5703..2b27f28ef4e 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-inclusion.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" default-autowire-candidates=""> - + - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml index c49f3680e8c..8b823f97278 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/autowire-with-selective-inclusion.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" default-autowire-candidates="props*,*ly"> - + - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml index 110eb1ebaff..22168ca8c8c 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml @@ -10,22 +10,22 @@ - + - + - + - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml index 0bd9225e535..a614172a897 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionMerging.xml @@ -3,7 +3,7 @@ - + Rob Harrop @@ -23,12 +23,12 @@ - + - + Rob Harrop @@ -47,14 +47,14 @@ - + - + @@ -76,7 +76,7 @@ - + @@ -84,7 +84,7 @@ - + Sall @@ -103,7 +103,7 @@ - + Rob Harrop @@ -123,12 +123,12 @@ - + - + Rob Harrop @@ -147,14 +147,14 @@ - + - + @@ -176,7 +176,7 @@ - + @@ -184,7 +184,7 @@ - + Sall diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml index 584063fde10..a32de677157 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/collectionsWithDefaultTypes.xml @@ -3,7 +3,7 @@ "http://www.springframework.org/dtd/spring-beans-2.0.dtd"> - + 1 @@ -28,7 +28,7 @@ - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml index 3a45ffec354..33cbb8dd8d6 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/schemaValidated.xml @@ -3,16 +3,16 @@ 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"> - + - + - + - - + + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/shortcutTests.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/shortcutTests.xml index 71c3e463184..e44a8c961c5 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/shortcutTests.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/shortcutTests.xml @@ -8,15 +8,15 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd"> - + - + - + - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml index e67e3101362..6e0ebdac149 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/test.xml @@ -3,7 +3,7 @@ - + I have no properties and I'm happy without them. @@ -12,7 +12,7 @@ - + aliased @@ -20,17 +20,17 @@ - + aliased - + aliased - + @@ -40,7 +40,7 @@ - + Rod 31 @@ -52,20 +52,20 @@ - + Kerry 34 - + Kathy 28 - + typeMismatch 34x @@ -113,14 +113,14 @@ - + listenerVeto 66 - + - + this is a ]]> diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml index 052e27965e7..d9b35bf2b50 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml @@ -17,7 +17,7 @@ name "/> - + @@ -26,13 +26,13 @@ - + - + @@ -67,7 +67,7 @@ Rob Harrop - + foo @@ -89,7 +89,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -140,7 +140,7 @@ - + diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml index 91fdcd879f2..fab962d4dde 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithDtd.xml @@ -9,5 +9,5 @@ This is a top level block comment - + \ No newline at end of file diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml index cb08194ade8..324fb483ff4 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/validateWithXsd.xml @@ -7,5 +7,5 @@ This is a top level block comment the parser now --> - + \ No newline at end of file diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml index 3b8d004cd5f..7cb0723a4c2 100644 --- a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml +++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/withMeta.xml @@ -4,15 +4,15 @@ xmlns:spring="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> - + - + - +