diff --git a/.gitignore b/.gitignore index d6b058201..22915b52e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,18 @@ +# Maven target/ + +# Eclipse .settings/ .classpath .project + +# IntelliJ IDEA .idea *.iml + +# Branch switching generated/ + +# Front-end client +node_modules/ +bower_components/ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3e6944636..b04e3f065 100644 --- a/pom.xml +++ b/pom.xml @@ -9,140 +9,24 @@ org.springframework.samples - spring-petclinic - 1.0.0-SNAPSHOT + springboot-petclinic + 1.4.1 + Spring Petclinic :: Parent POM + pom - petclinic - jar + + springboot-petclinic-client + springboot-petclinic-server + - - 1.7 + + + + org.springframework.samples + springboot-petclinic-client + ${project.version} + + + - - 3.3.7 - 1.5.8 - 3.1.0 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - org.springframework.boot - spring-boot-starter-cache - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.springframework.boot - spring-boot-devtools - true - - - - org.hsqldb - hsqldb - runtime - - - - org.webjars - bootstrap - ${webjars-bootstrap.version} - - - - org.webjars - jquery - ${webjars-jquery.version} - - - - org.webjars - angularjs - ${webjars-angularjs.version} - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - javax.cache - cache-api - - - org.ehcache - ehcache - - - - - petclinic - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - build-info - - - - ${project.build.sourceEncoding} - ${project.reporting.outputEncoding} - ${maven.compiler.source} - ${maven.compiler.target} - - - - - - - - - pl.project13.maven - git-commit-id-plugin - - - - revision - - - - - true - yyyy-MM-dd'T'HH:mm:ssZ - true - ${project.build.outputDirectory}/git.properties - - - - - diff --git a/springboot-petclinic-client/bower.json b/springboot-petclinic-client/bower.json new file mode 100644 index 000000000..145f7d8bb --- /dev/null +++ b/springboot-petclinic-client/bower.json @@ -0,0 +1,25 @@ +{ + "name": "spring-petclinic-client", + "description": "Spring Petclinic AngularJS client application", + "main": "", + "authors": [ + "Antoine Rey " + ], + "license": "Apache 2.0", + "homepage": "https://github.com/spring-projects/spring-petclinic", + "moduleType": [], + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "angular": "~1.5.8", + "angular-route": "~1.5.8", + "bootstrap": "components/bootstrap#~3.3.7", + "jquery": "components/jquery#~3.1.0" + } +} diff --git a/springboot-petclinic-client/package.json b/springboot-petclinic-client/package.json new file mode 100644 index 000000000..2e809be06 --- /dev/null +++ b/springboot-petclinic-client/package.json @@ -0,0 +1,7 @@ +{ + "private": true, + "dependencies": {}, + "devDependencies": { + "bower": "^1.7.9" + } +} diff --git a/springboot-petclinic-client/pom.xml b/springboot-petclinic-client/pom.xml new file mode 100644 index 000000000..04f549a94 --- /dev/null +++ b/springboot-petclinic-client/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + + org.springframework.samples + springboot-petclinic + 1.4.1 + + springboot-petclinic-client + Spring Petclinic :: AngularJS Client + + + v4.4.3 + 2.15.1 + + + + + + ${basedir}/src + + + ${basedir}/bower_components + + + + + com.github.eirslett + frontend-maven-plugin + + target + + + + install node and npm + + install-node-and-npm + + + ${node.version} + ${npm.version} + + + + npm install + + npm + + + + bower install + + bower + + + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.build.directory}/classes/public/ + + + + + diff --git a/springboot-petclinic-server/pom.xml b/springboot-petclinic-server/pom.xml new file mode 100644 index 000000000..e0f7186e2 --- /dev/null +++ b/springboot-petclinic-server/pom.xml @@ -0,0 +1,126 @@ + + + 4.0.0 + + + org.springframework.samples + springboot-petclinic + 1.4.1 + + springboot-petclinic-server + Spring Petclinic :: Spring MVC REST server + + + 1.7 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-cache + + + + org.springframework.boot + spring-boot-starter-actuator + + + + org.springframework.boot + spring-boot-devtools + true + + + + org.springframework.samples + springboot-petclinic-client + + + + org.hsqldb + hsqldb + runtime + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + javax.cache + cache-api + + + org.ehcache + ehcache + + + + + petclinic + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + build-info + + + + ${project.build.sourceEncoding} + ${project.reporting.outputEncoding} + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + + + + pl.project13.maven + git-commit-id-plugin + + + + revision + + + + + true + yyyy-MM-dd'T'HH:mm:ssZ + true + ${project.build.outputDirectory}/git.properties + + + + + + diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java diff --git a/src/main/java/org/springframework/samples/petclinic/config/CacheConfig.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/config/CacheConfig.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/config/CacheConfig.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/config/CacheConfig.java diff --git a/src/main/java/org/springframework/samples/petclinic/config/WebConfig.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/config/WebConfig.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/config/WebConfig.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/config/WebConfig.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/BaseEntity.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/NamedEntity.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Owner.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Owner.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Person.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Person.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Pet.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Pet.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/PetType.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/PetType.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Specialty.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Specialty.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vet.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Vet.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Vets.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/model/Vets.java diff --git a/src/main/java/org/springframework/samples/petclinic/model/Visit.java b/springboot-petclinic-server/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 springboot-petclinic-server/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/springboot-petclinic-server/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 springboot-petclinic-server/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/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/OwnerRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/VetRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/repository/VisitRepository.java diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/service/ClinicService.java diff --git a/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/service/ClinicServiceImpl.java diff --git a/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/util/CallMonitoringAspect.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/OwnerResource.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/OwnerResource.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/OwnerResource.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/OwnerResource.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetResource.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/PetResource.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/PetResource.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/PetResource.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/PetValidator.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/VetResource.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/VetResource.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/VetResource.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/VetResource.java diff --git a/src/main/java/org/springframework/samples/petclinic/web/VisitResource.java b/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/VisitResource.java similarity index 100% rename from src/main/java/org/springframework/samples/petclinic/web/VisitResource.java rename to springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/web/VisitResource.java diff --git a/src/main/resources/application.properties b/springboot-petclinic-server/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to springboot-petclinic-server/src/main/resources/application.properties diff --git a/src/main/resources/banner.txt b/springboot-petclinic-server/src/main/resources/banner.txt similarity index 100% rename from src/main/resources/banner.txt rename to springboot-petclinic-server/src/main/resources/banner.txt diff --git a/src/main/resources/db/hsqldb/data.sql b/springboot-petclinic-server/src/main/resources/db/hsqldb/data.sql similarity index 100% rename from src/main/resources/db/hsqldb/data.sql rename to springboot-petclinic-server/src/main/resources/db/hsqldb/data.sql diff --git a/src/main/resources/db/hsqldb/schema.sql b/springboot-petclinic-server/src/main/resources/db/hsqldb/schema.sql similarity index 100% rename from src/main/resources/db/hsqldb/schema.sql rename to springboot-petclinic-server/src/main/resources/db/hsqldb/schema.sql diff --git a/src/main/resources/db/mysql/data.sql b/springboot-petclinic-server/src/main/resources/db/mysql/data.sql similarity index 100% rename from src/main/resources/db/mysql/data.sql rename to springboot-petclinic-server/src/main/resources/db/mysql/data.sql diff --git a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt b/springboot-petclinic-server/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 springboot-petclinic-server/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt diff --git a/src/main/resources/db/mysql/schema.sql b/springboot-petclinic-server/src/main/resources/db/mysql/schema.sql similarity index 100% rename from src/main/resources/db/mysql/schema.sql rename to springboot-petclinic-server/src/main/resources/db/mysql/schema.sql diff --git a/src/main/resources/db_readme.txt b/springboot-petclinic-server/src/main/resources/db_readme.txt similarity index 100% rename from src/main/resources/db_readme.txt rename to springboot-petclinic-server/src/main/resources/db_readme.txt diff --git a/src/main/resources/messages/messages.properties b/springboot-petclinic-server/src/main/resources/messages/messages.properties similarity index 100% rename from src/main/resources/messages/messages.properties rename to springboot-petclinic-server/src/main/resources/messages/messages.properties diff --git a/src/main/resources/messages/messages_de.properties b/springboot-petclinic-server/src/main/resources/messages/messages_de.properties similarity index 100% rename from src/main/resources/messages/messages_de.properties rename to springboot-petclinic-server/src/main/resources/messages/messages_de.properties diff --git a/src/main/resources/messages/messages_en.properties b/springboot-petclinic-server/src/main/resources/messages/messages_en.properties similarity index 100% rename from src/main/resources/messages/messages_en.properties rename to springboot-petclinic-server/src/main/resources/messages/messages_en.properties diff --git a/src/main/resources/static/css/petclinic.css b/springboot-petclinic-server/src/main/resources/static/css/petclinic.css similarity index 100% rename from src/main/resources/static/css/petclinic.css rename to springboot-petclinic-server/src/main/resources/static/css/petclinic.css diff --git a/src/main/resources/static/fonts/montserrat-webfont.eot b/springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.eot similarity index 100% rename from src/main/resources/static/fonts/montserrat-webfont.eot rename to springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.eot diff --git a/src/main/resources/static/fonts/montserrat-webfont.svg b/springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.svg similarity index 100% rename from src/main/resources/static/fonts/montserrat-webfont.svg rename to springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.svg diff --git a/src/main/resources/static/fonts/montserrat-webfont.ttf b/springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.ttf similarity index 100% rename from src/main/resources/static/fonts/montserrat-webfont.ttf rename to springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.ttf diff --git a/src/main/resources/static/fonts/montserrat-webfont.woff b/springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.woff similarity index 100% rename from src/main/resources/static/fonts/montserrat-webfont.woff rename to springboot-petclinic-server/src/main/resources/static/fonts/montserrat-webfont.woff diff --git a/src/main/resources/static/fonts/varela_round-webfont.eot b/springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.eot similarity index 100% rename from src/main/resources/static/fonts/varela_round-webfont.eot rename to springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.eot diff --git a/src/main/resources/static/fonts/varela_round-webfont.svg b/springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.svg similarity index 100% rename from src/main/resources/static/fonts/varela_round-webfont.svg rename to springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.svg diff --git a/src/main/resources/static/fonts/varela_round-webfont.ttf b/springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.ttf similarity index 100% rename from src/main/resources/static/fonts/varela_round-webfont.ttf rename to springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.ttf diff --git a/src/main/resources/static/fonts/varela_round-webfont.woff b/springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.woff similarity index 100% rename from src/main/resources/static/fonts/varela_round-webfont.woff rename to springboot-petclinic-server/src/main/resources/static/fonts/varela_round-webfont.woff diff --git a/src/main/resources/static/images/favicon.png b/springboot-petclinic-server/src/main/resources/static/images/favicon.png similarity index 100% rename from src/main/resources/static/images/favicon.png rename to springboot-petclinic-server/src/main/resources/static/images/favicon.png diff --git a/src/main/resources/static/images/pets.png b/springboot-petclinic-server/src/main/resources/static/images/pets.png similarity index 100% rename from src/main/resources/static/images/pets.png rename to springboot-petclinic-server/src/main/resources/static/images/pets.png diff --git a/src/main/resources/static/images/platform-bg.png b/springboot-petclinic-server/src/main/resources/static/images/platform-bg.png similarity index 100% rename from src/main/resources/static/images/platform-bg.png rename to springboot-petclinic-server/src/main/resources/static/images/platform-bg.png diff --git a/src/main/resources/static/images/spring-logo-dataflow-mobile.png b/springboot-petclinic-server/src/main/resources/static/images/spring-logo-dataflow-mobile.png similarity index 100% rename from src/main/resources/static/images/spring-logo-dataflow-mobile.png rename to springboot-petclinic-server/src/main/resources/static/images/spring-logo-dataflow-mobile.png diff --git a/src/main/resources/static/images/spring-logo-dataflow.png b/springboot-petclinic-server/src/main/resources/static/images/spring-logo-dataflow.png similarity index 100% rename from src/main/resources/static/images/spring-logo-dataflow.png rename to springboot-petclinic-server/src/main/resources/static/images/spring-logo-dataflow.png diff --git a/src/main/resources/static/images/spring-pivotal-logo.png b/springboot-petclinic-server/src/main/resources/static/images/spring-pivotal-logo.png similarity index 100% rename from src/main/resources/static/images/spring-pivotal-logo.png rename to springboot-petclinic-server/src/main/resources/static/images/spring-pivotal-logo.png diff --git a/src/main/resources/static/scripts/app.js b/springboot-petclinic-server/src/main/resources/static/scripts/app.js similarity index 100% rename from src/main/resources/static/scripts/app.js rename to springboot-petclinic-server/src/main/resources/static/scripts/app.js diff --git a/src/main/resources/static/scripts/fragments/footer.html b/springboot-petclinic-server/src/main/resources/static/scripts/fragments/footer.html similarity index 100% rename from src/main/resources/static/scripts/fragments/footer.html rename to springboot-petclinic-server/src/main/resources/static/scripts/fragments/footer.html diff --git a/src/main/resources/static/scripts/fragments/nav.html b/springboot-petclinic-server/src/main/resources/static/scripts/fragments/nav.html similarity index 100% rename from src/main/resources/static/scripts/fragments/nav.html rename to springboot-petclinic-server/src/main/resources/static/scripts/fragments/nav.html diff --git a/src/main/resources/static/scripts/fragments/welcome.html b/springboot-petclinic-server/src/main/resources/static/scripts/fragments/welcome.html similarity index 100% rename from src/main/resources/static/scripts/fragments/welcome.html rename to springboot-petclinic-server/src/main/resources/static/scripts/fragments/welcome.html diff --git a/src/main/resources/static/scripts/owner-details/owner-details.component.js b/springboot-petclinic-server/src/main/resources/static/scripts/owner-details/owner-details.component.js similarity index 100% rename from src/main/resources/static/scripts/owner-details/owner-details.component.js rename to springboot-petclinic-server/src/main/resources/static/scripts/owner-details/owner-details.component.js diff --git a/src/main/resources/static/scripts/owner-details/owner-details.template.html b/springboot-petclinic-server/src/main/resources/static/scripts/owner-details/owner-details.template.html similarity index 100% rename from src/main/resources/static/scripts/owner-details/owner-details.template.html rename to springboot-petclinic-server/src/main/resources/static/scripts/owner-details/owner-details.template.html diff --git a/src/main/resources/static/scripts/owner-form/owner-form.component.js b/springboot-petclinic-server/src/main/resources/static/scripts/owner-form/owner-form.component.js similarity index 100% rename from src/main/resources/static/scripts/owner-form/owner-form.component.js rename to springboot-petclinic-server/src/main/resources/static/scripts/owner-form/owner-form.component.js diff --git a/src/main/resources/static/scripts/owner-form/owner-form.template.html b/springboot-petclinic-server/src/main/resources/static/scripts/owner-form/owner-form.template.html similarity index 100% rename from src/main/resources/static/scripts/owner-form/owner-form.template.html rename to springboot-petclinic-server/src/main/resources/static/scripts/owner-form/owner-form.template.html diff --git a/src/main/resources/static/scripts/owner-list/owner-list.component.js b/springboot-petclinic-server/src/main/resources/static/scripts/owner-list/owner-list.component.js similarity index 100% rename from src/main/resources/static/scripts/owner-list/owner-list.component.js rename to springboot-petclinic-server/src/main/resources/static/scripts/owner-list/owner-list.component.js diff --git a/src/main/resources/static/scripts/owner-list/owner-list.template.html b/springboot-petclinic-server/src/main/resources/static/scripts/owner-list/owner-list.template.html similarity index 100% rename from src/main/resources/static/scripts/owner-list/owner-list.template.html rename to springboot-petclinic-server/src/main/resources/static/scripts/owner-list/owner-list.template.html diff --git a/src/main/resources/static/scripts/pet-form/pet-form.component.js b/springboot-petclinic-server/src/main/resources/static/scripts/pet-form/pet-form.component.js similarity index 100% rename from src/main/resources/static/scripts/pet-form/pet-form.component.js rename to springboot-petclinic-server/src/main/resources/static/scripts/pet-form/pet-form.component.js diff --git a/src/main/resources/static/scripts/pet-form/pet-form.template.html b/springboot-petclinic-server/src/main/resources/static/scripts/pet-form/pet-form.template.html similarity index 100% rename from src/main/resources/static/scripts/pet-form/pet-form.template.html rename to springboot-petclinic-server/src/main/resources/static/scripts/pet-form/pet-form.template.html diff --git a/src/main/resources/static/scripts/vet-list/vet-list.component.js b/springboot-petclinic-server/src/main/resources/static/scripts/vet-list/vet-list.component.js similarity index 100% rename from src/main/resources/static/scripts/vet-list/vet-list.component.js rename to springboot-petclinic-server/src/main/resources/static/scripts/vet-list/vet-list.component.js diff --git a/src/main/resources/static/scripts/vet-list/vet-list.template.html b/springboot-petclinic-server/src/main/resources/static/scripts/vet-list/vet-list.template.html similarity index 100% rename from src/main/resources/static/scripts/vet-list/vet-list.template.html rename to springboot-petclinic-server/src/main/resources/static/scripts/vet-list/vet-list.template.html diff --git a/src/main/resources/static/scripts/visits/visits.component.js b/springboot-petclinic-server/src/main/resources/static/scripts/visits/visits.component.js similarity index 100% rename from src/main/resources/static/scripts/visits/visits.component.js rename to springboot-petclinic-server/src/main/resources/static/scripts/visits/visits.component.js diff --git a/src/main/resources/static/scripts/visits/visits.template.html b/springboot-petclinic-server/src/main/resources/static/scripts/visits/visits.template.html similarity index 100% rename from src/main/resources/static/scripts/visits/visits.template.html rename to springboot-petclinic-server/src/main/resources/static/scripts/visits/visits.template.html diff --git a/springboot-petclinic-server/src/main/resources/templates/index.html b/springboot-petclinic-server/src/main/resources/templates/index.html new file mode 100644 index 000000000..3a81d4020 --- /dev/null +++ b/springboot-petclinic-server/src/main/resources/templates/index.html @@ -0,0 +1,37 @@ + + + + + + + PetClinic :: a Spring Framework demonstration + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ + + + diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java b/springboot-petclinic-server/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 springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/service/AbstractClinicServiceTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java rename to springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java diff --git a/src/test/java/org/springframework/samples/petclinic/web/PetResourceTests.java b/springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/web/PetResourceTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/web/PetResourceTests.java rename to springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/web/PetResourceTests.java diff --git a/src/test/java/org/springframework/samples/petclinic/web/VetResourceTests.java b/springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/web/VetResourceTests.java similarity index 100% rename from src/test/java/org/springframework/samples/petclinic/web/VetResourceTests.java rename to springboot-petclinic-server/src/test/java/org/springframework/samples/petclinic/web/VetResourceTests.java diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html deleted file mode 100644 index 54a2b052c..000000000 --- a/src/main/resources/templates/index.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - PetClinic :: a Spring Framework demonstration - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- - - -