Commit graph

961 commits

Author SHA1 Message Date
Antoine Rey
b96e1093d3 Add a Dockefile and configure the docker-maven-plugin 2016-08-29 18:47:47 +02:00
Antoine Rey
864580702f Remove unused properties 2016-08-23 19:45:00 +02:00
Antoine Rey
89d0e24488 Merge branch 'master' into springboot
Conflicts:
	pom.xml
	readme.md
	src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImpl.java
	src/main/java/org/springframework/samples/petclinic/web/VetController.java
	src/test/java/org/springframework/samples/petclinic/web/CrashControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/OwnerControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/PetControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/VetControllerTests.java
	src/test/java/org/springframework/samples/petclinic/web/VisitControllerTests.java
2016-08-19 18:57:51 +02:00
Antoine Rey
e5254156ec Convert Controler's integration test to unit test 2016-08-19 18:54:56 +02:00
Antoine Rey
620141da5d Convert Controler's integration test to unit test 2016-08-19 18:29:53 +02:00
Antoine Rey
1080006218 Merging AbstractClinicServiceTests and ClinicServiceSpringDataJpaTests then using the Spring Boot @DataJpaTest annotation 2016-08-19 18:29:17 +02:00
Antoine Rey
2637f65b90 Upgrade to Spring Boot 1.4.0 2016-08-17 18:31:38 +02:00
AndrejGajdos
dbd1e54492 responsive menu fix
responsive menu fix - data-target attribute added
2016-08-16 19:09:35 +02:00
Antoine Rey
0adaea9efa Upgrade to Spring IO Platform to 2.0.7 2016-08-16 19:09:09 +02:00
Antoine Rey
84d5e8270d Merge pull request #177 from AndrejGajdos/master
Responsive menu fix
2016-08-10 18:15:40 +02:00
Antoine Rey
ef4a808828 Fix #172 'mvn site' fails with cobertura-maven-plugin version 2.7 2016-08-10 18:08:34 +02:00
Antoine Rey
eac43666b3 Merge pull request #175 from meltsufin/master
Use build finalName instead of warName in pom.xml
2016-08-09 15:50:22 +02:00
AndrejGajdos
fa466855ef responsive menu fix
responsive menu fix - data-target attribute added
2016-07-28 13:50:07 +02:00
Mike Eltsufin
ed0ab2af41 Use build finalName instead of warName in pom.xml 2016-07-22 11:31:12 -04:00
Antoine Rey
eddc72cfa8 Upgrade Spring IO Platform to 2.0.6 2016-07-09 12:06:26 +02:00
Antoine Rey
d77f31c96e Fix Jetty 9 startup 2016-07-06 19:00:32 +02:00
Antoine Rey
2f3e035c60 The maven-war-plugin does not failed on missing web.xml 2016-07-06 18:18:40 +02:00
Antoine Rey
1a6572d1ac Replace web.xml by PetclinicInitializer 2016-07-06 18:04:23 +02:00
Antoine Rey
835f53da30 Remove spring-boot dependencies 2016-07-05 18:28:09 +02:00
Antoine Rey
515f8d99fd Fix jQuery version 2016-06-30 20:02:53 +02:00
Antoine Rey
bbc1c8bb80 Add some missing trimDirectiveWhitespaces on JSPs 2016-06-30 19:07:54 +02:00
Antoine Rey
30fbe76c7d A few fixes to the readme.md for Spring-Boot branch
Merge pull request #169 from aaguilera/springboot
2016-06-29 18:13:06 +02:00
Angel Aguilera
b3080ccb2b Updated instructions to switch into springboot branch 2016-06-29 09:42:21 +02:00
Angel Aguilera
c39ed81904 Fixed typo 2016-06-29 09:39:56 +02:00
Antoine Rey
1e412c6020 Add some missing trimDirectiveWhitespaces on JSPs 2016-06-29 08:46:56 +02:00
Antoine Rey
616386803c Revert "Make jar not war"
This reverts commit be048ae2ac.
2016-06-28 20:08:26 +02:00
Antoine Rey
be048ae2ac Make jar not war 2016-06-28 20:01:32 +02:00
Antoine Rey
fd524d05d5 Centralized framework versions to the properties section 2016-06-28 19:52:59 +02:00
Antoine Rey
7b488c6846 Merge pull request #163 from ameya-pandilwar/fix-157
Fix  #157 Upgrade Spring IO Platform to 2.0.5
2016-06-28 19:44:07 +02:00
Antoine Rey
6be7ec558e Add the generated/ directory for easier switching between master and develop branches 2016-06-28 19:41:53 +02:00
Antoine Rey
078bdc6cfb #149 JdbcPetRepositoryImpl:: findById() simplification 2016-06-28 18:47:51 +02:00
Antoine Rey
9a1298be2d Merge pull request #168 from verydapeng/spring-projects/springboot
Migrate to webjars for frontend resource management
2016-06-28 18:17:51 +02:00
Dapeng
eb6f9343ad migrate to webjars for frontend resource management
- petclinic.css is now auto generated, therefore it is put in the
ignore list
- vendor folder is removed in favour of webjars
- remove several maven dependencies which are already managed by spring
boot
- unfortunately, lesscss maven plugin does NOT support importing from
classpath, as a result, bootstrap is unpacked during process-resources
phase, we need need to find a better resolution
- remove bower integration
2016-06-28 18:02:53 +08:00
Antoine Rey
4c722465d8 Update vetsXml test using xpath 2016-06-28 08:11:40 +02:00
Antoine Rey
62e4e56068 Merge pull request #167 from verydapeng/spring-projects/springboot
Simplify content negotiation setup for vets
2016-06-28 08:01:46 +02:00
Dapeng
077f4eb105 simplify content negotiation setup
- remove custom xml view, use springboot builtin xml view
- remove oxm maven dependency
- remove json-simple maven dependency (seems not relevant anymore)
- update vetsXml test using xpath
2016-06-28 11:05:42 +08:00
Antoine Rey
647985cdaf Add a reference to the Spring Boot branch 2016-06-27 17:57:03 +02:00
Dapeng
a2849f75f2 Simplify jsp layout management
abstract the page layout into “layout.tag”
2016-06-27 17:32:09 +02:00
Antoine Rey
52ea74489d Merge pull request #166 from verydapeng/spring-projects/springboot
Simplify jsp layout management
2016-06-27 17:19:34 +02:00
Dapeng
aa8cc431eb simplify jsp layout management
abstract the page layout into “layout.tag”
2016-06-27 17:06:47 +08:00
Antoine Rey
415d78b3f3 #164 Update readme.md with Spring Boot configuration 2016-06-27 08:48:19 +02:00
Antoine Rey
805cadc855 Merge pull request #165 from verydapeng/spring-projects/springboot
Support switching db init script at deployment
2016-06-27 08:17:15 +02:00
Dapeng
beb46b2b3b support switching db init script at deployment 2016-06-27 12:35:37 +08:00
Antoine Rey
1f42b7615d #164 Set Dandelion active profile to "prod" when Spring production profile is enabled 2016-06-25 15:27:37 +02:00
Antoine Rey
50f46fdd0e Remove outdated HTML files 2016-06-24 21:22:15 +02:00
Antoine Rey
4da41dbbda #164 Disable cache configuration for unit tests 2016-06-24 21:18:38 +02:00
Antoine Rey
e9f5f7b541 #164 Add main class required by the spring-boot-maven-plugin 2016-06-23 19:46:56 +02:00
Antoine Rey
a6e81a51a0 #164 Spring Boot version of Petclinic ready to deploy to an external web container (ie Tomcat) 2016-06-23 19:42:02 +02:00
Ameya Pandilwar
be7acc5052 Upgrade Spring IO Platform to 2.0.5 2016-06-19 02:23:53 -04:00
Antoine Rey
76a4ca330b Merge pull request #159 from attil-io/visit-repository-fix
Fix #158 Improvements in VisitRepository.findByPetId implementation.
2016-06-16 18:59:29 +02:00