From e49014542cb9ee474e15314a5fbd598c076caca9 Mon Sep 17 00:00:00 2001 From: Jon Brisbin Date: Wed, 11 Apr 2012 15:44:20 -0500 Subject: [PATCH] Re-org submodules, add debug compiler options --- build.gradle | 1 + settings.gradle | 6 +++--- {core => spring-data-rest-core}/build.gradle | 2 -- .../java/org/springframework/data/rest/core/Handler.java | 0 .../main/java/org/springframework/data/rest/core/Link.java | 0 .../org/springframework/data/rest/core/SimpleLink.java | 0 .../org/springframework/data/rest/core/util/BeanUtils.java | 0 .../data/rest/core/util/FluentBeanDeserializer.java | 0 .../data/rest/core/util/FluentBeanSerializer.java | 0 .../data/rest/core/util/FluentBeanUtils.java | 0 .../org/springframework/data/rest/core/util/UriUtils.java | 0 .../data/rest/core/spec/UriUtilsSpec.groovy | 0 .../src/test/resources/logback.xml | 0 {repository => spring-data-rest-repository}/build.gradle | 4 +--- .../data/rest/repository/JpaEntityMetadata.java | 0 .../data/rest/repository/JpaRepositoryMetadata.java | 0 .../data/rest/repository/spec/JpaMetadataSpec.groovy | 0 .../springframework/data/rest/repository/test/Family.java | 0 .../data/rest/repository/test/FamilyRepository.java | 0 .../springframework/data/rest/repository/test/Person.java | 0 .../data/rest/repository/test/PersonRepository.java | 0 .../src/test/resources/JpaMetadataSpec-persistence.xml | 0 .../src/test/resources/JpaMetadataSpec-test.xml | 0 {webmvc => spring-data-rest-webmvc}/build.gradle | 7 +------ .../org/springframework/data/rest/webmvc/JsonView.java | 0 .../java/org/springframework/data/rest/webmvc/Links.java | 0 .../data/rest/webmvc/RepositoryRestConfiguration.java | 0 .../data/rest/webmvc/RepositoryRestController.java | 0 .../data/rest/webmvc/RepositoryRestMvcConfiguration.java | 0 .../webmvc/ServerHttpRequestMethodArgumentResolver.java | 0 .../org/springframework/data/rest/webmvc/UriListView.java | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../rest/webmvc/spec/RepositoryRestControllerSpec.groovy | 0 .../org/springframework/data/rest/test/RestBuilder.java | 0 .../org/springframework/data/rest/test/webmvc/Address.java | 0 .../data/rest/test/webmvc/AddressRepository.java | 0 .../org/springframework/data/rest/test/webmvc/Person.java | 0 .../data/rest/test/webmvc/PersonLoader.java | 0 .../data/rest/test/webmvc/PersonRepository.java | 0 .../org/springframework/data/rest/test/webmvc/Profile.java | 0 .../data/rest/test/webmvc/ProfileRepository.java | 0 .../src/test/resources/META-INF/persistence.xml | 0 .../META-INF/spring-data-rest/repositories-export.xml | 0 .../test/resources/META-INF/spring-data-rest/shared.xml | 0 .../src/test/resources/load_data.sh | 0 .../src/test/resources/logback.xml | 0 46 files changed, 6 insertions(+), 14 deletions(-) rename {core => spring-data-rest-core}/build.gradle (62%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/Handler.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/Link.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/SimpleLink.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/util/BeanUtils.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/util/FluentBeanDeserializer.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/util/FluentBeanSerializer.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/util/FluentBeanUtils.java (100%) rename {core => spring-data-rest-core}/src/main/java/org/springframework/data/rest/core/util/UriUtils.java (100%) rename {core => spring-data-rest-core}/src/test/groovy/org/springframework/data/rest/core/spec/UriUtilsSpec.groovy (100%) rename {core => spring-data-rest-core}/src/test/resources/logback.xml (100%) rename {repository => spring-data-rest-repository}/build.gradle (89%) rename {repository => spring-data-rest-repository}/src/main/java/org/springframework/data/rest/repository/JpaEntityMetadata.java (100%) rename {repository => spring-data-rest-repository}/src/main/java/org/springframework/data/rest/repository/JpaRepositoryMetadata.java (100%) rename {repository => spring-data-rest-repository}/src/test/groovy/org/springframework/data/rest/repository/spec/JpaMetadataSpec.groovy (100%) rename {repository => spring-data-rest-repository}/src/test/java/org/springframework/data/rest/repository/test/Family.java (100%) rename {repository => spring-data-rest-repository}/src/test/java/org/springframework/data/rest/repository/test/FamilyRepository.java (100%) rename {repository => spring-data-rest-repository}/src/test/java/org/springframework/data/rest/repository/test/Person.java (100%) rename {repository => spring-data-rest-repository}/src/test/java/org/springframework/data/rest/repository/test/PersonRepository.java (100%) rename {repository => spring-data-rest-repository}/src/test/resources/JpaMetadataSpec-persistence.xml (100%) rename {repository => spring-data-rest-repository}/src/test/resources/JpaMetadataSpec-test.xml (100%) rename {webmvc => spring-data-rest-webmvc}/build.gradle (77%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/JsonView.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/Links.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/java/org/springframework/data/rest/webmvc/UriListView.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/main/webapp/WEB-INF/web.xml (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/RestBuilder.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/Address.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/Person.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/resources/META-INF/persistence.xml (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/resources/META-INF/spring-data-rest/repositories-export.xml (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/resources/META-INF/spring-data-rest/shared.xml (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/resources/load_data.sh (100%) rename {webmvc => spring-data-rest-webmvc}/src/test/resources/logback.xml (100%) diff --git a/build.gradle b/build.gradle index 329e32fa9..769574467 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,7 @@ subprojects { apply plugin: "java" apply plugin: "groovy" + [compileJava, compileTestJava]*.options*.debugOptions*.debugLevel = "source,lines,vars" [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial", "-Xlint:-unchecked"] sourceCompatibility = 1.6 diff --git a/settings.gradle b/settings.gradle index f762b471f..a030b0942 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ -include "core", - "repository", - "webmvc" +include "spring-data-rest-core", + "spring-data-rest-repository", + "spring-data-rest-webmvc" diff --git a/core/build.gradle b/spring-data-rest-core/build.gradle similarity index 62% rename from core/build.gradle rename to spring-data-rest-core/build.gradle index 840aec090..1b01ab021 100644 --- a/core/build.gradle +++ b/spring-data-rest-core/build.gradle @@ -1,5 +1,3 @@ -archivesBaseName = "spring-data-rest-${name}" - dependencies { // Google Guava diff --git a/core/src/main/java/org/springframework/data/rest/core/Handler.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Handler.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/Handler.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Handler.java diff --git a/core/src/main/java/org/springframework/data/rest/core/Link.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Link.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/Link.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/Link.java diff --git a/core/src/main/java/org/springframework/data/rest/core/SimpleLink.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/SimpleLink.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/SimpleLink.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/SimpleLink.java diff --git a/core/src/main/java/org/springframework/data/rest/core/util/BeanUtils.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/BeanUtils.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/util/BeanUtils.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/BeanUtils.java diff --git a/core/src/main/java/org/springframework/data/rest/core/util/FluentBeanDeserializer.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/FluentBeanDeserializer.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/util/FluentBeanDeserializer.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/FluentBeanDeserializer.java diff --git a/core/src/main/java/org/springframework/data/rest/core/util/FluentBeanSerializer.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/FluentBeanSerializer.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/util/FluentBeanSerializer.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/FluentBeanSerializer.java diff --git a/core/src/main/java/org/springframework/data/rest/core/util/FluentBeanUtils.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/FluentBeanUtils.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/util/FluentBeanUtils.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/FluentBeanUtils.java diff --git a/core/src/main/java/org/springframework/data/rest/core/util/UriUtils.java b/spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/UriUtils.java similarity index 100% rename from core/src/main/java/org/springframework/data/rest/core/util/UriUtils.java rename to spring-data-rest-core/src/main/java/org/springframework/data/rest/core/util/UriUtils.java diff --git a/core/src/test/groovy/org/springframework/data/rest/core/spec/UriUtilsSpec.groovy b/spring-data-rest-core/src/test/groovy/org/springframework/data/rest/core/spec/UriUtilsSpec.groovy similarity index 100% rename from core/src/test/groovy/org/springframework/data/rest/core/spec/UriUtilsSpec.groovy rename to spring-data-rest-core/src/test/groovy/org/springframework/data/rest/core/spec/UriUtilsSpec.groovy diff --git a/core/src/test/resources/logback.xml b/spring-data-rest-core/src/test/resources/logback.xml similarity index 100% rename from core/src/test/resources/logback.xml rename to spring-data-rest-core/src/test/resources/logback.xml diff --git a/repository/build.gradle b/spring-data-rest-repository/build.gradle similarity index 89% rename from repository/build.gradle rename to spring-data-rest-repository/build.gradle index 4bcf05e58..65ec93ad3 100644 --- a/repository/build.gradle +++ b/spring-data-rest-repository/build.gradle @@ -1,5 +1,3 @@ -archivesBaseName = "spring-data-rest-${name}" - dependencies { // Spring @@ -15,7 +13,7 @@ dependencies { compile "org.springframework.data:spring-data-jpa:$sdJpaVersion" // Exporter core - compile project(":core") + compile project(":spring-data-rest-core") // Testing testCompile "org.hibernate:hibernate-entitymanager:$hibernateVersion" diff --git a/repository/src/main/java/org/springframework/data/rest/repository/JpaEntityMetadata.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/JpaEntityMetadata.java similarity index 100% rename from repository/src/main/java/org/springframework/data/rest/repository/JpaEntityMetadata.java rename to spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/JpaEntityMetadata.java diff --git a/repository/src/main/java/org/springframework/data/rest/repository/JpaRepositoryMetadata.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/JpaRepositoryMetadata.java similarity index 100% rename from repository/src/main/java/org/springframework/data/rest/repository/JpaRepositoryMetadata.java rename to spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/JpaRepositoryMetadata.java diff --git a/repository/src/test/groovy/org/springframework/data/rest/repository/spec/JpaMetadataSpec.groovy b/spring-data-rest-repository/src/test/groovy/org/springframework/data/rest/repository/spec/JpaMetadataSpec.groovy similarity index 100% rename from repository/src/test/groovy/org/springframework/data/rest/repository/spec/JpaMetadataSpec.groovy rename to spring-data-rest-repository/src/test/groovy/org/springframework/data/rest/repository/spec/JpaMetadataSpec.groovy diff --git a/repository/src/test/java/org/springframework/data/rest/repository/test/Family.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/Family.java similarity index 100% rename from repository/src/test/java/org/springframework/data/rest/repository/test/Family.java rename to spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/Family.java diff --git a/repository/src/test/java/org/springframework/data/rest/repository/test/FamilyRepository.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/FamilyRepository.java similarity index 100% rename from repository/src/test/java/org/springframework/data/rest/repository/test/FamilyRepository.java rename to spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/FamilyRepository.java diff --git a/repository/src/test/java/org/springframework/data/rest/repository/test/Person.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/Person.java similarity index 100% rename from repository/src/test/java/org/springframework/data/rest/repository/test/Person.java rename to spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/Person.java diff --git a/repository/src/test/java/org/springframework/data/rest/repository/test/PersonRepository.java b/spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/PersonRepository.java similarity index 100% rename from repository/src/test/java/org/springframework/data/rest/repository/test/PersonRepository.java rename to spring-data-rest-repository/src/test/java/org/springframework/data/rest/repository/test/PersonRepository.java diff --git a/repository/src/test/resources/JpaMetadataSpec-persistence.xml b/spring-data-rest-repository/src/test/resources/JpaMetadataSpec-persistence.xml similarity index 100% rename from repository/src/test/resources/JpaMetadataSpec-persistence.xml rename to spring-data-rest-repository/src/test/resources/JpaMetadataSpec-persistence.xml diff --git a/repository/src/test/resources/JpaMetadataSpec-test.xml b/spring-data-rest-repository/src/test/resources/JpaMetadataSpec-test.xml similarity index 100% rename from repository/src/test/resources/JpaMetadataSpec-test.xml rename to spring-data-rest-repository/src/test/resources/JpaMetadataSpec-test.xml diff --git a/webmvc/build.gradle b/spring-data-rest-webmvc/build.gradle similarity index 77% rename from webmvc/build.gradle rename to spring-data-rest-webmvc/build.gradle index d09c83aa1..184ee9ec3 100644 --- a/webmvc/build.gradle +++ b/spring-data-rest-webmvc/build.gradle @@ -1,8 +1,3 @@ -//apply plugin: "war" -//apply plugin: "jetty" - -archivesBaseName = "spring-data-rest-${name}" - dependencies { // APIS @@ -16,7 +11,7 @@ dependencies { runtime "cglib:cglib-nodep:2.2.2" // Repository Exporter support - compile project(":repository") + compile project(":spring-data-rest-repository") // Testing testRuntime "org.hibernate:hibernate-entitymanager:$hibernateVersion" diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/JsonView.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/JsonView.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/JsonView.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/JsonView.java diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/Links.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/Links.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/Links.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/Links.java diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestConfiguration.java diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestMvcConfiguration.java diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/ServerHttpRequestMethodArgumentResolver.java diff --git a/webmvc/src/main/java/org/springframework/data/rest/webmvc/UriListView.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/UriListView.java similarity index 100% rename from webmvc/src/main/java/org/springframework/data/rest/webmvc/UriListView.java rename to spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/UriListView.java diff --git a/webmvc/src/main/webapp/WEB-INF/web.xml b/spring-data-rest-webmvc/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from webmvc/src/main/webapp/WEB-INF/web.xml rename to spring-data-rest-webmvc/src/main/webapp/WEB-INF/web.xml diff --git a/webmvc/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy b/spring-data-rest-webmvc/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy similarity index 100% rename from webmvc/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy rename to spring-data-rest-webmvc/src/test/groovy/org/springframework/data/rest/webmvc/spec/RepositoryRestControllerSpec.groovy diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/RestBuilder.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/RestBuilder.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/RestBuilder.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/RestBuilder.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Address.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Address.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Address.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Address.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/AddressRepository.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Person.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Person.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Person.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Person.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonLoader.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/PersonRepository.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/Profile.java diff --git a/webmvc/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java b/spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java similarity index 100% rename from webmvc/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java rename to spring-data-rest-webmvc/src/test/java/org/springframework/data/rest/test/webmvc/ProfileRepository.java diff --git a/webmvc/src/test/resources/META-INF/persistence.xml b/spring-data-rest-webmvc/src/test/resources/META-INF/persistence.xml similarity index 100% rename from webmvc/src/test/resources/META-INF/persistence.xml rename to spring-data-rest-webmvc/src/test/resources/META-INF/persistence.xml diff --git a/webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml b/spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml similarity index 100% rename from webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml rename to spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/repositories-export.xml diff --git a/webmvc/src/test/resources/META-INF/spring-data-rest/shared.xml b/spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/shared.xml similarity index 100% rename from webmvc/src/test/resources/META-INF/spring-data-rest/shared.xml rename to spring-data-rest-webmvc/src/test/resources/META-INF/spring-data-rest/shared.xml diff --git a/webmvc/src/test/resources/load_data.sh b/spring-data-rest-webmvc/src/test/resources/load_data.sh similarity index 100% rename from webmvc/src/test/resources/load_data.sh rename to spring-data-rest-webmvc/src/test/resources/load_data.sh diff --git a/webmvc/src/test/resources/logback.xml b/spring-data-rest-webmvc/src/test/resources/logback.xml similarity index 100% rename from webmvc/src/test/resources/logback.xml rename to spring-data-rest-webmvc/src/test/resources/logback.xml