From 099ca723d46d84d2303f33f91ee02ff53791bb2a Mon Sep 17 00:00:00 2001 From: Aleksei Kornev Date: Tue, 19 Aug 2014 14:33:34 +0400 Subject: [PATCH] Move Petclinic to Maven submodule Convert one-module Maven project to multi module - to co-locate a separate module with integration tests. Change Maven group to avoid overlapping with Spring artifacts. --- pom.xml | 453 +---------------- spring-petclinic/pom.xml | 456 ++++++++++++++++++ readme.md => spring-petclinic/readme.md | 0 .../samples/petclinic/model/BaseEntity.java | 0 .../samples/petclinic/model/NamedEntity.java | 0 .../samples/petclinic/model/Owner.java | 0 .../samples/petclinic/model/Person.java | 0 .../samples/petclinic/model/Pet.java | 0 .../samples/petclinic/model/PetType.java | 0 .../samples/petclinic/model/Specialty.java | 0 .../samples/petclinic/model/Vet.java | 0 .../samples/petclinic/model/Vets.java | 0 .../samples/petclinic/model/Visit.java | 0 .../samples/petclinic/model/package-info.java | 0 .../petclinic/repository/OwnerRepository.java | 0 .../petclinic/repository/PetRepository.java | 0 .../petclinic/repository/VetRepository.java | 0 .../petclinic/repository/VisitRepository.java | 0 .../jdbc/JdbcOwnerRepositoryImpl.java | 0 .../petclinic/repository/jdbc/JdbcPet.java | 0 .../jdbc/JdbcPetRepositoryImpl.java | 0 .../repository/jdbc/JdbcPetRowMapper.java | 0 .../jdbc/JdbcVetRepositoryImpl.java | 0 .../jdbc/JdbcVisitRepositoryImpl.java | 0 .../repository/jdbc/package-info.java | 0 .../jpa/JpaOwnerRepositoryImpl.java | 0 .../repository/jpa/JpaPetRepositoryImpl.java | 0 .../repository/jpa/JpaVetRepositoryImpl.java | 0 .../jpa/JpaVisitRepositoryImpl.java | 0 .../repository/jpa/package-info.java | 0 .../SpringDataOwnerRepository.java | 0 .../SpringDataPetRepository.java | 0 .../SpringDataVetRepository.java | 0 .../SpringDataVisitRepository.java | 0 .../petclinic/service/ClinicService.java | 0 .../petclinic/service/ClinicServiceImpl.java | 0 .../petclinic/util/CallMonitoringAspect.java | 0 .../samples/petclinic/util/EntityUtils.java | 0 .../petclinic/web/CrashController.java | 0 .../petclinic/web/OwnerController.java | 0 .../samples/petclinic/web/PetController.java | 0 .../petclinic/web/PetTypeFormatter.java | 0 .../samples/petclinic/web/PetValidator.java | 0 .../samples/petclinic/web/VetController.java | 0 .../samples/petclinic/web/VetsAtomView.java | 0 .../petclinic/web/VisitController.java | 0 .../samples/petclinic/web/package-info.java | 0 .../src}/main/java/overview.html | 0 .../src}/main/java/test.html | 0 .../src}/main/resources/cache/ehcache.xml | 0 .../src}/main/resources/cache/ehcache.xsd | 0 .../datatables/datatables.properties | 0 .../src}/main/resources/db/hsqldb/initDB.sql | 0 .../main/resources/db/hsqldb/populateDB.sql | 0 .../src}/main/resources/db/mysql/initDB.sql | 0 .../db/mysql/petclinic_db_setup_mysql.txt | 0 .../main/resources/db/mysql/populateDB.sql | 0 .../src}/main/resources/db_readme.txt | 0 .../src}/main/resources/logback.xml | 0 .../resources/messages/messages.properties | 0 .../resources/messages/messages_de.properties | 0 .../resources/messages/messages_en.properties | 0 .../main/resources/spring/business-config.xml | 0 .../resources/spring/data-access.properties | 0 .../resources/spring/datasource-config.xml | 0 .../main/resources/spring/mvc-core-config.xml | 0 .../main/resources/spring/mvc-view-config.xml | 0 .../main/resources/spring/tools-config.xml | 0 .../main/webapp/WEB-INF/jsp/exception.jsp | 0 .../WEB-INF/jsp/fragments/bodyHeader.jsp | 0 .../webapp/WEB-INF/jsp/fragments/footer.jsp | 0 .../webapp/WEB-INF/jsp/fragments/headTag.jsp | 0 .../jsp/owners/createOrUpdateOwnerForm.jsp | 0 .../webapp/WEB-INF/jsp/owners/findOwners.jsp | 0 .../WEB-INF/jsp/owners/ownerDetails.jsp | 0 .../webapp/WEB-INF/jsp/owners/ownersList.jsp | 0 .../jsp/pets/createOrUpdatePetForm.jsp | 0 .../jsp/pets/createOrUpdateVisitForm.jsp | 0 .../main/webapp/WEB-INF/jsp/vets/vetList.jsp | 0 .../src}/main/webapp/WEB-INF/jsp/welcome.jsp | 0 .../WEB-INF/no-spring-config-files-there.txt | 0 .../main/webapp/WEB-INF/tags/inputField.tag | 0 .../main/webapp/WEB-INF/tags/selectField.tag | 0 .../src}/main/webapp/WEB-INF/web.xml | 0 .../main/webapp/resources/css/petclinic.css | 0 .../resources/images/banner-graphic.png | Bin .../webapp/resources/images/bullet-arrow.png | Bin .../main/webapp/resources/images/pets.png | Bin .../resources/images/spring-pivotal-logo.png | Bin .../resources/images/springsource-logo.png | Bin .../webapp/resources/images/submit-bg.png | Bin .../samples/petclinic/model/OwnerTests.java | 0 .../petclinic/model/ValidatorTests.java | 0 .../service/AbstractClinicServiceTests.java | 0 .../service/ClinicServiceJdbcTests.java | 0 .../service/ClinicServiceJpaTests.java | 0 .../ClinicServiceSpringDataJpaTests.java | 0 .../petclinic/web/VisitsViewTests-config.xml | 0 .../petclinic/web/VisitsViewTests.java | 0 99 files changed, 464 insertions(+), 445 deletions(-) create mode 100644 spring-petclinic/pom.xml rename readme.md => spring-petclinic/readme.md (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/BaseEntity.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/NamedEntity.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Owner.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Person.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Pet.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/PetType.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Specialty.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Vet.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Vets.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/Visit.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/model/package-info.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/PetRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/VetRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/service/ClinicService.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/util/EntityUtils.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/CrashController.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/OwnerController.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/PetController.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/PetValidator.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/VetController.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/VisitController.java (100%) rename {src => spring-petclinic/src}/main/java/org/springframework/samples/petclinic/web/package-info.java (100%) rename {src => spring-petclinic/src}/main/java/overview.html (100%) rename {src => spring-petclinic/src}/main/java/test.html (100%) rename {src => spring-petclinic/src}/main/resources/cache/ehcache.xml (100%) rename {src => spring-petclinic/src}/main/resources/cache/ehcache.xsd (100%) rename {src => spring-petclinic/src}/main/resources/dandelion/datatables/datatables.properties (100%) rename {src => spring-petclinic/src}/main/resources/db/hsqldb/initDB.sql (100%) rename {src => spring-petclinic/src}/main/resources/db/hsqldb/populateDB.sql (100%) rename {src => spring-petclinic/src}/main/resources/db/mysql/initDB.sql (100%) rename {src => spring-petclinic/src}/main/resources/db/mysql/petclinic_db_setup_mysql.txt (100%) rename {src => spring-petclinic/src}/main/resources/db/mysql/populateDB.sql (100%) rename {src => spring-petclinic/src}/main/resources/db_readme.txt (100%) rename {src => spring-petclinic/src}/main/resources/logback.xml (100%) rename {src => spring-petclinic/src}/main/resources/messages/messages.properties (100%) rename {src => spring-petclinic/src}/main/resources/messages/messages_de.properties (100%) rename {src => spring-petclinic/src}/main/resources/messages/messages_en.properties (100%) rename {src => spring-petclinic/src}/main/resources/spring/business-config.xml (100%) rename {src => spring-petclinic/src}/main/resources/spring/data-access.properties (100%) rename {src => spring-petclinic/src}/main/resources/spring/datasource-config.xml (100%) rename {src => spring-petclinic/src}/main/resources/spring/mvc-core-config.xml (100%) rename {src => spring-petclinic/src}/main/resources/spring/mvc-view-config.xml (100%) rename {src => spring-petclinic/src}/main/resources/spring/tools-config.xml (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/exception.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/fragments/footer.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/fragments/headTag.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/owners/findOwners.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/owners/ownersList.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/vets/vetList.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/jsp/welcome.jsp (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/no-spring-config-files-there.txt (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/tags/inputField.tag (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/tags/selectField.tag (100%) rename {src => spring-petclinic/src}/main/webapp/WEB-INF/web.xml (100%) rename {src => spring-petclinic/src}/main/webapp/resources/css/petclinic.css (100%) rename {src => spring-petclinic/src}/main/webapp/resources/images/banner-graphic.png (100%) rename {src => spring-petclinic/src}/main/webapp/resources/images/bullet-arrow.png (100%) rename {src => spring-petclinic/src}/main/webapp/resources/images/pets.png (100%) rename {src => spring-petclinic/src}/main/webapp/resources/images/spring-pivotal-logo.png (100%) rename {src => spring-petclinic/src}/main/webapp/resources/images/springsource-logo.png (100%) rename {src => spring-petclinic/src}/main/webapp/resources/images/submit-bg.png (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/model/OwnerTests.java (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml (100%) rename {src => spring-petclinic/src}/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java (100%) diff --git a/pom.xml b/pom.xml index e43175cf9..0b319c3c8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,453 +1,16 @@ 4.0.0 - org.springframework.samples - spring-petclinic + com.griddynamics.cd.asf-webapp-demo + asf-webapp-demo 1.0.0-SNAPSHOT + pom - petclinic - war + ASF petclinic + ASF fork of Spring Petclinic - + + spring-petclinic + - - 1.6 - UTF-8 - UTF-8 - - - 4.0.5.RELEASE - 1.6.1.RELEASE - - - - 2.2 - 1.2 - 7.0.30 - 2.2.7 - - - 4.3.5.Final - - - 4.3.1.Final - - - 7.0.42 - 2.6.9 - 2.3.2 - - - 1.8.1 - - - 1.1.2 - 1.7.7 - - - 1.0 - - - 4.11 - 1.3 - - - 1.3 - 1.1.1 - 2.3 - 3.1.0.GA - - - - 2.3.0 - 1.10.3 - 2.0.3-1 - 0.10.0 - - 5.1.22 - - - - - - org.jadira.usertype - usertype.core - ${jadira-usertype-core.version} - - - org.apache.tomcat - tomcat-servlet-api - ${tomcat.servlet.version} - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - - org.glassfish.web - jstl-impl - 1.2 - - - javax.servlet - servlet-api - - - - - com.sun.xml.bind - jaxb-impl - ${jaxb-impl.version} - provided - - - - org.springframework.data - spring-data-jpa - ${spring-data-jpa.version} - - - - org.springframework - spring-jdbc - ${spring-framework.version} - - - org.springframework - spring-aop - ${spring-framework.version} - - - org.springframework - spring-webmvc - ${spring-framework.version} - - - org.springframework - spring-tx - ${spring-framework.version} - - - - org.springframework - spring-context-support - ${spring-framework.version} - - - org.springframework - spring-orm - ${spring-framework.version} - - - org.springframework - spring-oxm - ${spring-framework.version} - - - commons-lang - commons-lang - - - - - org.springframework - spring-jms - ${spring-framework.version} - - - - - - org.apache.tomcat - tomcat-jdbc - ${tomcat-jdbc.version} - runtime - - - - - org.slf4j - slf4j-api - ${slf4j.version} - compile - - - ch.qos.logback - logback-classic - ${logback.version} - runtime - - - - - rome - rome - ${rome.version} - - - - - joda-time - joda-time - ${jodatime.version} - - - joda-time - joda-time-hibernate - ${jodatime-hibernate.version} - - - joda-time - joda-time-jsptags - ${jodatime-jsptags.version} - - - - - - org.hsqldb - hsqldb - ${hsqldb.version} - runtime - - - - - - - org.hibernate - hibernate-entitymanager - ${hibernate.version} - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - - org.hibernate - hibernate-ehcache - ${hibernate.version} - - - net.sf.ehcache - ehcache-core - ${ehcache.version} - - - commons-logging - commons-logging - - - - - - org.webjars - bootstrap - ${webjars-bootstrap.version} - - - org.webjars - jquery-ui - ${webjars-jquery-ui.version} - - - org.webjars - jquery - ${webjars-jquery.version} - - - - - org.springframework - spring-test - ${spring-framework.version} - test - - - junit - junit - ${junit.version} - test - - - - org.hamcrest - hamcrest-library - ${hamcrest.version} - test - - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjweaver - ${aspectj.version} - runtime - - - - - - com.github.dandelion - datatables-jsp - ${dandelion.version} - - - com.github.dandelion - datatables-export-itext - ${dandelion.version} - - - - - - - - - org.springframework - spring-core - ${spring-framework.version} - - - org.springframework - spring-beans - ${spring-framework.version} - - - org.springframework - spring-context - ${spring-framework.version} - - - org.springframework - spring-orm - ${spring-framework.version} - - - org.springframework - spring-aop - ${spring-framework.version} - - - org.springframework - spring-tx - ${spring-framework.version} - - - - - - - install - - - - ${project.basedir}/src/test/java - - - ${project.basedir}/src/test/resources - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.0 - - - - - true - ${java.version} - ${java.version} - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.13 - - - **/*Tests.java - - - - - org.apache.maven.plugins - maven-war-plugin - 2.3 - - petclinic - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 - - true - true - 2.0 - - **/*.* - - - - org.springframework.ide.eclipse.core.springbuilder - - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.jdt.core.javanature - org.springframework.ide.eclipse.core.springnature - org.eclipse.m2e.core.maven2Nature - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.4 - - - jar-with-dependencies - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.0 - - tomcat-development-server - 9966 - /petclinic - - - - - - demopetclinic diff --git a/spring-petclinic/pom.xml b/spring-petclinic/pom.xml new file mode 100644 index 000000000..d5cffcb89 --- /dev/null +++ b/spring-petclinic/pom.xml @@ -0,0 +1,456 @@ + + + 4.0.0 + + com.griddynamics.cd.asf-webapp-demo + asf-webapp-demo + 1.0.0-SNAPSHOT + + spring-petclinic + + petclinic + war + + + + + 1.6 + UTF-8 + UTF-8 + + + 4.0.5.RELEASE + 1.6.1.RELEASE + + + + 2.2 + 1.2 + 7.0.30 + 2.2.7 + + + 4.3.5.Final + + + 4.3.1.Final + + + 7.0.42 + 2.6.9 + 2.3.2 + + + 1.8.1 + + + 1.1.2 + 1.7.7 + + + 1.0 + + + 4.11 + 1.3 + + + 1.3 + 1.1.1 + 2.3 + 3.1.0.GA + + + + 2.3.0 + 1.10.3 + 2.0.3-1 + 0.10.0 + + 5.1.22 + + + + + + org.jadira.usertype + usertype.core + ${jadira-usertype-core.version} + + + org.apache.tomcat + tomcat-servlet-api + ${tomcat.servlet.version} + provided + + + javax.servlet.jsp + jsp-api + 2.1 + provided + + + + org.glassfish.web + jstl-impl + 1.2 + + + javax.servlet + servlet-api + + + + + com.sun.xml.bind + jaxb-impl + ${jaxb-impl.version} + provided + + + + org.springframework.data + spring-data-jpa + ${spring-data-jpa.version} + + + + org.springframework + spring-jdbc + ${spring-framework.version} + + + org.springframework + spring-aop + ${spring-framework.version} + + + org.springframework + spring-webmvc + ${spring-framework.version} + + + org.springframework + spring-tx + ${spring-framework.version} + + + + org.springframework + spring-context-support + ${spring-framework.version} + + + org.springframework + spring-orm + ${spring-framework.version} + + + org.springframework + spring-oxm + ${spring-framework.version} + + + commons-lang + commons-lang + + + + + org.springframework + spring-jms + ${spring-framework.version} + + + + + + org.apache.tomcat + tomcat-jdbc + ${tomcat-jdbc.version} + runtime + + + + + org.slf4j + slf4j-api + ${slf4j.version} + compile + + + ch.qos.logback + logback-classic + ${logback.version} + runtime + + + + + rome + rome + ${rome.version} + + + + + joda-time + joda-time + ${jodatime.version} + + + joda-time + joda-time-hibernate + ${jodatime-hibernate.version} + + + joda-time + joda-time-jsptags + ${jodatime-jsptags.version} + + + + + + org.hsqldb + hsqldb + ${hsqldb.version} + runtime + + + + + + + org.hibernate + hibernate-entitymanager + ${hibernate.version} + + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + + + org.hibernate + hibernate-ehcache + ${hibernate.version} + + + net.sf.ehcache + ehcache-core + ${ehcache.version} + + + commons-logging + commons-logging + + + + + + org.webjars + bootstrap + ${webjars-bootstrap.version} + + + org.webjars + jquery-ui + ${webjars-jquery-ui.version} + + + org.webjars + jquery + ${webjars-jquery.version} + + + + + org.springframework + spring-test + ${spring-framework.version} + test + + + junit + junit + ${junit.version} + test + + + + org.hamcrest + hamcrest-library + ${hamcrest.version} + test + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + runtime + + + + + + com.github.dandelion + datatables-jsp + ${dandelion.version} + + + com.github.dandelion + datatables-export-itext + ${dandelion.version} + + + + + + + + + org.springframework + spring-core + ${spring-framework.version} + + + org.springframework + spring-beans + ${spring-framework.version} + + + org.springframework + spring-context + ${spring-framework.version} + + + org.springframework + spring-orm + ${spring-framework.version} + + + org.springframework + spring-aop + ${spring-framework.version} + + + org.springframework + spring-tx + ${spring-framework.version} + + + + + + + install + + + + ${project.basedir}/src/test/java + + + ${project.basedir}/src/test/resources + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + + + true + ${java.version} + ${java.version} + true + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.13 + + + **/*Tests.java + + + + + org.apache.maven.plugins + maven-war-plugin + 2.3 + + petclinic + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.9 + + true + true + 2.0 + + **/*.* + + + + org.springframework.ide.eclipse.core.springbuilder + + + org.eclipse.m2e.core.maven2Builder + + + + org.eclipse.jdt.core.javanature + org.springframework.ide.eclipse.core.springnature + org.eclipse.m2e.core.maven2Nature + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.4 + + + jar-with-dependencies + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.0 + + tomcat-development-server + 9966 + /petclinic + + + + + + demopetclinic + diff --git a/readme.md b/spring-petclinic/readme.md similarity index 100% rename from readme.md rename to spring-petclinic/readme.md diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Owner.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Owner.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Owner.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Owner.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Person.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Person.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Person.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Pet.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Pet.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Pet.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Pet.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/PetType.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/PetType.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/PetType.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/PetType.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Specialty.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Specialty.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Specialty.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Specialty.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vet.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vet.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Vet.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vet.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vets.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vets.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Vets.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Vets.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Visit.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Visit.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/Visit.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/Visit.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/package-info.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/package-info.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/model/package-info.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/model/package-info.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPet.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRowMapper.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jdbc/package-info.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/jpa/package-info.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataPetRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVetRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataVisitRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/service/ClinicService.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java diff --git a/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/CrashController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/CrashController.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/CrashController.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/CrashController.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/OwnerController.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/OwnerController.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetController.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/PetController.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetController.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetTypeFormatter.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/PetValidator.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetController.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/VetController.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetController.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VetsAtomView.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/VisitController.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitController.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/VisitController.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitController.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/package-info.java b/spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/package-info.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/package-info.java rename to spring-petclinic/src/main/java/org/springframework/samples/petclinic/web/package-info.java diff --git a/src/main/java/overview.html b/spring-petclinic/src/main/java/overview.html similarity index 100% rename from src/main/java/overview.html rename to spring-petclinic/src/main/java/overview.html diff --git a/src/main/java/test.html b/spring-petclinic/src/main/java/test.html similarity index 100% rename from src/main/java/test.html rename to spring-petclinic/src/main/java/test.html diff --git a/src/main/resources/cache/ehcache.xml b/spring-petclinic/src/main/resources/cache/ehcache.xml similarity index 100% rename from src/main/resources/cache/ehcache.xml rename to spring-petclinic/src/main/resources/cache/ehcache.xml diff --git a/src/main/resources/cache/ehcache.xsd b/spring-petclinic/src/main/resources/cache/ehcache.xsd similarity index 100% rename from src/main/resources/cache/ehcache.xsd rename to spring-petclinic/src/main/resources/cache/ehcache.xsd diff --git a/src/main/resources/dandelion/datatables/datatables.properties b/spring-petclinic/src/main/resources/dandelion/datatables/datatables.properties similarity index 100% rename from src/main/resources/dandelion/datatables/datatables.properties rename to spring-petclinic/src/main/resources/dandelion/datatables/datatables.properties diff --git a/src/main/resources/db/hsqldb/initDB.sql b/spring-petclinic/src/main/resources/db/hsqldb/initDB.sql similarity index 100% rename from src/main/resources/db/hsqldb/initDB.sql rename to spring-petclinic/src/main/resources/db/hsqldb/initDB.sql diff --git a/src/main/resources/db/hsqldb/populateDB.sql b/spring-petclinic/src/main/resources/db/hsqldb/populateDB.sql similarity index 100% rename from src/main/resources/db/hsqldb/populateDB.sql rename to spring-petclinic/src/main/resources/db/hsqldb/populateDB.sql diff --git a/src/main/resources/db/mysql/initDB.sql b/spring-petclinic/src/main/resources/db/mysql/initDB.sql similarity index 100% rename from src/main/resources/db/mysql/initDB.sql rename to spring-petclinic/src/main/resources/db/mysql/initDB.sql diff --git a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt b/spring-petclinic/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt similarity index 100% rename from src/main/resources/db/mysql/petclinic_db_setup_mysql.txt rename to spring-petclinic/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt diff --git a/src/main/resources/db/mysql/populateDB.sql b/spring-petclinic/src/main/resources/db/mysql/populateDB.sql similarity index 100% rename from src/main/resources/db/mysql/populateDB.sql rename to spring-petclinic/src/main/resources/db/mysql/populateDB.sql diff --git a/src/main/resources/db_readme.txt b/spring-petclinic/src/main/resources/db_readme.txt similarity index 100% rename from src/main/resources/db_readme.txt rename to spring-petclinic/src/main/resources/db_readme.txt diff --git a/src/main/resources/logback.xml b/spring-petclinic/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to spring-petclinic/src/main/resources/logback.xml diff --git a/src/main/resources/messages/messages.properties b/spring-petclinic/src/main/resources/messages/messages.properties similarity index 100% rename from src/main/resources/messages/messages.properties rename to spring-petclinic/src/main/resources/messages/messages.properties diff --git a/src/main/resources/messages/messages_de.properties b/spring-petclinic/src/main/resources/messages/messages_de.properties similarity index 100% rename from src/main/resources/messages/messages_de.properties rename to spring-petclinic/src/main/resources/messages/messages_de.properties diff --git a/src/main/resources/messages/messages_en.properties b/spring-petclinic/src/main/resources/messages/messages_en.properties similarity index 100% rename from src/main/resources/messages/messages_en.properties rename to spring-petclinic/src/main/resources/messages/messages_en.properties diff --git a/src/main/resources/spring/business-config.xml b/spring-petclinic/src/main/resources/spring/business-config.xml similarity index 100% rename from src/main/resources/spring/business-config.xml rename to spring-petclinic/src/main/resources/spring/business-config.xml diff --git a/src/main/resources/spring/data-access.properties b/spring-petclinic/src/main/resources/spring/data-access.properties similarity index 100% rename from src/main/resources/spring/data-access.properties rename to spring-petclinic/src/main/resources/spring/data-access.properties diff --git a/src/main/resources/spring/datasource-config.xml b/spring-petclinic/src/main/resources/spring/datasource-config.xml similarity index 100% rename from src/main/resources/spring/datasource-config.xml rename to spring-petclinic/src/main/resources/spring/datasource-config.xml diff --git a/src/main/resources/spring/mvc-core-config.xml b/spring-petclinic/src/main/resources/spring/mvc-core-config.xml similarity index 100% rename from src/main/resources/spring/mvc-core-config.xml rename to spring-petclinic/src/main/resources/spring/mvc-core-config.xml diff --git a/src/main/resources/spring/mvc-view-config.xml b/spring-petclinic/src/main/resources/spring/mvc-view-config.xml similarity index 100% rename from src/main/resources/spring/mvc-view-config.xml rename to spring-petclinic/src/main/resources/spring/mvc-view-config.xml diff --git a/src/main/resources/spring/tools-config.xml b/spring-petclinic/src/main/resources/spring/tools-config.xml similarity index 100% rename from src/main/resources/spring/tools-config.xml rename to spring-petclinic/src/main/resources/spring/tools-config.xml diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/exception.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/exception.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/exception.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/fragments/bodyHeader.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fragments/footer.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp diff --git a/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/createOrUpdateOwnerForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/findOwners.jsp diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/ownerDetails.jsp diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/pets/createOrUpdatePetForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/pets/createOrUpdateVisitForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/vets/vetList.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/spring-petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/welcome.jsp rename to spring-petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp diff --git a/src/main/webapp/WEB-INF/no-spring-config-files-there.txt b/spring-petclinic/src/main/webapp/WEB-INF/no-spring-config-files-there.txt similarity index 100% rename from src/main/webapp/WEB-INF/no-spring-config-files-there.txt rename to spring-petclinic/src/main/webapp/WEB-INF/no-spring-config-files-there.txt diff --git a/src/main/webapp/WEB-INF/tags/inputField.tag b/spring-petclinic/src/main/webapp/WEB-INF/tags/inputField.tag similarity index 100% rename from src/main/webapp/WEB-INF/tags/inputField.tag rename to spring-petclinic/src/main/webapp/WEB-INF/tags/inputField.tag diff --git a/src/main/webapp/WEB-INF/tags/selectField.tag b/spring-petclinic/src/main/webapp/WEB-INF/tags/selectField.tag similarity index 100% rename from src/main/webapp/WEB-INF/tags/selectField.tag rename to spring-petclinic/src/main/webapp/WEB-INF/tags/selectField.tag diff --git a/src/main/webapp/WEB-INF/web.xml b/spring-petclinic/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from src/main/webapp/WEB-INF/web.xml rename to spring-petclinic/src/main/webapp/WEB-INF/web.xml diff --git a/src/main/webapp/resources/css/petclinic.css b/spring-petclinic/src/main/webapp/resources/css/petclinic.css similarity index 100% rename from src/main/webapp/resources/css/petclinic.css rename to spring-petclinic/src/main/webapp/resources/css/petclinic.css diff --git a/src/main/webapp/resources/images/banner-graphic.png b/spring-petclinic/src/main/webapp/resources/images/banner-graphic.png similarity index 100% rename from src/main/webapp/resources/images/banner-graphic.png rename to spring-petclinic/src/main/webapp/resources/images/banner-graphic.png diff --git a/src/main/webapp/resources/images/bullet-arrow.png b/spring-petclinic/src/main/webapp/resources/images/bullet-arrow.png similarity index 100% rename from src/main/webapp/resources/images/bullet-arrow.png rename to spring-petclinic/src/main/webapp/resources/images/bullet-arrow.png diff --git a/src/main/webapp/resources/images/pets.png b/spring-petclinic/src/main/webapp/resources/images/pets.png similarity index 100% rename from src/main/webapp/resources/images/pets.png rename to spring-petclinic/src/main/webapp/resources/images/pets.png diff --git a/src/main/webapp/resources/images/spring-pivotal-logo.png b/spring-petclinic/src/main/webapp/resources/images/spring-pivotal-logo.png similarity index 100% rename from src/main/webapp/resources/images/spring-pivotal-logo.png rename to spring-petclinic/src/main/webapp/resources/images/spring-pivotal-logo.png diff --git a/src/main/webapp/resources/images/springsource-logo.png b/spring-petclinic/src/main/webapp/resources/images/springsource-logo.png similarity index 100% rename from src/main/webapp/resources/images/springsource-logo.png rename to spring-petclinic/src/main/webapp/resources/images/springsource-logo.png diff --git a/src/main/webapp/resources/images/submit-bg.png b/spring-petclinic/src/main/webapp/resources/images/submit-bg.png similarity index 100% rename from src/main/webapp/resources/images/submit-bg.png rename to spring-petclinic/src/main/webapp/resources/images/submit-bg.png diff --git a/src/test/java/org/springframework/samples/petclinic/model/OwnerTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/OwnerTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/model/OwnerTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/OwnerTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJdbcTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceJpaTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceSpringDataJpaTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests-config.xml diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java b/spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java rename to spring-petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTests.java