From 0a07a0ed92fc8d16b804f88c6b073ec11fcf9040 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Sat, 14 Jan 2012 22:51:26 +0100 Subject: [PATCH] Move integration tests => src/test This commit eliminates the 'integration-tests' subproject in favor of managing these sources under the root project's own 'src' directory. This helps to avoid special-case handling for integration-tests in the Gradle build, e.g. avoiding publication of jars to Artifactory / Maven Central. It is also semantically more correct. This is not a Spring Framework subproject so much as it is a collection of integration tests that span functionality across many subprojects. In this way, it makes sense to place them directly under the root project. Issue: SPR-8116 --- build.gradle | 48 +- .../.springBeans | 13 - .../build.xml | 9 - .../integration-tests.iml | 460 ----------------- org.springframework.integration-tests/ivy.xml | 102 ---- org.springframework.integration-tests/pom.xml | 487 ------------------ .../src/main/resources/META-INF/license.txt | 261 ---------- .../src/main/resources/META-INF/notice.txt | 9 - .../src/test/java/.gitignore | 0 .../template.mf | 4 - settings.gradle | 1 - .../src/main => src/test}/java/.gitignore | 0 ...ceHandlerScopeIntegrationTests-context.xml | 0 ...NamespaceHandlerScopeIntegrationTests.java | 0 ...toProxyCreatorIntegrationTests-context.xml | 0 ...visorAutoProxyCreatorIntegrationTests.java | 0 .../EnableCachingIntegrationTests.java | 0 ...ionScannerJsr330ScopeIntegrationTests.java | 0 .../ltw/ComponentScanningWithLTWTests.java | 0 .../ltw/ComponentScanningWithLTWTests.xml | 0 ...efinitionScannerScopeIntegrationTests.java | 0 ...nvironmentIntegrationTests-context-dev.xml | 0 ...vironmentIntegrationTests-context-prod.xml | 0 .../EnvironmentIntegrationTests-context.xml | 0 .../core/env/EnvironmentIntegrationTests.java | 0 ...ConfigurerEnvironmentIntegrationTests.java | 0 .../core/env/scan1/package-info.java | 0 .../core/env/scan2/package-info.java | 0 .../support/BeanFactoryTypeConverter.java | 0 .../expression/spel/support/Spr7538Tests.java | 0 .../mock/env/MockEnvironment.java | 0 ...ansactionalAnnotationIntegrationTests.java | 0 .../CallCountingTransactionManager.java | 0 ...TransactionManagementIntegrationTests.java | 0 .../ProxyAnnotationDiscoveryTests.java | 0 .../advice/CountingAfterReturningAdvice.java | 0 .../test/advice/CountingBeforeAdvice.java | 0 .../test/java/test/advice/MethodCounter.java | 0 .../test/java/test/beans/Colour.java | 0 .../test/java/test/beans/INestedTestBean.java | 0 .../test/java/test/beans/IOther.java | 0 .../test/java/test/beans/ITestBean.java | 0 .../test/java/test/beans/IndexedTestBean.java | 0 .../test/java/test/beans/NestedTestBean.java | 0 .../src => src}/test/java/test/beans/Pet.java | 0 .../test/java/test/beans/TestBean.java | 0 .../java/test/interceptor/NopInterceptor.java | 0 .../SerializableNopInterceptor.java | 0 .../test/util/SerializationTestUtils.java | 0 .../src => src}/test/resources/log4j.xml | 0 .../transaction/annotation/enable-caching.xml | 0 .../springframework/util/testlog4j.properties | 0 .../web/util/testlog4j.properties | 0 .../test/resources/testlog4j.properties | 0 54 files changed, 22 insertions(+), 1372 deletions(-) delete mode 100644 org.springframework.integration-tests/.springBeans delete mode 100644 org.springframework.integration-tests/build.xml delete mode 100644 org.springframework.integration-tests/integration-tests.iml delete mode 100644 org.springframework.integration-tests/ivy.xml delete mode 100644 org.springframework.integration-tests/pom.xml delete mode 100644 org.springframework.integration-tests/src/main/resources/META-INF/license.txt delete mode 100644 org.springframework.integration-tests/src/main/resources/META-INF/notice.txt delete mode 100644 org.springframework.integration-tests/src/test/java/.gitignore delete mode 100644 org.springframework.integration-tests/template.mf rename {org.springframework.integration-tests/src/main => src/test}/java/.gitignore (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/scan1/package-info.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/core/env/scan2/package-info.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/expression/spel/support/Spr7538Tests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/mock/env/MockEnvironment.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/transaction/CallCountingTransactionManager.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/advice/CountingAfterReturningAdvice.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/advice/CountingBeforeAdvice.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/advice/MethodCounter.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/Colour.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/INestedTestBean.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/IOther.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/ITestBean.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/IndexedTestBean.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/NestedTestBean.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/Pet.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/beans/TestBean.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/interceptor/NopInterceptor.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/interceptor/SerializableNopInterceptor.java (100%) rename {org.springframework.integration-tests/src => src}/test/java/test/util/SerializationTestUtils.java (100%) rename {org.springframework.integration-tests/src => src}/test/resources/log4j.xml (100%) rename {org.springframework.integration-tests/src => src}/test/resources/org/springframework/transaction/annotation/enable-caching.xml (100%) rename {org.springframework.integration-tests/src => src}/test/resources/org/springframework/util/testlog4j.properties (100%) rename {org.springframework.integration-tests/src => src}/test/resources/org/springframework/web/util/testlog4j.properties (100%) rename {org.springframework.integration-tests/src => src}/test/resources/testlog4j.properties (100%) diff --git a/build.gradle b/build.gradle index a0a40915fdf..f30e9c6229f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,4 @@ -description = 'Spring Framework' - -configure(subprojects - project(":spring-integration-tests")) { - apply plugin: 'maven' -} - -configure(allprojects - project(":spring-integration-tests")) { - group = 'org.springframework' -} - -configure(subprojects) { +configure(allprojects) { apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' @@ -40,11 +30,28 @@ configure(subprojects) { eclipse.classpath.file.whenMerged { classpath -> classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false } +} + +configure(rootProject) { + description = 'Spring Framework' + + // don't publish the default jar for the root project + configurations.archives.artifacts.clear() + dependencies { // for integration tests + testCompile project(":spring-test") + testCompile project(":spring-webmvc-portlet") + testCompile "org.hibernate:hibernate-core:4.0.0.CR7" + testCompile "javax.servlet:servlet-api:2.5" + } } +configure(subprojects) { + apply plugin: 'maven' + group = 'org.springframework' +} -configure(subprojects - project(":spring-asm") - project(":spring-integration-tests")) { +configure(subprojects - project(":spring-asm")) { task sourcesJar(type: Jar, dependsOn:classes) { classifier = 'sources' @@ -63,8 +70,7 @@ project('spring-core') { // depend on spring-asm project in order to have it show up as a // in the generated pom compile project(":spring-asm") - // depend directly on the spring-asm jar to avoid errors in - // Eclipse/STS + // depend directly on the spring-asm jar to avoid errors in Eclipse/STS compile files(project(":spring-asm").jar.archivePath) { builtBy project(":spring-asm").jar } @@ -262,7 +268,7 @@ project('spring-web') { } project('spring-orm') { - description = 'Spring Object/XML Mapping' + description = 'Spring Object/Relational Mapping' dependencies { compile("org.hibernate:com.springsource.org.hibernate:3.3.1.GA") { optional = true } // for orm.hibernate3 compile("org.hibernate:hibernate-cglib-repack:2.1_3") { optional = true } @@ -339,7 +345,7 @@ project('spring-webmvc-portlet') { } project('spring-test') { - description = 'Spring Test' + description = 'Spring TestContext Framework' dependencies { compile project(":spring-webmvc-portlet") compile("javax.activation:activation:1.0") { provided = true } @@ -373,16 +379,6 @@ project('spring-aspects') { } } -project('spring-integration-tests') { - description = 'Spring Integration Tests' - dependencies { - testCompile project(":spring-test") - testCompile project(":spring-webmvc-portlet") - testCompile "org.hibernate:hibernate-core:4.0.0.CR7" - testCompile "javax.servlet:servlet-api:2.5" - } -} - task apidocs(type: Javadoc) { subprojects.each { project -> source project.sourceSets.main.allJava diff --git a/org.springframework.integration-tests/.springBeans b/org.springframework.integration-tests/.springBeans deleted file mode 100644 index 1d17fb831b6..00000000000 --- a/org.springframework.integration-tests/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/org.springframework.integration-tests/build.xml b/org.springframework.integration-tests/build.xml deleted file mode 100644 index 22af73bde8f..00000000000 --- a/org.springframework.integration-tests/build.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/org.springframework.integration-tests/integration-tests.iml b/org.springframework.integration-tests/integration-tests.iml deleted file mode 100644 index 634fe037300..00000000000 --- a/org.springframework.integration-tests/integration-tests.iml +++ /dev/null @@ -1,460 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.integration-tests/ivy.xml b/org.springframework.integration-tests/ivy.xml deleted file mode 100644 index 29e307330f8..00000000000 --- a/org.springframework.integration-tests/ivy.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.integration-tests/pom.xml b/org.springframework.integration-tests/pom.xml deleted file mode 100644 index 956db4796ed..00000000000 --- a/org.springframework.integration-tests/pom.xml +++ /dev/null @@ -1,487 +0,0 @@ - - - 4.0.0 - org.springframework - spring-integration-tests - jar - 3.2.0.BUILD-SNAPSHOT - - org.springframework - spring-parent - ../org.springframework.spring-parent - 3.2.0.BUILD-SNAPSHOT - - - - com.caucho - com.caucho - 3.1.5 - test - - - com.ibm.websphere - com.ibm.websphere.uow - 6.0.2.17 - test - - - com.opensymphony.quartz - org.quartz - 1.6.2 - test - - - com.oracle.toplink.essentials - oracle.toplink.essentials - 2.0.0.b41-beta2 - test - - - com.sun.syndication - com.sun.syndication - 0.9 - test - - - edu.emory.mathcs.backport - edu.emory.mathcs.backport - 3.0 - test - - - javax.ejb - javax.ejb - 3.0 - test - - - javax.el - javax.el - 2.1 - test - - - javax.faces - javax.faces - 1.2.0.08 - test - - - javax.jdo - javax.jdo - 2.1 - test - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - 1.1 - test - - - javax.mail - javax.mail - 1.4 - test - - - javax.portlet - javax.portlet - 2.0 - test - - - javax.resource - javax.resource - 1.5 - test - - - javax.servlet - servlet-api - 2.5 - test - - - javax.servlet - javax.servlet.jsp - 2.1 - test - - - javax.servlet - jstl - 1.1.2 - test - - - org.apache.geronimo.specs - geronimo-jta_1.1_spec - 1.1 - test - - - javax.xml.rpc - javax.xml.rpc - 1.1 - test - - - cglib - cglib-nodep - 2.2 - test - - - net.sourceforge.ehcache - net.sf.ehcache - 1.3 - test - - - net.sourceforge.jasperreports - net.sf.jasperreports - 2.0.5 - test - - - xml-apis - xml-apis - - - - - net.sourceforge.jexcelapi - jxl - 2.6.6 - test - - - org.antlr - antlr - 2.7.6 - test - - - commons-dbcp - commons-dbcp - 1.2.2 - test - - - commons-fileupload - commons-fileupload - 1.2 - test - - - commons-pool - commons-pool - 1.5.3 - test - - - org.apache.ibatis - ibatis-sqlmap - 2.3.4.726 - test - - - org.apache.openjpa - org.apache.openjpa - 1.0.2 - test - - - org.apache.openjpa - org.apache.openjpa.java5 - 1.0.2 - test - - - org.apache.openjpa - org.apache.openjpa.jdbc.java5 - 1.0.2 - test - - - org.apache.openjpa - org.apache.openjpa.lib - 1.0.2 - test - - - org.apache.openjpa - org.apache.openjpa.lib.java5 - 1.0.2 - test - - - org.apache.openjpa - org.apache.openjpa.persistence - 1.0.2 - test - - - org.apache.openjpa - org.apache.openjpa.persistence.jdbc - 1.0.2 - test - - - org.apache.poi - org.apache.poi - 3.0.2.FINAL - test - - - org.apache.tiles - org.apache.tiles - 2.0.5 - test - - - org.apache.tiles - tiles-core - 2.0.5 - test - - - org.apache.tiles - tiles-jsp - 2.0.5 - test - - - org.apache.velocity - org.apache.velocity - 1.5 - test - - - org.apache.velocity - org.apache.velocity.tools.view - 1.4 - test - - - org.aspectj - aspectjweaver - test - - - org.codehaus.groovy - org.codehaus.groovy - 1.6.3 - test - - - org.dom4j - org.dom4j - 1.6.1 - test - - - xml-apis - xml-apis - - - - - org.easymock - easymock - test - - - org.easymock - org.easymock.classextension - 2.3 - test - - - org.eclipse.persistence - org.eclipse.persistence - 1.0.1 - test - - - org.eclipse.persistence - org.eclipse.persistence.jpa - 1.0.1 - test - - - org.freemarker - freemarker - 2.3.15 - test - - - org.hibernate - hibernate - 3.3.1.GA - test - - - org.hibernate - hibernate-annotations - 3.4.0.GA - test - - - org.hibernate - org.hibernate.annotations.common - 3.3.0.ga - test - - - org.hibernate - hibernate-entitymanager - 3.3.1.GA - test - - - hsqldb - hsqldb - 1.8.0.7 - test - - - org.jruby - org.jruby - 1.2 - true - - - asm - asm - 2.2.3 - test - - - asm - asm-commons - 2.2.3 - test - - - org.springframework - spring-aop - latest.integration - test - - - org.springframework - spring-beans - latest.integration - test - - - org.springframework - spring-context - latest.integration - test - - - org.springframework - spring-context-support - latest.integration - test - - - org.springframework - spring-core - latest.integration - test - - - org.springframework - spring-jdbc - latest.integration - test - - - org.springframework - spring-jms - latest.integration - test - - - org.springframework - spring-orm - latest.integration - test - - - org.springframework - spring-test - latest.integration - test - - - org.springframework - spring-tx - latest.integration - test - - - org.springframework - spring-web - latest.integration - test - - - org.springframework - spring-web-portlet - latest.integration - test - - - org.springframework - spring-webmvc - latest.integration - test - - - log4j - log4j - test - - - xmlunit - xmlunit - 1.2 - test - - - org.easymock - easymock - 2.3 - test - - - junit - junit - test - - - org.testng - org.testng - 5.12.1 - test - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - junit:junit - - - - - - diff --git a/org.springframework.integration-tests/src/main/resources/META-INF/license.txt b/org.springframework.integration-tests/src/main/resources/META-INF/license.txt deleted file mode 100644 index 7375b7e8ca1..00000000000 --- a/org.springframework.integration-tests/src/main/resources/META-INF/license.txt +++ /dev/null @@ -1,261 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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. - -======================================================================= - -SPRING FRAMEWORK 3.1 SUBCOMPONENTS: - -Spring Framework 3.1 includes a number of subcomponents with -separate copyright notices and license terms. The product that -includes this file does not necessarily use all the open source -subcomponents referred to below. Your use of the source -code for these subcomponents is subject to the terms and -conditions of the following licenses. - ->>> asm-2.2.3: - -Copyright (c) 2000-2005 INRIA, France Telecom -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -THE POSSIBILITY OF SUCH DAMAGE. - -Copyright (c) 1999-2009, OW2 Consortium - -======================================================================= - -To the extent any open source subcomponents are licensed under the EPL and/or other -similar licenses that require the source code and/or modifications to -source code to be made available (as would be noted above), you may obtain a -copy of the source code corresponding to the binaries for such open source -components and modifications thereto, if any, (the "Source Files"), by -downloading the Source Files from http://www.springsource.org/download, -or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview -Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All -such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General -Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent -physical medium. This offer to obtain a copy of the Source Files is valid for three -years from the date you acquired this Software product. \ No newline at end of file diff --git a/org.springframework.integration-tests/src/main/resources/META-INF/notice.txt b/org.springframework.integration-tests/src/main/resources/META-INF/notice.txt deleted file mode 100644 index d1abee6d6fb..00000000000 --- a/org.springframework.integration-tests/src/main/resources/META-INF/notice.txt +++ /dev/null @@ -1,9 +0,0 @@ -Spring Framework 3.1 -Copyright (c) 2002-2011 SpringSource, a division of VMware, Inc. - -This product is licensed to you under the Apache License, Version 2.0 (the "License"). -You may not use this product except in compliance with the License. - -This product may include a number of subcomponents with separate copyright notices and -license terms. Your use of the source code for the these subcomponents is subject to -the terms and conditions of the subcomponent's license, as noted in the LICENSE file. diff --git a/org.springframework.integration-tests/src/test/java/.gitignore b/org.springframework.integration-tests/src/test/java/.gitignore deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/org.springframework.integration-tests/template.mf b/org.springframework.integration-tests/template.mf deleted file mode 100644 index 362b3ea1b7b..00000000000 --- a/org.springframework.integration-tests/template.mf +++ /dev/null @@ -1,4 +0,0 @@ -Bundle-SymbolicName: org.springframework.integration-tests -Bundle-Name: Spring Framework Integration Tests -Bundle-Vendor: SpringSource -Bundle-ManifestVersion: 2 diff --git a/settings.gradle b/settings.gradle index 4bffe4c0c25..a0680db5208 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,7 +20,6 @@ include 'org.springframework.test' include 'org.springframework.web.portlet' include 'org.springframework.web.struts' include 'org.springframework.aspects' -include 'org.springframework.integration-tests' // transform project names to maven-central artifact naming // e.g.: org.springframework.context.support => spring-context-support diff --git a/org.springframework.integration-tests/src/main/java/.gitignore b/src/test/java/.gitignore similarity index 100% rename from org.springframework.integration-tests/src/main/java/.gitignore rename to src/test/java/.gitignore diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml rename to src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests-context.xml diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java b/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java rename to src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml rename to src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests-context.xml diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java b/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java rename to src/test/java/org/springframework/aop/framework/autoproxy/AdvisorAutoProxyCreatorIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java b/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java rename to src/test/java/org/springframework/cache/annotation/EnableCachingIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java rename to src/test/java/org/springframework/context/annotation/jsr330/ClassPathBeanDefinitionScannerJsr330ScopeIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java rename to src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml b/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml rename to src/test/java/org/springframework/context/annotation/ltw/ComponentScanningWithLTWTests.xml diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java b/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java rename to src/test/java/org/springframework/context/annotation/scope/ClassPathBeanDefinitionScannerScopeIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml rename to src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-dev.xml diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml rename to src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context-prod.xml diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml rename to src/test/java/org/springframework/core/env/EnvironmentIntegrationTests-context.xml diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java rename to src/test/java/org/springframework/core/env/EnvironmentIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java b/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java rename to src/test/java/org/springframework/core/env/PropertyPlaceholderConfigurerEnvironmentIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/scan1/package-info.java b/src/test/java/org/springframework/core/env/scan1/package-info.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/scan1/package-info.java rename to src/test/java/org/springframework/core/env/scan1/package-info.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/core/env/scan2/package-info.java b/src/test/java/org/springframework/core/env/scan2/package-info.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/core/env/scan2/package-info.java rename to src/test/java/org/springframework/core/env/scan2/package-info.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java b/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java rename to src/test/java/org/springframework/expression/spel/support/BeanFactoryTypeConverter.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java b/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java rename to src/test/java/org/springframework/expression/spel/support/Spr7538Tests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/mock/env/MockEnvironment.java b/src/test/java/org/springframework/mock/env/MockEnvironment.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/mock/env/MockEnvironment.java rename to src/test/java/org/springframework/mock/env/MockEnvironment.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java b/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java rename to src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java b/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/transaction/CallCountingTransactionManager.java rename to src/test/java/org/springframework/transaction/CallCountingTransactionManager.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java b/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java rename to src/test/java/org/springframework/transaction/annotation/EnableTransactionManagementIntegrationTests.java diff --git a/org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java b/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java rename to src/test/java/org/springframework/transaction/annotation/ProxyAnnotationDiscoveryTests.java diff --git a/org.springframework.integration-tests/src/test/java/test/advice/CountingAfterReturningAdvice.java b/src/test/java/test/advice/CountingAfterReturningAdvice.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/advice/CountingAfterReturningAdvice.java rename to src/test/java/test/advice/CountingAfterReturningAdvice.java diff --git a/org.springframework.integration-tests/src/test/java/test/advice/CountingBeforeAdvice.java b/src/test/java/test/advice/CountingBeforeAdvice.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/advice/CountingBeforeAdvice.java rename to src/test/java/test/advice/CountingBeforeAdvice.java diff --git a/org.springframework.integration-tests/src/test/java/test/advice/MethodCounter.java b/src/test/java/test/advice/MethodCounter.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/advice/MethodCounter.java rename to src/test/java/test/advice/MethodCounter.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/Colour.java b/src/test/java/test/beans/Colour.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/Colour.java rename to src/test/java/test/beans/Colour.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/INestedTestBean.java b/src/test/java/test/beans/INestedTestBean.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/INestedTestBean.java rename to src/test/java/test/beans/INestedTestBean.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/IOther.java b/src/test/java/test/beans/IOther.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/IOther.java rename to src/test/java/test/beans/IOther.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/ITestBean.java b/src/test/java/test/beans/ITestBean.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/ITestBean.java rename to src/test/java/test/beans/ITestBean.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/IndexedTestBean.java b/src/test/java/test/beans/IndexedTestBean.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/IndexedTestBean.java rename to src/test/java/test/beans/IndexedTestBean.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/NestedTestBean.java b/src/test/java/test/beans/NestedTestBean.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/NestedTestBean.java rename to src/test/java/test/beans/NestedTestBean.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/Pet.java b/src/test/java/test/beans/Pet.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/Pet.java rename to src/test/java/test/beans/Pet.java diff --git a/org.springframework.integration-tests/src/test/java/test/beans/TestBean.java b/src/test/java/test/beans/TestBean.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/beans/TestBean.java rename to src/test/java/test/beans/TestBean.java diff --git a/org.springframework.integration-tests/src/test/java/test/interceptor/NopInterceptor.java b/src/test/java/test/interceptor/NopInterceptor.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/interceptor/NopInterceptor.java rename to src/test/java/test/interceptor/NopInterceptor.java diff --git a/org.springframework.integration-tests/src/test/java/test/interceptor/SerializableNopInterceptor.java b/src/test/java/test/interceptor/SerializableNopInterceptor.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/interceptor/SerializableNopInterceptor.java rename to src/test/java/test/interceptor/SerializableNopInterceptor.java diff --git a/org.springframework.integration-tests/src/test/java/test/util/SerializationTestUtils.java b/src/test/java/test/util/SerializationTestUtils.java similarity index 100% rename from org.springframework.integration-tests/src/test/java/test/util/SerializationTestUtils.java rename to src/test/java/test/util/SerializationTestUtils.java diff --git a/org.springframework.integration-tests/src/test/resources/log4j.xml b/src/test/resources/log4j.xml similarity index 100% rename from org.springframework.integration-tests/src/test/resources/log4j.xml rename to src/test/resources/log4j.xml diff --git a/org.springframework.integration-tests/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml b/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml similarity index 100% rename from org.springframework.integration-tests/src/test/resources/org/springframework/transaction/annotation/enable-caching.xml rename to src/test/resources/org/springframework/transaction/annotation/enable-caching.xml diff --git a/org.springframework.integration-tests/src/test/resources/org/springframework/util/testlog4j.properties b/src/test/resources/org/springframework/util/testlog4j.properties similarity index 100% rename from org.springframework.integration-tests/src/test/resources/org/springframework/util/testlog4j.properties rename to src/test/resources/org/springframework/util/testlog4j.properties diff --git a/org.springframework.integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties b/src/test/resources/org/springframework/web/util/testlog4j.properties similarity index 100% rename from org.springframework.integration-tests/src/test/resources/org/springframework/web/util/testlog4j.properties rename to src/test/resources/org/springframework/web/util/testlog4j.properties diff --git a/org.springframework.integration-tests/src/test/resources/testlog4j.properties b/src/test/resources/testlog4j.properties similarity index 100% rename from org.springframework.integration-tests/src/test/resources/testlog4j.properties rename to src/test/resources/testlog4j.properties