diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index ad1079926..000000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "src/main/webapp/bower_components" -} diff --git a/.springBeans b/.springBeans deleted file mode 100644 index 44f18becd..000000000 --- a/.springBeans +++ /dev/null @@ -1,20 +0,0 @@ - - - 1 - - - - - - - src/main/resources/spring/datasource-config.xml - src/main/resources/spring/mvc-core-config.xml - src/main/resources/spring/mvc-view-config.xml - src/main/resources/spring/business-config.xml - - - src/main/resources/spring/tools-config.xml - - - - diff --git a/bower.json b/bower.json deleted file mode 100644 index 38fce5b10..000000000 --- a/bower.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "petclinic-angular", - "version": "0.0.0", - "appPath": "src/main/webapp", - - "dependencies": { - "bootstrap": "2.3.0", - "jquery": "2.1.3", - "json3": "3.3.2", - "angular": "1.3.11", - "angular-ui-router": "0.2.15", - "angular-resource": "1.3.11" - }, - "devDependencies": { - "angular-mocks": "1.3.11", - "angular-scenario": "1.3.11" - }, - "resolutions": { - "angular": "1.3.11", - "angular-cookies": "1.3.11", - "jquery": "2.1.3" - } -} diff --git a/pom.xml b/pom.xml index 77e17b50a..0d9dcca9a 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,10 @@ petclinic war + + 1.8 + + org.springframework.boot @@ -91,6 +95,7 @@ + petclinic org.springframework.boot diff --git a/readme.md b/readme.md index 039eaff2f..5911e2764 100644 --- a/readme.md +++ b/readme.md @@ -7,189 +7,12 @@ ## Running petclinic locally ``` git clone https://github.com/spring-projects/spring-petclinic.git - mvn tomcat7:run + mvn spring-boot:run ``` -You can then access petclinic here: http://localhost:9966/petclinic/ +You can then access petclinic here: http://localhost:8080 ## In case you find a bug/suggested improvement for Spring Petclinic Our issue tracker is available here: https://github.com/spring-projects/spring-petclinic/issues -## Working with Petclinic in Eclipse/STS - -### prerequisites -The following items should be installed in your system: -* Maven 3 (http://www.sonatype.com/books/mvnref-book/reference/installation.html) -* git command line tool (https://help.github.com/articles/set-up-git) -* Eclipse with the m2e plugin (m2e is installed by default when using the STS (http://www.springsource.org/sts) distribution of Eclipse) - -Note: when m2e is available, there is an m2 icon in Help -> About dialog. -If m2e is not there, just follow the install process here: http://eclipse.org/m2e/download/ - - -### Steps: - -1) In the command line -``` -git clone https://github.com/spring-projects/spring-petclinic.git -``` -2) Inside Eclipse -``` -File -> Import -> Maven -> Existing Maven project -``` - - -## Looking for something in particular? - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Java Config
Java Config branch - Petclinic uses XML configuration by default. In case you'd like to use Java Config instead, there is a Java Config branch available here. Thanks to Antoine Rey for his contribution. -
Inside the 'Web' layerFiles
Spring MVC - XML integrationmvc-view-config.xml
Spring MVC - ContentNegotiatingViewResolvermvc-view-config.xml
JSP custom tags - WEB-INF/tags - createOrUpdateOwnerForm.jsp
webjars - webjars declaration inside pom.xml
- Resource mapping in Spring configuration
- sample usage in JSP
Dandelion-datatables - ownersList.jsp - vetList.jsp - web.xml - datatables.properties -
Thymeleaf branch - See here
Branch using GemFire and Spring Data GemFire instead of ehcache (thanks Bijoy Choudhury) - See here
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
'Service' and 'Repository' layersFiles
Transactions - business-config.xml - ClinicServiceImpl.java -
Cache - tools-config.xml - ClinicServiceImpl.java -
Bean Profiles - business-config.xml - ClinicServiceJdbcTests.java - web.xml -
JdbcTemplate - business-config.xml - jdbc folder
JPA - business-config.xml - jpa folder
Spring Data JPA - business-config.xml - springdatajpa folder
- - - - - - - - - -
OthersFiles
Gradle branch - See here
- - -## Interaction with other open source projects - -One of the best parts about working on the Spring Petclinic application is that we have the opportunity to work in direct contact with many Open Source projects. We found some bugs/suggested improvements on various topics such as Spring, Spring Data, Bean Validation and even Eclipse! In many cases, they've been fixed/implemented in just a few days. -Here is a list of them: - - - - - - - - - - - - - - - - - - - - - - - -
Name Issue
Spring JDBC: simplify usage of NamedParameterJdbcTemplate SPR-10256 and SPR-10257
Bean Validation / Hibernate Validator: simplify Maven dependencies and backward compatibility - HV-790 and HV-792 -
Spring Data: provide more flexibility when working with JPQL queries - DATAJPA-292 -
Eclipse: validation bug when working with .tag/.tagx files (has only been fixed for Eclipse 4.3 (Kepler)). See here for more details. - STS-3294 -
- - -