diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/org.springframework.context.support/src/test/java/org/springframework/context/BeanThatBroadcasts.java deleted file mode 100644 index f525d38fe16..00000000000 --- a/org.springframework.context.support/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ /dev/null @@ -1,36 +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.context; - -/** - * @author Juergen Hoeller - */ -public class BeanThatBroadcasts implements ApplicationContextAware { - - public ApplicationContext applicationContext; - - public int receivedCount; - - - public void setApplicationContext(ApplicationContext applicationContext) { - this.applicationContext = applicationContext; - if (applicationContext.getDisplayName().indexOf("listener") != -1) { - applicationContext.getBean("listener"); - } - } - -} diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/BeanThatListens.java b/org.springframework.context.support/src/test/java/org/springframework/context/BeanThatListens.java deleted file mode 100644 index 9ab3f8ea40d..00000000000 --- a/org.springframework.context.support/src/test/java/org/springframework/context/BeanThatListens.java +++ /dev/null @@ -1,61 +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.context; - -import java.util.Map; - -/** - * A stub {@link ApplicationListener}. - * - * @author Thomas Risberg - * @author Juergen Hoeller - */ -public class BeanThatListens implements ApplicationListener { - - private BeanThatBroadcasts beanThatBroadcasts; - - private int eventCount; - - - public BeanThatListens() { - } - - public BeanThatListens(BeanThatBroadcasts beanThatBroadcasts) { - this.beanThatBroadcasts = beanThatBroadcasts; - Map beans = beanThatBroadcasts.applicationContext.getBeansOfType(BeanThatListens.class); - if (!beans.isEmpty()) { - throw new IllegalStateException("Shouldn't have found any BeanThatListens instances"); - } - } - - - public void onApplicationEvent(ApplicationEvent event) { - eventCount++; - if (beanThatBroadcasts != null) { - beanThatBroadcasts.receivedCount++; - } - } - - public int getEventCount() { - return eventCount; - } - - public void zero() { - eventCount = 0; - } - -} diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/childWithProxy.xml b/org.springframework.context.support/src/test/java/org/springframework/context/support/childWithProxy.xml deleted file mode 100644 index ec31bf6e574..00000000000 --- a/org.springframework.context.support/src/test/java/org/springframework/context/support/childWithProxy.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - true - - - PROPAGATION_REQUIRED - - - - - - - - true - - - PROPAGATION_REQUIRED - - - - - diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/ResourceTestBean.java b/org.springframework.context/src/test/java/org/springframework/beans/ResourceTestBean.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/beans/ResourceTestBean.java rename to org.springframework.context/src/test/java/org/springframework/beans/ResourceTestBean.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractBeanFactoryTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/AbstractListableBeanFactoryTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/factory/DummyFactory.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/DummyFactory.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/beans/factory/DummyFactory.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/DummyFactory.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/factory/LifecycleBean.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/LifecycleBean.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/beans/factory/LifecycleBean.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/LifecycleBean.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/beans/factory/MustBeInitialized.java b/org.springframework.context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/beans/factory/MustBeInitialized.java rename to org.springframework.context/src/test/java/org/springframework/beans/factory/MustBeInitialized.java diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/resource.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/resource.xml new file mode 100644 index 00000000000..0bf9399d30f --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/resource.xml @@ -0,0 +1,17 @@ + + + + + + + + + + classpath:org/springframework/beans/factory/xml/test.properties + + + classpath:org/springframework/beans/factory/xml/test.properties + + + + diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/resourceImport.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/resourceImport.xml new file mode 100644 index 00000000000..e5515885eff --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/resourceImport.xml @@ -0,0 +1,15 @@ + + + + + + + + classpath:org/springframework/beans/factory/xml/test.properties + + + classpath:org/springframework/beans/factory/xml/test.properties + + + + diff --git a/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.xml b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.xml new file mode 100644 index 00000000000..e67e3101362 --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/beans/factory/xml/test.xml @@ -0,0 +1,127 @@ + + + + + + + + I have no properties and I'm happy without them. + + + + + + aliased + + + + + + + + aliased + + + + + + aliased + + + + + + + + + + + + + + Rod + 31 + + + + + + Roderick + + + + + Kerry + 34 + + + + + + Kathy + 28 + + + + + typeMismatch + 34x + + + + + + + + true + + + + true + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + listenerVeto + 66 + + + + + + this is a ]]> + + + diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/ACATester.java b/org.springframework.context/src/test/java/org/springframework/context/ACATester.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/ACATester.java rename to org.springframework.context/src/test/java/org/springframework/context/ACATester.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/AbstractApplicationContextTests.java b/org.springframework.context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/AbstractApplicationContextTests.java rename to org.springframework.context/src/test/java/org/springframework/context/AbstractApplicationContextTests.java diff --git a/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java b/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java index cd125725f36..f525d38fe16 100644 --- a/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java +++ b/org.springframework.context/src/test/java/org/springframework/context/BeanThatBroadcasts.java @@ -33,4 +33,4 @@ public class BeanThatBroadcasts implements ApplicationContextAware { } } -} \ No newline at end of file +} diff --git a/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java b/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java index ecd1c8880fb..9ab3f8ea40d 100644 --- a/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java +++ b/org.springframework.context/src/test/java/org/springframework/context/BeanThatListens.java @@ -19,7 +19,7 @@ package org.springframework.context; import java.util.Map; /** - * A stub {@link org.springframework.context.ApplicationListener}. + * A stub {@link ApplicationListener}. * * @author Thomas Risberg * @author Juergen Hoeller @@ -58,4 +58,4 @@ public class BeanThatListens implements ApplicationListener { eventCount = 0; } -} \ No newline at end of file +} diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/LifecycleContextBean.java b/org.springframework.context/src/test/java/org/springframework/context/LifecycleContextBean.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/LifecycleContextBean.java rename to org.springframework.context/src/test/java/org/springframework/context/LifecycleContextBean.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java rename to org.springframework.context/src/test/java/org/springframework/context/support/ApplicationContextLifecycleTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/Assembler.java b/org.springframework.context/src/test/java/org/springframework/context/support/Assembler.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/Assembler.java rename to org.springframework.context/src/test/java/org/springframework/context/support/Assembler.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/AutowiredService.java b/org.springframework.context/src/test/java/org/springframework/context/support/AutowiredService.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/AutowiredService.java rename to org.springframework.context/src/test/java/org/springframework/context/support/AutowiredService.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java rename to org.springframework.context/src/test/java/org/springframework/context/support/ClassPathXmlApplicationContextTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java b/org.springframework.context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java rename to org.springframework.context/src/test/java/org/springframework/context/support/FactoryBeanAndApplicationListener.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/LifecycleTestBean.java b/org.springframework.context/src/test/java/org/springframework/context/support/LifecycleTestBean.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/LifecycleTestBean.java rename to org.springframework.context/src/test/java/org/springframework/context/support/LifecycleTestBean.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/Logic.java b/org.springframework.context/src/test/java/org/springframework/context/support/Logic.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/Logic.java rename to org.springframework.context/src/test/java/org/springframework/context/support/Logic.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/TestListener.java b/org.springframework.context/src/test/java/org/springframework/context/support/NoOpAdvice.java similarity index 56% rename from org.springframework.context.support/src/test/java/org/springframework/context/TestListener.java rename to org.springframework.context/src/test/java/org/springframework/context/support/NoOpAdvice.java index b9f57f73087..87d195dc1c4 100644 --- a/org.springframework.context.support/src/test/java/org/springframework/context/TestListener.java +++ b/org.springframework.context/src/test/java/org/springframework/context/support/NoOpAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * 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. @@ -14,28 +14,19 @@ * limitations under the License. */ -package org.springframework.context; +package org.springframework.context.support; + +import org.springframework.aop.ThrowsAdvice; /** - * Listener that maintains a global count of events. + * Advice object that implements multiple Advice interfaces. * - * @author Rod Johnson - * @since January 21, 2001 + * @author Chris Beams */ -public class TestListener implements ApplicationListener { +public class NoOpAdvice implements ThrowsAdvice { - private int eventCount; - - public int getEventCount() { - return eventCount; - } - - public void zeroCounter() { - eventCount = 0; - } - - public void onApplicationEvent(ApplicationEvent e) { - ++eventCount; + public void afterThrowing(Exception ex) throws Throwable { + // no-op } } diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java rename to org.springframework.context/src/test/java/org/springframework/context/support/ResourceBundleMessageSourceTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/Service.java b/org.springframework.context/src/test/java/org/springframework/context/support/Service.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/Service.java rename to org.springframework.context/src/test/java/org/springframework/context/support/Service.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java rename to org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextMulticasterTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java rename to org.springframework.context/src/test/java/org/springframework/context/support/StaticApplicationContextTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java b/org.springframework.context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java rename to org.springframework.context/src/test/java/org/springframework/context/support/StaticMessageSourceTests.java diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/TestIF.java b/org.springframework.context/src/test/java/org/springframework/context/support/TestIF.java similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/TestIF.java rename to org.springframework.context/src/test/java/org/springframework/context/support/TestIF.java diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java b/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java new file mode 100644 index 00000000000..d70cd87f699 --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/context/support/TestProxyFactoryBean.java @@ -0,0 +1,37 @@ +/* + * 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.context.support; + +import org.springframework.aop.framework.AbstractSingletonProxyFactoryBean; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.beans.factory.FactoryBean; + +@SuppressWarnings("serial") +public class TestProxyFactoryBean extends AbstractSingletonProxyFactoryBean + implements FactoryBean, BeanFactoryAware { + + @Override + protected Object createMainInterceptor() { + return new NoOpAdvice(); + } + + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { + } + +} diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/aliasForParent.xml b/org.springframework.context/src/test/java/org/springframework/context/support/aliasForParent.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/aliasForParent.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/aliasForParent.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml b/org.springframework.context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/aliasThatOverridesParent.xml diff --git a/org.springframework.context/src/test/java/org/springframework/context/support/childWithProxy.xml b/org.springframework.context/src/test/java/org/springframework/context/support/childWithProxy.xml new file mode 100644 index 00000000000..506907208f0 --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/context/support/childWithProxy.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/classWithPlaceholder.xml b/org.springframework.context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/classWithPlaceholder.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/classWithPlaceholder.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/invalidClass.xml b/org.springframework.context/src/test/java/org/springframework/context/support/invalidClass.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/invalidClass.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/invalidClass.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/invalidValueType.xml b/org.springframework.context/src/test/java/org/springframework/context/support/invalidValueType.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/invalidValueType.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/invalidValueType.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/lifecycleTests.xml b/org.springframework.context/src/test/java/org/springframework/context/support/lifecycleTests.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/lifecycleTests.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/lifecycleTests.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/messages.properties b/org.springframework.context/src/test/java/org/springframework/context/support/messages.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/messages.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/messages.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de.properties b/org.springframework.context/src/test/java/org/springframework/context/support/messages_de.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/messages_de.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de_AT.properties b/org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de_AT.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties b/org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/messages_de_AT_oo.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de_DE.xml b/org.springframework.context/src/test/java/org/springframework/context/support/messages_de_DE.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/messages_de_DE.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/messages_de_DE.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/more-messages.properties b/org.springframework.context/src/test/java/org/springframework/context/support/more-messages.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/more-messages.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/more-messages.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/override.properties b/org.springframework.context/src/test/java/org/springframework/context/support/override.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/override.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/override.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/placeholder.properties b/org.springframework.context/src/test/java/org/springframework/context/support/placeholder.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/placeholder.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/placeholder.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/simpleContext.xml b/org.springframework.context/src/test/java/org/springframework/context/support/simpleContext.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/simpleContext.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/simpleContext.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test.properties b/org.springframework.context/src/test/java/org/springframework/context/support/test.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/test.properties diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/aliased-contextC.xml b/org.springframework.context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test/aliased-contextC.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/test/aliased-contextC.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextA.xml b/org.springframework.context/src/test/java/org/springframework/context/support/test/contextA.xml similarity index 59% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextA.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/test/contextA.xml index 55f9cdfd699..203e7a61c6f 100644 --- a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextA.xml +++ b/org.springframework.context/src/test/java/org/springframework/context/support/test/contextA.xml @@ -9,7 +9,7 @@ - + @@ -17,38 +17,22 @@ - + - + - - - - + - - - - PROPAGATION_REQUIRED - - - - - - - - - PROPAGATION_REQUIRED - - + + diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextB.xml b/org.springframework.context/src/test/java/org/springframework/context/support/test/contextB.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextB.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/test/contextB.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextC.xml b/org.springframework.context/src/test/java/org/springframework/context/support/test/contextC.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test/contextC.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/test/contextC.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/import1.xml b/org.springframework.context/src/test/java/org/springframework/context/support/test/import1.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test/import1.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/test/import1.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/test/subtest/import2.xml b/org.springframework.context/src/test/java/org/springframework/context/support/test/subtest/import2.xml similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/test/subtest/import2.xml rename to org.springframework.context/src/test/java/org/springframework/context/support/test/subtest/import2.xml diff --git a/org.springframework.context.support/src/test/java/org/springframework/context/support/testBeans.properties b/org.springframework.context/src/test/java/org/springframework/context/support/testBeans.properties similarity index 100% rename from org.springframework.context.support/src/test/java/org/springframework/context/support/testBeans.properties rename to org.springframework.context/src/test/java/org/springframework/context/support/testBeans.properties diff --git a/org.springframework.testsuite/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java b/org.springframework.testsuite/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java index 66016a9fc8b..28836b4ca33 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java +++ b/org.springframework.testsuite/src/test/java/org/springframework/remoting/caucho/CauchoRemotingTests.java @@ -40,7 +40,7 @@ public class CauchoRemotingTests extends TestCase { // expected } factory.setServiceInterface(ITestBean.class); - factory.setServiceUrl("http://localhosta/testbean"); + factory.setServiceUrl("http://localhost/testbean"); factory.afterPropertiesSet(); assertTrue("Correct singleton value", factory.isSingleton()); @@ -66,7 +66,7 @@ public class CauchoRemotingTests extends TestCase { // expected } factory.setServiceInterface(ITestBean.class); - factory.setServiceUrl("http://localhosta/testbean"); + factory.setServiceUrl("http://localhost/testbean"); factory.setUsername("test"); factory.setPassword("bean"); factory.setOverloadEnabled(true); @@ -89,7 +89,7 @@ public class CauchoRemotingTests extends TestCase { TestHessianProxyFactory proxyFactory = new TestHessianProxyFactory(); HessianProxyFactoryBean factory = new HessianProxyFactoryBean(); factory.setServiceInterface(ITestBean.class); - factory.setServiceUrl("http://localhosta/testbean"); + factory.setServiceUrl("http://localhost/testbean"); factory.setProxyFactory(proxyFactory); factory.setUsername("test"); factory.setPassword("bean");