From b963906bd1f2f397b715e2a8710358aeae1ed931 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 14 Dec 2009 15:51:33 +0000 Subject: [PATCH] SPR-6447 + moved petclinic to spring-samples (https://src.springframework.org/svn/spring-samples/petclinic) --- .../.classpath | 43 - .../.project | 36 - .../.settings/.jsdtscope | 11 - .../com.springsource.server.ide.jdt.core.xml | 2 - .../.settings/org.eclipse.jdt.core.prefs | 12 - ...clipse.jst.common.project.facet.core.prefs | 3 - .../.settings/org.eclipse.jst.jsp.core.prefs | 29 - .../org.eclipse.wst.common.component | 13 - ....eclipse.wst.common.project.facet.core.xml | 7 - .../.settings/org.eclipse.wst.html.core.prefs | 37 - ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - .../build.xml | 6 - .../db/build.xml | 85 -- .../db/dropTables.txt | 7 - .../db/emptyDB.txt | 7 - .../db/mysql/createDB.txt | 3 - .../db/mysql/dropDB.txt | 1 - .../db/mysql/initDB.txt | 58 - .../db/mysql/petclinic_db_setup_mysql.txt | 22 - .../db/mysql/petclinic_tomcat_mysql.xml | 64 - .../db/petclinic_tomcat_all.xml | 112 -- .../db/populateDB.txt | 53 - org.springframework.samples.petclinic/ivy.xml | 55 - .../petclinic.iml | 211 --- .../readme.txt | 105 -- .../samples/petclinic/BaseEntity.java | 27 - .../samples/petclinic/Clinic.java | 82 -- .../samples/petclinic/NamedEntity.java | 28 - .../samples/petclinic/Owner.java | 127 -- .../samples/petclinic/Person.java | 32 - .../samples/petclinic/Pet.java | 77 -- .../samples/petclinic/PetType.java | 8 - .../samples/petclinic/Specialty.java | 10 - .../samples/petclinic/Vet.java | 52 - .../samples/petclinic/Vets.java | 43 - .../samples/petclinic/Visit.java | 70 - .../aspects/AbstractTraceAspect.java | 31 - .../aspects/CallMonitoringAspect.java | 81 -- .../petclinic/aspects/UsageLogAspect.java | 48 - .../config/DbcpDataSourceFactory.java | 261 ---- .../petclinic/hibernate/HibernateClinic.java | 98 -- .../petclinic/hibernate/package-info.java | 9 - .../samples/petclinic/jdbc/JdbcPet.java | 35 - .../petclinic/jdbc/SimpleJdbcClinic.java | 342 ----- .../petclinic/jdbc/SimpleJdbcClinicMBean.java | 20 - .../samples/petclinic/jdbc/package-info.java | 9 - .../petclinic/jpa/EntityManagerClinic.java | 96 -- .../samples/petclinic/jpa/package-info.java | 9 - .../samples/petclinic/package-info.java | 8 - ...entialsHSQLPlatformWithNativeSequence.java | 56 - .../petclinic/toplink/package-info.java | 10 - .../samples/petclinic/util/EntityUtils.java | 41 - .../petclinic/validation/OwnerValidator.java | 43 - .../petclinic/validation/PetValidator.java | 25 - .../petclinic/validation/VisitValidator.java | 21 - .../petclinic/validation/package-info.java | 9 - .../samples/petclinic/web/AddOwnerForm.java | 65 - .../samples/petclinic/web/AddPetForm.java | 77 -- .../samples/petclinic/web/AddVisitForm.java | 69 - .../web/ClinicBindingInitializer.java | 37 - .../petclinic/web/ClinicController.java | 89 -- .../samples/petclinic/web/EditOwnerForm.java | 65 - .../samples/petclinic/web/EditPetForm.java | 80 -- .../samples/petclinic/web/FindOwnersForm.java | 74 -- .../samples/petclinic/web/PetTypeEditor.java | 30 - .../samples/petclinic/web/VisitsAtomView.java | 82 -- .../samples/petclinic/web/package-info.java | 8 - .../src/main/java/overview.html | 7 - .../src/main/resources/META-INF/aop.xml | 18 - .../resources/META-INF/hsqldb/dropTables.txt | 7 - .../main/resources/META-INF/hsqldb/initDB.txt | 55 - .../resources/META-INF/hsqldb/populateDB.txt | 53 - .../src/main/resources/META-INF/orm.xml | 122 -- .../main/resources/META-INF/persistence.xml | 16 - .../src/main/resources/jdbc.properties | 63 - .../src/main/resources/log4j.properties | 18 - .../src/main/resources/messages.properties | 8 - .../src/main/resources/messages_de.properties | 8 - .../src/main/resources/messages_en.properties | 1 - .../src/main/resources/petclinic.hbm.xml | 74 -- .../src/main/webapp/META-INF/context.xml | 7 - .../WEB-INF/applicationContext-hibernate.xml | 89 -- .../WEB-INF/applicationContext-jdbc.xml | 85 -- .../webapp/WEB-INF/applicationContext-jpa.xml | 101 -- .../webapp/WEB-INF/classes/log4j.properties | 18 - .../WEB-INF/classes/messages.properties | 8 - .../WEB-INF/classes/messages_de.properties | 8 - .../WEB-INF/classes/messages_en.properties | 1 - .../src/main/webapp/WEB-INF/geronimo-web.xml | 6 - .../webapp/WEB-INF/jsp/dataAccessFailure.jsp | 19 - .../src/main/webapp/WEB-INF/jsp/footer.jsp | 12 - .../src/main/webapp/WEB-INF/jsp/header.jsp | 14 - .../src/main/webapp/WEB-INF/jsp/includes.jsp | 5 - .../main/webapp/WEB-INF/jsp/owners/form.jsp | 61 - .../main/webapp/WEB-INF/jsp/owners/list.jsp | 34 - .../main/webapp/WEB-INF/jsp/owners/search.jsp | 26 - .../main/webapp/WEB-INF/jsp/owners/show.jsp | 108 -- .../src/main/webapp/WEB-INF/jsp/pets/form.jsp | 56 - .../webapp/WEB-INF/jsp/pets/visitForm.jsp | 68 - .../webapp/WEB-INF/jsp/uncaughtException.jsp | 49 - .../src/main/webapp/WEB-INF/jsp/vets.jsp | 31 - .../src/main/webapp/WEB-INF/jsp/welcome.jsp | 15 - .../main/webapp/WEB-INF/petclinic-servlet.xml | 110 -- .../src/main/webapp/WEB-INF/web.xml | 161 --- .../src/main/webapp/html/tutorial.html | 1149 ----------------- .../src/main/webapp/images/banner-graphic.png | Bin 13773 -> 0 bytes .../src/main/webapp/images/bullet-arrow.png | Bin 2954 -> 0 bytes .../src/main/webapp/images/pets.png | Bin 55318 -> 0 bytes .../main/webapp/images/springsource-logo.png | Bin 4974 -> 0 bytes .../src/main/webapp/images/submit-bg.png | Bin 2820 -> 0 bytes .../src/main/webapp/styles/petclinic.css | 234 ---- .../petclinic/AbstractClinicTests.java | 224 ---- .../samples/petclinic/OwnerTests.java | 27 - .../samples/petclinic/PetClinicTestSuite.java | 29 - .../hibernate/HibernateClinicTests.java | 20 - .../petclinic/jdbc/SimpleJdbcClinicTests.java | 19 - .../petclinic/jpa/AbstractJpaClinicTests.java | 199 --- .../jpa/EntityManagerClinicTests.java | 51 - .../HibernateEntityManagerClinicTests.java | 26 - .../jpa/OpenJpaEntityManagerClinicTests.java | 27 - .../petclinic/web/VisitsAtomViewTest.java | 90 -- .../src/test/resources/log4j.xml | 28 - .../petclinic/AbstractClinicTests-context.xml | 22 - .../HibernateClinicTests-context.xml | 32 - .../jdbc/SimpleJdbcClinicTests-context.xml | 11 - .../jpa/applicationContext-entityManager.xml | 16 - .../applicationContext-hibernateAdapter.xml | 9 - .../jpa/applicationContext-jpaCommon.xml | 31 - .../jpa/applicationContext-openJpaAdapter.xml | 9 - .../jpa/applicationContext-toplinkAdapter.xml | 9 - 131 files changed, 7272 deletions(-) delete mode 100644 org.springframework.samples.petclinic/.classpath delete mode 100644 org.springframework.samples.petclinic/.project delete mode 100644 org.springframework.samples.petclinic/.settings/.jsdtscope delete mode 100644 org.springframework.samples.petclinic/.settings/com.springsource.server.ide.jdt.core.xml delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.jdt.core.prefs delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.jst.common.project.facet.core.prefs delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.jst.jsp.core.prefs delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.component delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.wst.html.core.prefs delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 org.springframework.samples.petclinic/build.xml delete mode 100644 org.springframework.samples.petclinic/db/build.xml delete mode 100644 org.springframework.samples.petclinic/db/dropTables.txt delete mode 100644 org.springframework.samples.petclinic/db/emptyDB.txt delete mode 100644 org.springframework.samples.petclinic/db/mysql/createDB.txt delete mode 100644 org.springframework.samples.petclinic/db/mysql/dropDB.txt delete mode 100644 org.springframework.samples.petclinic/db/mysql/initDB.txt delete mode 100644 org.springframework.samples.petclinic/db/mysql/petclinic_db_setup_mysql.txt delete mode 100644 org.springframework.samples.petclinic/db/mysql/petclinic_tomcat_mysql.xml delete mode 100644 org.springframework.samples.petclinic/db/petclinic_tomcat_all.xml delete mode 100644 org.springframework.samples.petclinic/db/populateDB.txt delete mode 100644 org.springframework.samples.petclinic/ivy.xml delete mode 100644 org.springframework.samples.petclinic/petclinic.iml delete mode 100644 org.springframework.samples.petclinic/readme.txt delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/BaseEntity.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Clinic.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/NamedEntity.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Owner.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Person.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Pet.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/PetType.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Specialty.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vet.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vets.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Visit.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/UsageLogAspect.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/config/DbcpDataSourceFactory.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/JdbcPet.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicMBean.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/EssentialsHSQLPlatformWithNativeSequence.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/OwnerValidator.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/PetValidator.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/VisitValidator.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicBindingInitializer.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/PetTypeEditor.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitsAtomView.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/package-info.java delete mode 100644 org.springframework.samples.petclinic/src/main/java/overview.html delete mode 100644 org.springframework.samples.petclinic/src/main/resources/META-INF/aop.xml delete mode 100644 org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/dropTables.txt delete mode 100644 org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/initDB.txt delete mode 100644 org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/populateDB.txt delete mode 100644 org.springframework.samples.petclinic/src/main/resources/META-INF/orm.xml delete mode 100644 org.springframework.samples.petclinic/src/main/resources/META-INF/persistence.xml delete mode 100644 org.springframework.samples.petclinic/src/main/resources/jdbc.properties delete mode 100644 org.springframework.samples.petclinic/src/main/resources/log4j.properties delete mode 100644 org.springframework.samples.petclinic/src/main/resources/messages.properties delete mode 100644 org.springframework.samples.petclinic/src/main/resources/messages_de.properties delete mode 100644 org.springframework.samples.petclinic/src/main/resources/messages_en.properties delete mode 100644 org.springframework.samples.petclinic/src/main/resources/petclinic.hbm.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/META-INF/context.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-hibernate.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jdbc.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jpa.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/log4j.properties delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages.properties delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_de.properties delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_en.properties delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/geronimo-web.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/includes.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/form.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/list.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/search.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/show.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/form.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/vets.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/images/bullet-arrow.png delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/images/pets.png delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/images/submit-bg.png delete mode 100644 org.springframework.samples.petclinic/src/main/webapp/styles/petclinic.css delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/AbstractClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/OwnerTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/PetClinicTestSuite.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/OpenJpaEntityManagerClinicTests.java delete mode 100644 org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java delete mode 100644 org.springframework.samples.petclinic/src/test/resources/log4j.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/AbstractClinicTests-context.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests-context.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-entityManager.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-hibernateAdapter.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-jpaCommon.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml delete mode 100644 org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml diff --git a/org.springframework.samples.petclinic/.classpath b/org.springframework.samples.petclinic/.classpath deleted file mode 100644 index b60cdffa6b5..00000000000 --- a/org.springframework.samples.petclinic/.classpath +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/.project b/org.springframework.samples.petclinic/.project deleted file mode 100644 index a13e65aab77..00000000000 --- a/org.springframework.samples.petclinic/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - org.springframework.samples.petclinic - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/org.springframework.samples.petclinic/.settings/.jsdtscope b/org.springframework.samples.petclinic/.settings/.jsdtscope deleted file mode 100644 index bbb8e68be8f..00000000000 --- a/org.springframework.samples.petclinic/.settings/.jsdtscope +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/.settings/com.springsource.server.ide.jdt.core.xml b/org.springframework.samples.petclinic/.settings/com.springsource.server.ide.jdt.core.xml deleted file mode 100644 index 0a4413c52ce..00000000000 --- a/org.springframework.samples.petclinic/.settings/com.springsource.server.ide.jdt.core.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.jdt.core.prefs b/org.springframework.samples.petclinic/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 05a6a07cb3a..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Sun Oct 04 15:30:45 PDT 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.jst.common.project.facet.core.prefs b/org.springframework.samples.petclinic/.settings/org.eclipse.jst.common.project.facet.core.prefs deleted file mode 100644 index a280a863d9e..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.jst.common.project.facet.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 02 16:00:20 PST 2009 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.6/owners=jst.java\:5.0 -eclipse.preferences.version=1 diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.jst.jsp.core.prefs b/org.springframework.samples.petclinic/.settings/org.eclipse.jst.jsp.core.prefs deleted file mode 100644 index 6113940c3c3..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.jst.jsp.core.prefs +++ /dev/null @@ -1,29 +0,0 @@ -#Mon Mar 02 16:00:20 PST 2009 -eclipse.preferences.version=1 -validateFragments=false -validation.actions-missing-required-attribute=1 -validation.actions-non-empty-inline-tag=2 -validation.actions-unknown-attribute=2 -validation.directive-include-fragment-file-not-found=1 -validation.directive-include-fragment-file-not-specified=1 -validation.directive-taglib-duplicate-prefixes-different-uris=1 -validation.directive-taglib-duplicate-prefixes-same-uris=-1 -validation.directive-taglib-missing-prefix=1 -validation.directive-taglib-missing-uri-or-tagdir=1 -validation.directive-taglib-unresolvable-uri-or-tagdir=2 -validation.el-general-syntax=1 -validation.el-lexical-failure=-1 -validation.java-=-1 -validation.java-local-variable-is-never-used=-1 -validation.java-null-local-variable-reference=-1 -validation.java-potential-null-local-variable-reference=-1 -validation.java-unused-import=-1 -validation.translation-tag-class-not-found=2 -validation.translation-tei-class-not-found=2 -validation.translation-tei-class-not-instantiated=2 -validation.translation-tei-class-runtime-exception=2 -validation.translation-tei-message=1 -validation.translation-usebean-ambiguous-type-info=2 -validation.translation-usebean-invalid-id=1 -validation.translation-usebean-missing-type-info=1 -validation.use-project-settings=true diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.component b/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.component deleted file mode 100644 index b24fdeedbc2..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.project.facet.core.xml b/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index c477e06156e..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.html.core.prefs b/org.springframework.samples.petclinic/.settings/org.eclipse.wst.html.core.prefs deleted file mode 100644 index e12d34f8b18..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.html.core.prefs +++ /dev/null @@ -1,37 +0,0 @@ -#Mon Mar 02 18:15:04 PST 2009 -attrDuplicate=2 -attrInvalidName=2 -attrInvalidValue=2 -attrNameMismatch=2 -attrUndefName=2 -attrUndefValue=2 -attrValueMismatch=1 -attrValueUnclosed=2 -cdataInvalidContent=2 -cdataUnclosed=1 -commentInvalidContent=2 -commentUnclosed=1 -docDoctypeUnclosed=1 -docDuplicateTag=1 -docInvalidChar=2 -docInvalidContent=2 -eclipse.preferences.version=1 -elemCoexistence=2 -elemDuplicate=2 -elemEndInvalidCase=1 -elemInvalidContent=2 -elemInvalidDirective=1 -elemInvalidEmptyTag=2 -elemInvalidName=1 -elemMissingEnd=2 -elemMissingStart=2 -elemStartInvalidCase=2 -elemUnclosedEndTag=1 -elemUnclosedStartTag=1 -elemUnknownName=2 -elemUnnecessaryEnd=2 -piInvalidContent=2 -piUnclosed=1 -piUndefined=2 -refInvalidContent=2 -use-project-settings=true diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.container b/org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4803..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.name b/org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6ec2..00000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/org.springframework.samples.petclinic/build.xml b/org.springframework.samples.petclinic/build.xml deleted file mode 100644 index 5a9d4bb381f..00000000000 --- a/org.springframework.samples.petclinic/build.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/org.springframework.samples.petclinic/db/build.xml b/org.springframework.samples.petclinic/db/build.xml deleted file mode 100644 index b6d09936b01..00000000000 --- a/org.springframework.samples.petclinic/db/build.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/db/dropTables.txt b/org.springframework.samples.petclinic/db/dropTables.txt deleted file mode 100644 index 90ae6329f90..00000000000 --- a/org.springframework.samples.petclinic/db/dropTables.txt +++ /dev/null @@ -1,7 +0,0 @@ -DROP TABLE visits; -DROP TABLE pets; -DROP TABLE owners; -DROP TABLE types; -DROP TABLE vet_specialties; -DROP TABLE specialties; -DROP TABLE vets; diff --git a/org.springframework.samples.petclinic/db/emptyDB.txt b/org.springframework.samples.petclinic/db/emptyDB.txt deleted file mode 100644 index d5dd8728c0e..00000000000 --- a/org.springframework.samples.petclinic/db/emptyDB.txt +++ /dev/null @@ -1,7 +0,0 @@ -DELETE FROM vets; -DELETE FROM specialties; -DELETE FROM vet_specialties; -DELETE FROM types; -DELETE FROM owners; -DELETE FROM pets; -DELETE FROM visits; diff --git a/org.springframework.samples.petclinic/db/mysql/createDB.txt b/org.springframework.samples.petclinic/db/mysql/createDB.txt deleted file mode 100644 index 5b4b3859e9a..00000000000 --- a/org.springframework.samples.petclinic/db/mysql/createDB.txt +++ /dev/null @@ -1,3 +0,0 @@ -CREATE DATABASE petclinic; - -GRANT ALL PRIVILEGES ON petclinic.* TO pc@localhost IDENTIFIED BY 'pc'; \ No newline at end of file diff --git a/org.springframework.samples.petclinic/db/mysql/dropDB.txt b/org.springframework.samples.petclinic/db/mysql/dropDB.txt deleted file mode 100644 index e1209da0e5e..00000000000 --- a/org.springframework.samples.petclinic/db/mysql/dropDB.txt +++ /dev/null @@ -1 +0,0 @@ -DROP DATABASE petclinic; diff --git a/org.springframework.samples.petclinic/db/mysql/initDB.txt b/org.springframework.samples.petclinic/db/mysql/initDB.txt deleted file mode 100644 index 0007ee3a339..00000000000 --- a/org.springframework.samples.petclinic/db/mysql/initDB.txt +++ /dev/null @@ -1,58 +0,0 @@ -USE petclinic; - -CREATE TABLE vets ( - id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - first_name VARCHAR(30), - last_name VARCHAR(30), - INDEX(last_name) -) engine=InnoDB; - -CREATE TABLE specialties ( - id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(80), - INDEX(name) -) engine=InnoDB; - -CREATE TABLE vet_specialties ( - vet_id INT(4) UNSIGNED NOT NULL, - specialty_id INT(4) UNSIGNED NOT NULL -) engine=InnoDB; -ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_vets FOREIGN KEY (vet_id) REFERENCES vets(id); -ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_specialties FOREIGN KEY (specialty_id) REFERENCES specialties(id); - -CREATE TABLE types ( - id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(80), - INDEX(name) -) engine=InnoDB; - -CREATE TABLE owners ( - id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - first_name VARCHAR(30), - last_name VARCHAR(30), - address VARCHAR(255), - city VARCHAR(80), - telephone VARCHAR(20), - INDEX(last_name) -) engine=InnoDB; - -CREATE TABLE pets ( - id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(30), - birth_date DATE, - type_id INT(4) UNSIGNED NOT NULL, - owner_id INT(4) UNSIGNED NOT NULL, - INDEX(name) -) engine=InnoDB; -ALTER TABLE pets ADD CONSTRAINT fk_pets_owners FOREIGN KEY (owner_id) REFERENCES owners(id); -ALTER TABLE pets ADD CONSTRAINT fk_pets_types FOREIGN KEY (type_id) REFERENCES types(id); -CREATE INDEX pets_name ON pets(name); - -CREATE TABLE visits ( - id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, - pet_id INT(4) UNSIGNED NOT NULL, - visit_date DATE, - description VARCHAR(255), - INDEX(pet_id) -) engine=InnoDB; -ALTER TABLE visits ADD CONSTRAINT fk_visits_pets FOREIGN KEY (pet_id) REFERENCES pets(id); diff --git a/org.springframework.samples.petclinic/db/mysql/petclinic_db_setup_mysql.txt b/org.springframework.samples.petclinic/db/mysql/petclinic_db_setup_mysql.txt deleted file mode 100644 index 66727e190aa..00000000000 --- a/org.springframework.samples.petclinic/db/mysql/petclinic_db_setup_mysql.txt +++ /dev/null @@ -1,22 +0,0 @@ -================================================================================ -=== Spring PetClinic sample application - MySQL Configuration === -================================================================================ - -@author Sam Brannen - --------------------------------------------------------------------------------- - -1) Download and install the MySQL database (e.g., MySQL Community Server 5.1.x), - which can be found here: http://dev.mysql.com/downloads/ - -2) Download Connector/J, the MySQL JDBC driver (e.g., Connector/J 5.1.x), which - can be found here: http://dev.mysql.com/downloads/connector/j/ - Copy the Connector/J JAR file (e.g., mysql-connector-java-5.1.5-bin.jar) into - the db/mysql directory. - -3) Create the PetClinic database and user by executing the "db/mysql/createDB.txt" - script. - -4) Open "src/main/resources/jdbc.properties"; comment out all properties in the - "HSQL Settings" section; uncomment all properties in the "MySQL Settings" - section. \ No newline at end of file diff --git a/org.springframework.samples.petclinic/db/mysql/petclinic_tomcat_mysql.xml b/org.springframework.samples.petclinic/db/mysql/petclinic_tomcat_mysql.xml deleted file mode 100644 index d1c5a3b04e3..00000000000 --- a/org.springframework.samples.petclinic/db/mysql/petclinic_tomcat_mysql.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - factory - org.apache.commons.dbcp.BasicDataSourceFactory - - - - driverClassName - org.gjt.mm.mysql.Driver - - - - url - jdbc:mysql://localhost:3306/petclinic?autoReconnect=true - - - username - pc - - - password - pc - - - - maxActive - 50 - - - maxIdle - 10 - - - maxWait - 10000 - - - removeAbandoned - true - - - removeAbandonedTimeout - 60 - - - logAbandoned - true - - - - - diff --git a/org.springframework.samples.petclinic/db/petclinic_tomcat_all.xml b/org.springframework.samples.petclinic/db/petclinic_tomcat_all.xml deleted file mode 100644 index ed45c5cd339..00000000000 --- a/org.springframework.samples.petclinic/db/petclinic_tomcat_all.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - factory - org.apache.commons.dbcp.BasicDataSourceFactory - - - - driverClassName - org.hsqldb.jdbcDriver - - - url - jdbc:hsqldb:hsql://localhost:9001 - - - username - sa - - - - maxActive - 50 - - - maxIdle - 10 - - - maxWait - 10000 - - - removeAbandoned - true - - - removeAbandonedTimeout - 60 - - - logAbandoned - true - - - - - - - - factory - org.apache.commons.dbcp.BasicDataSourceFactory - - - - driverClassName - org.gjt.mm.mysql.Driver - - - - url - jdbc:mysql://localhost:3306/petclinic?autoReconnect=true - - - username - pc - - - password - pc - - - - maxActive - 50 - - - maxIdle - 10 - - - maxWait - 10000 - - - removeAbandoned - true - - - removeAbandonedTimeout - 60 - - - logAbandoned - true - - - - - diff --git a/org.springframework.samples.petclinic/db/populateDB.txt b/org.springframework.samples.petclinic/db/populateDB.txt deleted file mode 100644 index 1bf0c4a6edb..00000000000 --- a/org.springframework.samples.petclinic/db/populateDB.txt +++ /dev/null @@ -1,53 +0,0 @@ -INSERT INTO vets VALUES (1, 'James', 'Carter'); -INSERT INTO vets VALUES (2, 'Helen', 'Leary'); -INSERT INTO vets VALUES (3, 'Linda', 'Douglas'); -INSERT INTO vets VALUES (4, 'Rafael', 'Ortega'); -INSERT INTO vets VALUES (5, 'Henry', 'Stevens'); -INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins'); - -INSERT INTO specialties VALUES (1, 'radiology'); -INSERT INTO specialties VALUES (2, 'surgery'); -INSERT INTO specialties VALUES (3, 'dentistry'); - -INSERT INTO vet_specialties VALUES (2, 1); -INSERT INTO vet_specialties VALUES (3, 2); -INSERT INTO vet_specialties VALUES (3, 3); -INSERT INTO vet_specialties VALUES (4, 2); -INSERT INTO vet_specialties VALUES (5, 1); - -INSERT INTO types VALUES (1, 'cat'); -INSERT INTO types VALUES (2, 'dog'); -INSERT INTO types VALUES (3, 'lizard'); -INSERT INTO types VALUES (4, 'snake'); -INSERT INTO types VALUES (5, 'bird'); -INSERT INTO types VALUES (6, 'hamster'); - -INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023'); -INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749'); -INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763'); -INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198'); -INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765'); -INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654'); -INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387'); -INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683'); -INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); -INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); - -INSERT INTO pets VALUES (1, 'Leo', '2000-09-07', 1, 1); -INSERT INTO pets VALUES (2, 'Basil', '2002-08-06', 6, 2); -INSERT INTO pets VALUES (3, 'Rosy', '2001-04-17', 2, 3); -INSERT INTO pets VALUES (4, 'Jewel', '2000-03-07', 2, 3); -INSERT INTO pets VALUES (5, 'Iggy', '2000-11-30', 3, 4); -INSERT INTO pets VALUES (6, 'George', '2000-01-20', 4, 5); -INSERT INTO pets VALUES (7, 'Samantha', '1995-09-04', 1, 6); -INSERT INTO pets VALUES (8, 'Max', '1995-09-04', 1, 6); -INSERT INTO pets VALUES (9, 'Lucky', '1999-08-06', 5, 7); -INSERT INTO pets VALUES (10, 'Mulligan', '1997-02-24', 2, 8); -INSERT INTO pets VALUES (11, 'Freddy', '2000-03-09', 5, 9); -INSERT INTO pets VALUES (12, 'Lucky', '2000-06-24', 2, 10); -INSERT INTO pets VALUES (13, 'Sly', '2002-06-08', 1, 10); - -INSERT INTO visits VALUES (1, 7, '1996-03-04', 'rabies shot'); -INSERT INTO visits VALUES (2, 8, '1996-03-04', 'rabies shot'); -INSERT INTO visits VALUES (3, 8, '1996-06-04', 'neutered'); -INSERT INTO visits VALUES (4, 7, '1996-09-04', 'spayed'); diff --git a/org.springframework.samples.petclinic/ivy.xml b/org.springframework.samples.petclinic/ivy.xml deleted file mode 100644 index 07676225b46..00000000000 --- a/org.springframework.samples.petclinic/ivy.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/petclinic.iml b/org.springframework.samples.petclinic/petclinic.iml deleted file mode 100644 index 134ccb6324c..00000000000 --- a/org.springframework.samples.petclinic/petclinic.iml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jar://$IVY_CACHE$/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar!/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/readme.txt b/org.springframework.samples.petclinic/readme.txt deleted file mode 100644 index aee19b7ffee..00000000000 --- a/org.springframework.samples.petclinic/readme.txt +++ /dev/null @@ -1,105 +0,0 @@ -========================================================================== -=== Spring PetClinic Sample Application -========================================================================== - -@author Ken Krebs -@author Juergen Hoeller -@author Rob Harrop -@author Costin Leau -@author Sam Brannen -@author Scott Andrews - -========================================================================== -=== Data Access Strategies -========================================================================== - -PetClinic features alternative DAO implementations and application -configurations for JDBC, Hibernate, and JPA, with HSQLDB and MySQL as -target databases. The default PetClinic configuration is JDBC on HSQLDB. -See "src/main/resources/jdbc.properties" as well as web.xml and -applicationContext-*.xml in the "src/main/webapp/WEB-INF" folder for -details. A simple comment change in web.xml switches between the data -access strategies. - -The JDBC and Hibernate versions of PetClinic also demonstrate JMX support -via the use of for exporting MBeans. -SimpleJdbcClinic exposes the SimpleJdbcClinicMBean management interface -via JMX through the use of the @ManagedResource and @ManagedOperation -annotations; whereas, the HibernateStatistics service is exposed via JMX -through auto-detection of the service MBean. You can start up the JDK's -JConsole to manage the exported bean. - -All data access strategies can work with JTA for transaction management by -activating the JtaTransactionManager and a JndiObjectFactoryBean that -refers to a transactional container DataSource. The default for JDBC is -DataSourceTransactionManager; for Hibernate, HibernateTransactionManager; -for JPA, JpaTransactionManager. Those local strategies allow for working -with any locally defined DataSource. - -Note that the sample configurations for JDBC, Hibernate, and JPA configure -a BasicDataSource from the Apache Commons DBCP project for connection -pooling. - -========================================================================== -=== Build and Deployment -========================================================================== - -The Spring PetClinic sample application is built using Spring Build, which -is a custom build solution based on Ant and Ivy for dependency management. -For deployment, the web application needs to be built with Apache Ant 1.6 -or higher. When the project is first built, Spring Build will use Ivy to -automatically download all required dependencies. Thus the initial build -may take a few minutes depending on the speed of your Internet connection, -but subsequent builds will be much faster. - -Available build commands: - -- ant clean --> cleans the project -- ant clean test --> cleans the project and runs all tests -- ant clean jar --> cleans the project and builds the WAR - -After building the project with "ant clean jar", you will find the -resulting WAR file in the "target/artifacts" directory. By default, an -embedded HSQLDB instance in configured. No other steps are necessary to -get the data source up and running: you can simply deploy the built WAR -file directly to your Servlet container. - -For MySQL, you'll need to use the corresponding schema and SQL scripts in -the "db/mysql" subdirectory. Follow the steps outlined in -"db/mysql/petclinic_db_setup_mysql.txt" for explicit details. - -In you intend to use a local DataSource, the JDBC settings can be adapted -in "src/main/resources/jdbc.properties". To use a JTA DataSource, you need -to set up corresponding DataSources in your Java EE container. - -Notes on enabling Log4J: - - Log4J is disabled by default due to issues with JBoss. - - Uncomment the Log4J listener in "WEB-INF/web.xml" to enable logging. - -========================================================================== -=== JPA on Tomcat -========================================================================== - -This section provides tips on using the Java Persistence API (JPA) on -Apache Tomcat 4.x or higher with a persistence provider that requires -class instrumentation (such as TopLink Essentials). - -To use JPA class instrumentation, Tomcat has to be instructed to use a -custom class loader which supports instrumentation. See the JPA section of -the Spring reference manual for complete details. - -The basic steps are: - - Copy "org.springframework.instrument.tomcat-3.0.0.RELEASE.jar" from the - Spring distribution to "TOMCAT_HOME/server/lib". - - If you're running on Tomcat 5.x, modify "TOMCAT_HOME/conf/server.xml" - and add a new "" element for 'petclinic' (see below). You can - alternatively deploy the WAR including "META-INF/context.xml" from this - sample application's "src/main/webapp" directory, in which case you - will need to uncomment the Loader element in that file to enable the - use of the TomcatInstrumentableClassLoader. - - - - - ... - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/BaseEntity.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/BaseEntity.java deleted file mode 100644 index bb68af4fc01..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/BaseEntity.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.springframework.samples.petclinic; - -/** - * Simple JavaBean domain object with an id property. - * Used as a base class for objects needing this property. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ -public class BaseEntity { - - private Integer id; - - - public void setId(Integer id) { - this.id = id; - } - - public Integer getId() { - return id; - } - - public boolean isNew() { - return (this.id == null); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Clinic.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Clinic.java deleted file mode 100644 index e48e8507b35..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Clinic.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.springframework.samples.petclinic; - -import java.util.Collection; - -import org.springframework.dao.DataAccessException; - -/** - * The high-level PetClinic business interface. - * - *

This is basically a data access object. - * PetClinic doesn't have a dedicated business facade. - * - * @author Ken Krebs - * @author Juergen Hoeller - * @author Sam Brannen - */ -public interface Clinic { - - /** - * Retrieve all Vets from the data store. - * @return a Collection of Vets - */ - Collection getVets() throws DataAccessException; - - /** - * Retrieve all PetTypes from the data store. - * @return a Collection of PetTypes - */ - Collection getPetTypes() throws DataAccessException; - - /** - * Retrieve Owners from the data store by last name, - * returning all owners whose last name starts with the given name. - * @param lastName Value to search for - * @return a Collection of matching Owners - * (or an empty Collection if none found) - */ - Collection findOwners(String lastName) throws DataAccessException; - - /** - * Retrieve an Owner from the data store by id. - * @param id the id to search for - * @return the Owner if found - * @throws org.springframework.dao.DataRetrievalFailureException if not found - */ - Owner loadOwner(int id) throws DataAccessException; - - /** - * Retrieve a Pet from the data store by id. - * @param id the id to search for - * @return the Pet if found - * @throws org.springframework.dao.DataRetrievalFailureException if not found - */ - Pet loadPet(int id) throws DataAccessException; - - /** - * Save an Owner to the data store, either inserting or updating it. - * @param owner the Owner to save - * @see BaseEntity#isNew - */ - void storeOwner(Owner owner) throws DataAccessException; - - /** - * Save a Pet to the data store, either inserting or updating it. - * @param pet the Pet to save - * @see BaseEntity#isNew - */ - void storePet(Pet pet) throws DataAccessException; - - /** - * Save a Visit to the data store, either inserting or updating it. - * @param visit the Visit to save - * @see BaseEntity#isNew - */ - void storeVisit(Visit visit) throws DataAccessException; - - /** - * Deletes a Pet from the data store. - */ - void deletePet(int id) throws DataAccessException; - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/NamedEntity.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/NamedEntity.java deleted file mode 100644 index 40c5931d86d..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/NamedEntity.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.springframework.samples.petclinic; - -/** - * Simple JavaBean domain object adds a name property to BaseEntity. - * Used as a base class for objects needing these properties. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ -public class NamedEntity extends BaseEntity { - - private String name; - - - public void setName(String name) { - this.name = name; - } - - public String getName() { - return this.name; - } - - @Override - public String toString() { - return this.getName(); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Owner.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Owner.java deleted file mode 100644 index 75ea3bc064c..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Owner.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.springframework.samples.petclinic; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.springframework.beans.support.MutableSortDefinition; -import org.springframework.beans.support.PropertyComparator; -import org.springframework.core.style.ToStringCreator; - -/** - * Simple JavaBean domain object representing an owner. - * - * @author Ken Krebs - * @author Juergen Hoeller - * @author Sam Brannen - */ -public class Owner extends Person { - - private String address; - - private String city; - - private String telephone; - - private Set pets; - - - public String getAddress() { - return this.address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return this.city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getTelephone() { - return this.telephone; - } - - public void setTelephone(String telephone) { - this.telephone = telephone; - } - - protected void setPetsInternal(Set pets) { - this.pets = pets; - } - - protected Set getPetsInternal() { - if (this.pets == null) { - this.pets = new HashSet(); - } - return this.pets; - } - - public List getPets() { - List sortedPets = new ArrayList(getPetsInternal()); - PropertyComparator.sort(sortedPets, new MutableSortDefinition("name", true, true)); - return Collections.unmodifiableList(sortedPets); - } - - public void addPet(Pet pet) { - getPetsInternal().add(pet); - pet.setOwner(this); - } - - /** - * Return the Pet with the given name, or null if none found for this Owner. - * - * @param name to test - * @return true if pet name is already in use - */ - public Pet getPet(String name) { - return getPet(name, false); - } - - /** - * Return the Pet with the given name, or null if none found for this Owner. - * - * @param name to test - * @return true if pet name is already in use - */ - public Pet getPet(String name, boolean ignoreNew) { - name = name.toLowerCase(); - for (Pet pet : getPetsInternal()) { - if (!ignoreNew || !pet.isNew()) { - String compName = pet.getName(); - compName = compName.toLowerCase(); - if (compName.equals(name)) { - return pet; - } - } - } - return null; - } - - @Override - public String toString() { - return new ToStringCreator(this) - - .append("id", this.getId()) - - .append("new", this.isNew()) - - .append("lastName", this.getLastName()) - - .append("firstName", this.getFirstName()) - - .append("address", this.address) - - .append("city", this.city) - - .append("telephone", this.telephone) - - .toString(); - } -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Person.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Person.java deleted file mode 100644 index da7974a7de7..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Person.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.springframework.samples.petclinic; - -/** - * Simple JavaBean domain object representing an person. - * - * @author Ken Krebs - */ -public class Person extends BaseEntity { - - private String firstName; - - private String lastName; - - public String getFirstName() { - return this.firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return this.lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Pet.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Pet.java deleted file mode 100644 index f5294b5ca9f..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Pet.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.springframework.samples.petclinic; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.springframework.beans.support.MutableSortDefinition; -import org.springframework.beans.support.PropertyComparator; - -/** - * Simple JavaBean business object representing a pet. - * - * @author Ken Krebs - * @author Juergen Hoeller - * @author Sam Brannen - */ -public class Pet extends NamedEntity { - - private Date birthDate; - - private PetType type; - - private Owner owner; - - private Set visits; - - - public void setBirthDate(Date birthDate) { - this.birthDate = birthDate; - } - - public Date getBirthDate() { - return this.birthDate; - } - - public void setType(PetType type) { - this.type = type; - } - - public PetType getType() { - return this.type; - } - - protected void setOwner(Owner owner) { - this.owner = owner; - } - - public Owner getOwner() { - return this.owner; - } - - protected void setVisitsInternal(Set visits) { - this.visits = visits; - } - - protected Set getVisitsInternal() { - if (this.visits == null) { - this.visits = new HashSet(); - } - return this.visits; - } - - public List getVisits() { - List sortedVisits = new ArrayList(getVisitsInternal()); - PropertyComparator.sort(sortedVisits, new MutableSortDefinition("date", false, false)); - return Collections.unmodifiableList(sortedVisits); - } - - public void addVisit(Visit visit) { - getVisitsInternal().add(visit); - visit.setPet(this); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/PetType.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/PetType.java deleted file mode 100644 index aaadc5c44d0..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/PetType.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.springframework.samples.petclinic; - -/** - * @author Juergen Hoeller - */ -public class PetType extends NamedEntity { - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Specialty.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Specialty.java deleted file mode 100644 index d19ccaba96e..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Specialty.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.springframework.samples.petclinic; - -/** - * Models a {@link Vet Vet's} specialty (for example, dentistry). - * - * @author Juergen Hoeller - */ -public class Specialty extends NamedEntity { - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vet.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vet.java deleted file mode 100644 index 9c7c8da0b1c..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vet.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.springframework.samples.petclinic; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import javax.xml.bind.annotation.XmlElement; - -import org.springframework.beans.support.MutableSortDefinition; -import org.springframework.beans.support.PropertyComparator; - -/** - * Simple JavaBean domain object representing a veterinarian. - * - * @author Ken Krebs - * @author Juergen Hoeller - * @author Sam Brannen - * @author Arjen Poutsma - */ -public class Vet extends Person { - - private Set specialties; - - - protected void setSpecialtiesInternal(Set specialties) { - this.specialties = specialties; - } - - protected Set getSpecialtiesInternal() { - if (this.specialties == null) { - this.specialties = new HashSet(); - } - return this.specialties; - } - - @XmlElement - public List getSpecialties() { - List sortedSpecs = new ArrayList(getSpecialtiesInternal()); - PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true)); - return Collections.unmodifiableList(sortedSpecs); - } - - public int getNrOfSpecialties() { - return getSpecialtiesInternal().size(); - } - - public void addSpecialty(Specialty specialty) { - getSpecialtiesInternal().add(specialty); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vets.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vets.java deleted file mode 100644 index 2e3b25e270a..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Vets.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.samples.petclinic; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * Simple JavaBean domain object representing a list of veterinarians. Mostly here to be used for the 'vets' - * {@link org.springframework.web.servlet.view.xml.MarshallingView}. - * - * @author Arjen Poutsma - */ -@XmlRootElement -public class Vets { - - private List vets; - - @XmlElement - public List getVetList() { - if (vets == null) { - vets = new ArrayList(); - } - return vets; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Visit.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Visit.java deleted file mode 100644 index c42bdcee5e5..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/Visit.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.springframework.samples.petclinic; - -import java.util.Date; - -/** - * Simple JavaBean domain object representing a visit. - * - * @author Ken Krebs - */ -public class Visit extends BaseEntity { - - /** Holds value of property date. */ - private Date date; - - /** Holds value of property description. */ - private String description; - - /** Holds value of property pet. */ - private Pet pet; - - - /** Creates a new instance of Visit for the current date */ - public Visit() { - this.date = new Date(); - } - - - /** Getter for property date. - * @return Value of property date. - */ - public Date getDate() { - return this.date; - } - - /** Setter for property date. - * @param date New value of property date. - */ - public void setDate(Date date) { - this.date = date; - } - - /** Getter for property description. - * @return Value of property description. - */ - public String getDescription() { - return this.description; - } - - /** Setter for property description. - * @param description New value of property description. - */ - public void setDescription(String description) { - this.description = description; - } - - /** Getter for property pet. - * @return Value of property pet. - */ - public Pet getPet() { - return this.pet; - } - - /** Setter for property pet. - * @param pet New value of property pet. - */ - public void setPet(Pet pet) { - this.pet = pet; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java deleted file mode 100644 index 26d32359fc4..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/AbstractTraceAspect.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.springframework.samples.petclinic.aspects; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; - -/** - * Aspect to illustrate Spring-driven load-time weaving. - * - * @author Ramnivas Laddad - * @since 2.5 - */ -@Aspect -public abstract class AbstractTraceAspect { - - private static final Log logger = LogFactory.getLog(AbstractTraceAspect.class); - - @Pointcut - public abstract void traced(); - - @Before("traced()") - public void trace(JoinPoint.StaticPart jpsp) { - if (logger.isTraceEnabled()) { - logger.trace("Entering " + jpsp.getSignature().toLongString()); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java deleted file mode 100644 index 2de4cb41d0a..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/CallMonitoringAspect.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.springframework.samples.petclinic.aspects; - -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; - -import org.springframework.jmx.export.annotation.ManagedAttribute; -import org.springframework.jmx.export.annotation.ManagedOperation; -import org.springframework.jmx.export.annotation.ManagedResource; -import org.springframework.util.StopWatch; - -/** - * Simple AspectJ aspect that monitors call count and call invocation time. - * Implements the CallMonitor management interface. - * - * @author Rob Harrop - * @author Juergen Hoeller - * @since 2.5 - */ -@ManagedResource("petclinic:type=CallMonitor") -@Aspect -public class CallMonitoringAspect { - - private boolean isEnabled = true; - - private int callCount = 0; - - private long accumulatedCallTime = 0; - - - @ManagedAttribute - public void setEnabled(boolean enabled) { - isEnabled = enabled; - } - - @ManagedAttribute - public boolean isEnabled() { - return isEnabled; - } - - @ManagedOperation - public void reset() { - this.callCount = 0; - this.accumulatedCallTime = 0; - } - - @ManagedAttribute - public int getCallCount() { - return callCount; - } - - @ManagedAttribute - public long getCallTime() { - return (this.callCount > 0 ? this.accumulatedCallTime / this.callCount : 0); - } - - - @Around("within(@org.springframework.stereotype.Service *)") - public Object invoke(ProceedingJoinPoint joinPoint) throws Throwable { - if (this.isEnabled) { - StopWatch sw = new StopWatch(joinPoint.toShortString()); - - sw.start("invoke"); - try { - return joinPoint.proceed(); - } - finally { - sw.stop(); - synchronized (this) { - this.callCount++; - this.accumulatedCallTime += sw.getTotalTimeMillis(); - } - } - } - - else { - return joinPoint.proceed(); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/UsageLogAspect.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/UsageLogAspect.java deleted file mode 100644 index e326abfb755..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/aspects/UsageLogAspect.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.springframework.samples.petclinic.aspects; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; - -/** - * Sample AspectJ annotation-style aspect that saves - * every owner name requested to the clinic. - * - * @author Rod Johnson - * @author Juergen Hoeller - * @since 2.0 - */ -@Aspect -public class UsageLogAspect { - - private int historySize = 100; - - // Of course saving all names is not suitable for - // production use, but this is a simple example. - private List namesRequested = new ArrayList(this.historySize); - - - public synchronized void setHistorySize(int historySize) { - this.historySize = historySize; - this.namesRequested = new ArrayList(historySize); - } - - @Before("execution(* *.findOwners(String)) && args(name)") - public synchronized void logNameRequest(String name) { - // Not the most efficient implementation, - // but we're aiming to illustrate the power of - // @AspectJ AOP, not write perfect code here :-) - if (this.namesRequested.size() > this.historySize) { - this.namesRequested.remove(0); - } - this.namesRequested.add(name); - } - - public synchronized List getNamesRequested() { - return Collections.unmodifiableList(this.namesRequested); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/config/DbcpDataSourceFactory.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/config/DbcpDataSourceFactory.java deleted file mode 100644 index 0454161e65f..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/config/DbcpDataSourceFactory.java +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright 2002-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.samples.petclinic.config; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.StringWriter; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; - -import javax.sql.DataSource; - -import org.apache.commons.dbcp.BasicDataSource; -import org.springframework.beans.factory.DisposableBean; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.core.io.Resource; - -/** - * A factory that creates a data source fit for use in a system environment. Creates a DBCP simple data source - * from the provided connection properties. - * - * This factory returns a fully-initialized DataSource implementation. When the DataSource is returned, callers are - * guaranteed that the database schema and data will have been loaded by that time. - * - * Is a FactoryBean, for exposing the fully-initialized DataSource as a Spring bean. See {@link #getObject()}. - * - * @author Chris Beams - * @author Scott Andrews - */ -public class DbcpDataSourceFactory implements FactoryBean, DisposableBean { - - // configurable properties - - private String driverClassName; - - private String url; - - private String username; - - private String password; - - private boolean populate; - - private Resource schemaLocation; - - private Resource dataLocation; - - private Resource dropLocation; - - /** - * The object created by this factory. - */ - private BasicDataSource dataSource; - - public void setDriverClassName(String driverClassName) { - this.driverClassName = driverClassName; - } - - /** - * The data source connection URL - */ - public void setUrl(String url) { - this.url = url; - } - - /** - * The data source username - */ - public void setUsername(String username) { - this.username = username; - } - - /** - *The data source password - */ - public void setPassword(String password) { - this.password = password; - } - - /** - * Indicates that the data base should be populated from the schema and data locations - */ - public void setPopulate(boolean populate) { - this.populate = populate; - } - - /** - * Sets the location of the file containing the schema DDL to export to the database. - * @param schemaLocation the location of the database schema DDL - */ - public void setSchemaLocation(Resource schemaLocation) { - this.schemaLocation = schemaLocation; - } - - /** - * Sets the location of the file containing the data to load into the database. - * @param testDataLocation the location of the data file - */ - public void setDataLocation(Resource testDataLocation) { - this.dataLocation = testDataLocation; - } - - /** - * Sets the location of the file containing the drop scripts for the database. - * @param testDataLocation the location of the data file - */ - public void setDropLocation(Resource testDropLocation) { - this.dropLocation = testDropLocation; - } - - // implementing FactoryBean - - // this method is called by Spring to expose the DataSource as a bean - public DataSource getObject() throws Exception { - if (dataSource == null) { - initDataSource(); - } - return dataSource; - } - - public Class getObjectType() { - return DataSource.class; - } - - public boolean isSingleton() { - return true; - } - - // implementing DisposableBean - - public void destroy() throws Exception { - dataSource.close(); - } - - // internal helper methods - - // encapsulates the steps involved in initializing the data source: creating it, and populating it - private void initDataSource() { - // create the database source first - this.dataSource = createDataSource(); - - if (this.populate) { - // now populate the database by loading the schema and data - populateDataSource(); - } - } - - private BasicDataSource createDataSource() { - BasicDataSource dataSource = new BasicDataSource(); - dataSource.setDriverClassName(this.driverClassName); - dataSource.setUrl(this.url); - dataSource.setUsername(this.username); - dataSource.setPassword(this.password); - return dataSource; - } - - private void populateDataSource() { - DatabasePopulator populator = new DatabasePopulator(dataSource); - if (dropLocation != null) { - try { - populator.populate(this.dropLocation); - } - catch (Exception e) { - // ignore - } - } - populator.populate(this.schemaLocation); - populator.populate(this.dataLocation); - } - - /** - * Populates a in memory data source with data. - */ - private class DatabasePopulator { - - private DataSource dataSource; - - /** - * Creates a new database populator. - * @param dataSource the data source that will be populated. - */ - public DatabasePopulator(DataSource dataSource) { - this.dataSource = dataSource; - } - - /** - * Populate the database executing the statements in the provided resource against the database - * @param sqlFile spring resource containing SQL to run against the db - */ - public void populate(Resource sqlFile) { - Connection connection = null; - try { - connection = dataSource.getConnection(); - try { - String sql = parseSqlIn(sqlFile); - executeSql(sql, connection); - } catch (IOException e) { - throw new RuntimeException("I/O exception occurred accessing the database schema file", e); - } catch (SQLException e) { - throw new RuntimeException("SQL exception occurred exporting database schema", e); - } - } catch (SQLException e) { - throw new RuntimeException("SQL exception occurred acquiring connection", e); - } finally { - if (connection != null) { - try { - connection.close(); - } catch (SQLException e) { - } - } - } - } - - // utility method to read a .sql txt input stream - private String parseSqlIn(Resource resource) throws IOException { - InputStream is = null; - try { - is = resource.getInputStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader(is)); - - StringWriter sw = new StringWriter(); - BufferedWriter writer = new BufferedWriter(sw); - - for (int c=reader.read(); c != -1; c=reader.read()) { - writer.write(c); - } - writer.flush(); - return sw.toString(); - - } finally { - if (is != null) { - is.close(); - } - } - } - - // utility method to run the parsed sql - private void executeSql(String sql, Connection connection) throws SQLException { - Statement statement = connection.createStatement(); - statement.execute(sql); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java deleted file mode 100644 index 41163856281..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/HibernateClinic.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.springframework.samples.petclinic.hibernate; - -import java.util.Collection; - -import org.hibernate.SessionFactory; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataAccessException; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.Vet; -import org.springframework.samples.petclinic.Visit; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; - -/** - * Hibernate implementation of the Clinic interface. - * - *

The mappings are defined in "petclinic.hbm.xml", located in the root of the - * class path. - * - *

Note that transactions are declared with annotations and that some methods - * contain "readOnly = true" which is an optimization that is particularly - * valuable when using Hibernate (to suppress unnecessary flush attempts for - * read-only operations). - * - * @author Juergen Hoeller - * @author Sam Brannen - * @author Mark Fisher - * @since 19.10.2003 - */ -@Repository -@Transactional -public class HibernateClinic implements Clinic { - - private SessionFactory sessionFactory; - - @Autowired - public HibernateClinic(SessionFactory sessionFactory) { - this.sessionFactory = sessionFactory; - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public Collection getVets() { - return sessionFactory.getCurrentSession().createQuery("from Vet vet order by vet.lastName, vet.firstName").list(); - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public Collection getPetTypes() { - return sessionFactory.getCurrentSession().createQuery("from PetType type order by type.name").list(); - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public Collection findOwners(String lastName) { - return sessionFactory.getCurrentSession().createQuery("from Owner owner where owner.lastName like :lastName") - .setString("lastName", lastName + "%").list(); - } - - @Transactional(readOnly = true) - public Owner loadOwner(int id) { - return (Owner) sessionFactory.getCurrentSession().load(Owner.class, id); - } - - @Transactional(readOnly = true) - public Pet loadPet(int id) { - return (Pet) sessionFactory.getCurrentSession().load(Pet.class, id); - } - - public void storeOwner(Owner owner) { - // Note: Hibernate3's merge operation does not reassociate the object - // with the current Hibernate Session. Instead, it will always copy the - // state over to a registered representation of the entity. In case of a - // new entity, it will register a copy as well, but will not update the - // id of the passed-in object. To still update the ids of the original - // objects too, we need to register Spring's - // IdTransferringMergeEventListener on our SessionFactory. - sessionFactory.getCurrentSession().merge(owner); - } - - public void storePet(Pet pet) { - sessionFactory.getCurrentSession().merge(pet); - } - - public void storeVisit(Visit visit) { - sessionFactory.getCurrentSession().merge(visit); - } - - public void deletePet(int id) throws DataAccessException { - Pet pet = loadPet(id); - sessionFactory.getCurrentSession().delete(pet); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/package-info.java deleted file mode 100644 index 704598b4c74..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/hibernate/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * - * The classes in this package represent the Hibernate implementation - * of PetClinic's persistence layer. - * - */ -package org.springframework.samples.petclinic.hibernate; - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/JdbcPet.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/JdbcPet.java deleted file mode 100644 index 963ffdfe033..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/JdbcPet.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.springframework.samples.petclinic.jdbc; - -import org.springframework.samples.petclinic.Pet; - -/** - * Subclass of Pet that carries temporary id properties which - * are only relevant for a JDBC implmentation of the Clinic. - * - * @author Juergen Hoeller - * @see SimpleJdbcClinic - */ -class JdbcPet extends Pet { - - private int typeId; - - private int ownerId; - - - public void setTypeId(int typeId) { - this.typeId = typeId; - } - - public int getTypeId() { - return this.typeId; - } - - public void setOwnerId(int ownerId) { - this.ownerId = ownerId; - } - - public int getOwnerId() { - return this.ownerId; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java deleted file mode 100644 index 587acecb951..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java +++ /dev/null @@ -1,342 +0,0 @@ -package org.springframework.samples.petclinic.jdbc; - -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.sql.DataSource; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.DataAccessException; -import org.springframework.dao.EmptyResultDataAccessException; -import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource; -import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; -import org.springframework.jdbc.core.simple.ParameterizedBeanPropertyRowMapper; -import org.springframework.jdbc.core.simple.ParameterizedRowMapper; -import org.springframework.jdbc.core.simple.SimpleJdbcInsert; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; -import org.springframework.jmx.export.annotation.ManagedOperation; -import org.springframework.jmx.export.annotation.ManagedResource; -import org.springframework.orm.ObjectRetrievalFailureException; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.Specialty; -import org.springframework.samples.petclinic.Vet; -import org.springframework.samples.petclinic.Visit; -import org.springframework.samples.petclinic.util.EntityUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -/** - * A simple JDBC-based implementation of the {@link Clinic} interface. - * - *

This class uses Java 5 language features and the {@link SimpleJdbcTemplate} - * plus {@link SimpleJdbcInsert}. It also takes advantage of classes like - * {@link BeanPropertySqlParameterSource} and - * {@link ParameterizedBeanPropertyRowMapper} which provide automatic mapping - * between JavaBean properties and JDBC parameters or query results. - * - *

SimpleJdbcClinic is a rewrite of the AbstractJdbcClinic which was the base - * class for JDBC implementations of the Clinic interface for Spring 2.0. - * - * @author Ken Krebs - * @author Juergen Hoeller - * @author Rob Harrop - * @author Sam Brannen - * @author Thomas Risberg - * @author Mark Fisher - */ -@Service -@ManagedResource("petclinic:type=Clinic") -public class SimpleJdbcClinic implements Clinic, SimpleJdbcClinicMBean { - - private final Log logger = LogFactory.getLog(getClass()); - - private SimpleJdbcTemplate simpleJdbcTemplate; - - private SimpleJdbcInsert insertOwner; - private SimpleJdbcInsert insertPet; - private SimpleJdbcInsert insertVisit; - - private final List vets = new ArrayList(); - - - @Autowired - public void init(DataSource dataSource) { - this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource); - - this.insertOwner = new SimpleJdbcInsert(dataSource) - .withTableName("owners") - .usingGeneratedKeyColumns("id"); - this.insertPet = new SimpleJdbcInsert(dataSource) - .withTableName("pets") - .usingGeneratedKeyColumns("id"); - this.insertVisit = new SimpleJdbcInsert(dataSource) - .withTableName("visits") - .usingGeneratedKeyColumns("id"); - } - - - /** - * Refresh the cache of Vets that the Clinic is holding. - * @see org.springframework.samples.petclinic.Clinic#getVets() - */ - @ManagedOperation - @Transactional(readOnly = true) - public void refreshVetsCache() throws DataAccessException { - synchronized (this.vets) { - this.logger.info("Refreshing vets cache"); - - // Retrieve the list of all vets. - this.vets.clear(); - this.vets.addAll(this.simpleJdbcTemplate.query( - "SELECT id, first_name, last_name FROM vets ORDER BY last_name,first_name", - ParameterizedBeanPropertyRowMapper.newInstance(Vet.class))); - - // Retrieve the list of all possible specialties. - final List specialties = this.simpleJdbcTemplate.query( - "SELECT id, name FROM specialties", - ParameterizedBeanPropertyRowMapper.newInstance(Specialty.class)); - - // Build each vet's list of specialties. - for (Vet vet : this.vets) { - final List vetSpecialtiesIds = this.simpleJdbcTemplate.query( - "SELECT specialty_id FROM vet_specialties WHERE vet_id=?", - new ParameterizedRowMapper() { - public Integer mapRow(ResultSet rs, int row) throws SQLException { - return Integer.valueOf(rs.getInt(1)); - }}, - vet.getId().intValue()); - for (int specialtyId : vetSpecialtiesIds) { - Specialty specialty = EntityUtils.getById(specialties, Specialty.class, specialtyId); - vet.addSpecialty(specialty); - } - } - } - } - - - // START of Clinic implementation section ******************************* - - @Transactional(readOnly = true) - public Collection getVets() throws DataAccessException { - synchronized (this.vets) { - if (this.vets.isEmpty()) { - refreshVetsCache(); - } - return this.vets; - } - } - - @Transactional(readOnly = true) - public Collection getPetTypes() throws DataAccessException { - return this.simpleJdbcTemplate.query( - "SELECT id, name FROM types ORDER BY name", - ParameterizedBeanPropertyRowMapper.newInstance(PetType.class)); - } - - /** - * Loads {@link Owner Owners} from the data store by last name, returning - * all owners whose last name starts with the given name; also loads - * the {@link Pet Pets} and {@link Visit Visits} for the corresponding - * owners, if not already loaded. - */ - @Transactional(readOnly = true) - public Collection findOwners(String lastName) throws DataAccessException { - List owners = this.simpleJdbcTemplate.query( - "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE last_name like ?", - ParameterizedBeanPropertyRowMapper.newInstance(Owner.class), - lastName + "%"); - loadOwnersPetsAndVisits(owners); - return owners; - } - - /** - * Loads the {@link Owner} with the supplied id; also loads - * the {@link Pet Pets} and {@link Visit Visits} for the corresponding - * owner, if not already loaded. - */ - @Transactional(readOnly = true) - public Owner loadOwner(int id) throws DataAccessException { - Owner owner; - try { - owner = this.simpleJdbcTemplate.queryForObject( - "SELECT id, first_name, last_name, address, city, telephone FROM owners WHERE id=?", - ParameterizedBeanPropertyRowMapper.newInstance(Owner.class), - id); - } - catch (EmptyResultDataAccessException ex) { - throw new ObjectRetrievalFailureException(Owner.class, new Integer(id)); - } - loadPetsAndVisits(owner); - return owner; - } - - @Transactional(readOnly = true) - public Pet loadPet(int id) throws DataAccessException { - JdbcPet pet; - try { - pet = this.simpleJdbcTemplate.queryForObject( - "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE id=?", - new JdbcPetRowMapper(), - id); - } - catch (EmptyResultDataAccessException ex) { - throw new ObjectRetrievalFailureException(Pet.class, new Integer(id)); - } - Owner owner = loadOwner(pet.getOwnerId()); - owner.addPet(pet); - pet.setType(EntityUtils.getById(getPetTypes(), PetType.class, pet.getTypeId())); - loadVisits(pet); - return pet; - } - - @Transactional - public void storeOwner(Owner owner) throws DataAccessException { - if (owner.isNew()) { - Number newKey = this.insertOwner.executeAndReturnKey( - new BeanPropertySqlParameterSource(owner)); - owner.setId(newKey.intValue()); - } - else { - this.simpleJdbcTemplate.update( - "UPDATE owners SET first_name=:firstName, last_name=:lastName, address=:address, " + - "city=:city, telephone=:telephone WHERE id=:id", - new BeanPropertySqlParameterSource(owner)); - } - } - - @Transactional - public void storePet(Pet pet) throws DataAccessException { - if (pet.isNew()) { - Number newKey = this.insertPet.executeAndReturnKey( - createPetParameterSource(pet)); - pet.setId(newKey.intValue()); - } - else { - this.simpleJdbcTemplate.update( - "UPDATE pets SET name=:name, birth_date=:birth_date, type_id=:type_id, " + - "owner_id=:owner_id WHERE id=:id", - createPetParameterSource(pet)); - } - } - - @Transactional - public void storeVisit(Visit visit) throws DataAccessException { - if (visit.isNew()) { - Number newKey = this.insertVisit.executeAndReturnKey( - createVisitParameterSource(visit)); - visit.setId(newKey.intValue()); - } - else { - throw new UnsupportedOperationException("Visit update not supported"); - } - } - - public void deletePet(int id) throws DataAccessException { - this.simpleJdbcTemplate.update("DELETE FROM pets WHERE id=?", id); - } - - // END of Clinic implementation section ************************************ - - - /** - * Creates a {@link MapSqlParameterSource} based on data values from the - * supplied {@link Pet} instance. - */ - private MapSqlParameterSource createPetParameterSource(Pet pet) { - return new MapSqlParameterSource() - .addValue("id", pet.getId()) - .addValue("name", pet.getName()) - .addValue("birth_date", pet.getBirthDate()) - .addValue("type_id", pet.getType().getId()) - .addValue("owner_id", pet.getOwner().getId()); - } - - /** - * Creates a {@link MapSqlParameterSource} based on data values from the - * supplied {@link Visit} instance. - */ - private MapSqlParameterSource createVisitParameterSource(Visit visit) { - return new MapSqlParameterSource() - .addValue("id", visit.getId()) - .addValue("visit_date", visit.getDate()) - .addValue("description", visit.getDescription()) - .addValue("pet_id", visit.getPet().getId()); - } - - /** - * Loads the {@link Visit} data for the supplied {@link Pet}. - */ - private void loadVisits(JdbcPet pet) { - final List visits = this.simpleJdbcTemplate.query( - "SELECT id, visit_date, description FROM visits WHERE pet_id=?", - new ParameterizedRowMapper() { - public Visit mapRow(ResultSet rs, int row) throws SQLException { - Visit visit = new Visit(); - visit.setId(rs.getInt("id")); - visit.setDate(rs.getTimestamp("visit_date")); - visit.setDescription(rs.getString("description")); - return visit; - } - }, - pet.getId().intValue()); - for (Visit visit : visits) { - pet.addVisit(visit); - } - } - - /** - * Loads the {@link Pet} and {@link Visit} data for the supplied - * {@link Owner}. - */ - private void loadPetsAndVisits(final Owner owner) { - final List pets = this.simpleJdbcTemplate.query( - "SELECT id, name, birth_date, type_id, owner_id FROM pets WHERE owner_id=?", - new JdbcPetRowMapper(), - owner.getId().intValue()); - for (JdbcPet pet : pets) { - owner.addPet(pet); - pet.setType(EntityUtils.getById(getPetTypes(), PetType.class, pet.getTypeId())); - loadVisits(pet); - } - } - - /** - * Loads the {@link Pet} and {@link Visit} data for the supplied - * {@link List} of {@link Owner Owners}. - * - * @param owners the list of owners for whom the pet and visit data should be loaded - * @see #loadPetsAndVisits(Owner) - */ - private void loadOwnersPetsAndVisits(List owners) { - for (Owner owner : owners) { - loadPetsAndVisits(owner); - } - } - - /** - * {@link ParameterizedRowMapper} implementation mapping data from a - * {@link ResultSet} to the corresponding properties of the {@link JdbcPet} class. - */ - private class JdbcPetRowMapper implements ParameterizedRowMapper { - - public JdbcPet mapRow(ResultSet rs, int rownum) throws SQLException { - JdbcPet pet = new JdbcPet(); - pet.setId(rs.getInt("id")); - pet.setName(rs.getString("name")); - pet.setBirthDate(rs.getDate("birth_date")); - pet.setTypeId(rs.getInt("type_id")); - pet.setOwnerId(rs.getInt("owner_id")); - return pet; - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicMBean.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicMBean.java deleted file mode 100644 index c9a7a78478b..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicMBean.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.springframework.samples.petclinic.jdbc; - -/** - * Interface that defines a cache refresh operation. - * To be exposed for management via JMX. - * - * @author Rob Harrop - * @author Juergen Hoeller - * @see SimpleJdbcClinic - */ -public interface SimpleJdbcClinicMBean { - - /** - * Refresh the cache of Vets that the Clinic is holding. - * @see org.springframework.samples.petclinic.Clinic#getVets() - * @see SimpleJdbcClinic#refreshVetsCache() - */ - void refreshVetsCache(); - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/package-info.java deleted file mode 100644 index 73ea741fe53..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jdbc/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * - * The classes in this package represent the JDBC implementation - * of PetClinic's persistence layer. - * - */ -package org.springframework.samples.petclinic.jdbc; - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java deleted file mode 100644 index 92fe1e24771..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/EntityManagerClinic.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.springframework.samples.petclinic.jpa; - -import java.util.Collection; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Query; - -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.Vet; -import org.springframework.samples.petclinic.Visit; -import org.springframework.stereotype.Repository; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.dao.DataAccessException; - -/** - * JPA implementation of the Clinic interface using EntityManager. - * - *

The mappings are defined in "orm.xml" located in the META-INF directory. - * - * @author Mike Keith - * @author Rod Johnson - * @author Sam Brannen - * @since 22.4.2006 - */ -@Repository -@Transactional -public class EntityManagerClinic implements Clinic { - - @PersistenceContext - private EntityManager em; - - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public Collection getVets() { - return this.em.createQuery("SELECT vet FROM Vet vet ORDER BY vet.lastName, vet.firstName").getResultList(); - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public Collection getPetTypes() { - return this.em.createQuery("SELECT ptype FROM PetType ptype ORDER BY ptype.name").getResultList(); - } - - @Transactional(readOnly = true) - @SuppressWarnings("unchecked") - public Collection findOwners(String lastName) { - Query query = this.em.createQuery("SELECT owner FROM Owner owner WHERE owner.lastName LIKE :lastName"); - query.setParameter("lastName", lastName + "%"); - return query.getResultList(); - } - - @Transactional(readOnly = true) - public Owner loadOwner(int id) { - return this.em.find(Owner.class, id); - } - - @Transactional(readOnly = true) - public Pet loadPet(int id) { - return this.em.find(Pet.class, id); - } - - public void storeOwner(Owner owner) { - // Consider returning the persistent object here, for exposing - // a newly assigned id using any persistence provider... - Owner merged = this.em.merge(owner); - this.em.flush(); - owner.setId(merged.getId()); - } - - public void storePet(Pet pet) { - // Consider returning the persistent object here, for exposing - // a newly assigned id using any persistence provider... - Pet merged = this.em.merge(pet); - this.em.flush(); - pet.setId(merged.getId()); - } - - public void storeVisit(Visit visit) { - // Consider returning the persistent object here, for exposing - // a newly assigned id using any persistence provider... - Visit merged = this.em.merge(visit); - this.em.flush(); - visit.setId(merged.getId()); - } - - public void deletePet(int id) throws DataAccessException { - Pet pet = loadPet(id); - this.em.remove(pet); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/package-info.java deleted file mode 100644 index a03239538e7..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/jpa/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * - * The classes in this package represent the JPA implementation - * of PetClinic's persistence layer. - * - */ -package org.springframework.samples.petclinic.jpa; - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/package-info.java deleted file mode 100644 index a287c4efdac..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ - -/** - * - * The classes in this package represent PetClinic's business layer. - * - */ -package org.springframework.samples.petclinic; - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/EssentialsHSQLPlatformWithNativeSequence.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/EssentialsHSQLPlatformWithNativeSequence.java deleted file mode 100644 index 1086591decd..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/EssentialsHSQLPlatformWithNativeSequence.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.springframework.samples.petclinic.toplink; - -import java.io.IOException; -import java.io.Writer; - -import oracle.toplink.essentials.exceptions.ValidationException; -import oracle.toplink.essentials.platform.database.HSQLPlatform; -import oracle.toplink.essentials.queryframework.ValueReadQuery; - -/** - * Subclass of the TopLink Essentials default HSQLPlatform class, using native - * HSQLDB identity columns for id generation. - * - *

Necessary for PetClinic's default data model, which relies on identity - * columns: this is uniformly used across all persistence layer implementations - * (JDBC, Hibernate, and JPA). - * - * @author Juergen Hoeller - * @author James Clark - * @since 1.2 - */ -public class EssentialsHSQLPlatformWithNativeSequence extends HSQLPlatform { - - private static final long serialVersionUID = -55658009691346735L; - - - public EssentialsHSQLPlatformWithNativeSequence() { - // setUsesNativeSequencing(true); - } - - @Override - public boolean supportsNativeSequenceNumbers() { - return true; - } - - @Override - public boolean shouldNativeSequenceAcquireValueAfterInsert() { - return true; - } - - @Override - public ValueReadQuery buildSelectQueryForNativeSequence() { - return new ValueReadQuery("CALL IDENTITY()"); - } - - @Override - public void printFieldIdentityClause(Writer writer) throws ValidationException { - try { - writer.write(" IDENTITY"); - } - catch (IOException ex) { - throw ValidationException.fileError(ex); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/package-info.java deleted file mode 100644 index 0b945fa012b..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/toplink/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ - -/** - * - * The classes in this package provide support for using the TopLink - * implementation with PetClinic's EntityManagerClinic. - * - * - */ -package org.springframework.samples.petclinic.toplink; - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java deleted file mode 100644 index 16df5fa9a91..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/EntityUtils.java +++ /dev/null @@ -1,41 +0,0 @@ - -package org.springframework.samples.petclinic.util; - -import java.util.Collection; - -import org.springframework.orm.ObjectRetrievalFailureException; -import org.springframework.samples.petclinic.BaseEntity; - -/** - * Utility methods for handling entities. Separate from the BaseEntity class - * mainly because of dependency on the ORM-associated - * ObjectRetrievalFailureException. - * - * @author Juergen Hoeller - * @author Sam Brannen - * @since 29.10.2003 - * @see org.springframework.samples.petclinic.BaseEntity - */ -public abstract class EntityUtils { - - /** - * Look up the entity of the given class with the given id in the given - * collection. - * - * @param entities the collection to search - * @param entityClass the entity class to look up - * @param entityId the entity id to look up - * @return the found entity - * @throws ObjectRetrievalFailureException if the entity was not found - */ - public static T getById(Collection entities, Class entityClass, int entityId) - throws ObjectRetrievalFailureException { - for (T entity : entities) { - if (entity.getId().intValue() == entityId && entityClass.isInstance(entity)) { - return entity; - } - } - throw new ObjectRetrievalFailureException(entityClass, new Integer(entityId)); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/OwnerValidator.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/OwnerValidator.java deleted file mode 100644 index 04b6b7d58af..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/OwnerValidator.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.springframework.samples.petclinic.validation; - -import org.springframework.samples.petclinic.Owner; -import org.springframework.util.StringUtils; -import org.springframework.validation.Errors; - -/** - * Validator for Owner forms. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ -public class OwnerValidator { - - public void validate(Owner owner, Errors errors) { - if (!StringUtils.hasLength(owner.getFirstName())) { - errors.rejectValue("firstName", "required", "required"); - } - if (!StringUtils.hasLength(owner.getLastName())) { - errors.rejectValue("lastName", "required", "required"); - } - if (!StringUtils.hasLength(owner.getAddress())) { - errors.rejectValue("address", "required", "required"); - } - if (!StringUtils.hasLength(owner.getCity())) { - errors.rejectValue("city", "required", "required"); - } - - String telephone = owner.getTelephone(); - if (!StringUtils.hasLength(telephone)) { - errors.rejectValue("telephone", "required", "required"); - } - else { - for (int i = 0; i < telephone.length(); ++i) { - if ((Character.isDigit(telephone.charAt(i))) == false) { - errors.rejectValue("telephone", "nonNumeric", "non-numeric"); - break; - } - } - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/PetValidator.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/PetValidator.java deleted file mode 100644 index 8ad6eb0ac03..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/PetValidator.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.springframework.samples.petclinic.validation; - -import org.springframework.samples.petclinic.Pet; -import org.springframework.util.StringUtils; -import org.springframework.validation.Errors; - -/** - * Validator for Pet forms. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ -public class PetValidator { - - public void validate(Pet pet, Errors errors) { - String name = pet.getName(); - if (!StringUtils.hasLength(name)) { - errors.rejectValue("name", "required", "required"); - } - else if (pet.isNew() && pet.getOwner().getPet(name, true) != null) { - errors.rejectValue("name", "duplicate", "already exists"); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/VisitValidator.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/VisitValidator.java deleted file mode 100644 index 35c80bafa10..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/VisitValidator.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.springframework.samples.petclinic.validation; - -import org.springframework.samples.petclinic.Visit; -import org.springframework.util.StringUtils; -import org.springframework.validation.Errors; - -/** - * Validator for Visit forms. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ -public class VisitValidator { - - public void validate(Visit visit, Errors errors) { - if (!StringUtils.hasLength(visit.getDescription())) { - errors.rejectValue("description", "required", "required"); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/package-info.java deleted file mode 100644 index b919a0a12a8..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/validation/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ - -/** - * - * The classes in this package represent the set of Validator objects - * the Business Layer makes available to the Presentation Layer. - * - */ -package org.springframework.samples.petclinic.validation; - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java deleted file mode 100644 index cd830aff6fb..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddOwnerForm.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.validation.OwnerValidator; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.bind.support.SessionStatus; - -/** - * JavaBean form controller that is used to add a new Owner to the - * system. - * - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -@RequestMapping("/owners/new") -@SessionAttributes(types = Owner.class) -public class AddOwnerForm { - - private final Clinic clinic; - - - @Autowired - public AddOwnerForm(Clinic clinic) { - this.clinic = clinic; - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @RequestMapping(method = RequestMethod.GET) - public String setupForm(Model model) { - Owner owner = new Owner(); - model.addAttribute(owner); - return "owners/form"; - } - - @RequestMapping(method = RequestMethod.POST) - public String processSubmit(@ModelAttribute Owner owner, BindingResult result, SessionStatus status) { - new OwnerValidator().validate(owner, result); - if (result.hasErrors()) { - return "owners/form"; - } - else { - this.clinic.storeOwner(owner); - status.setComplete(); - return "redirect:/owners/" + owner.getId(); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java deleted file mode 100644 index 586cf3d67c5..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddPetForm.java +++ /dev/null @@ -1,77 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import java.util.Collection; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.validation.PetValidator; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.bind.support.SessionStatus; - -/** - * JavaBean form controller that is used to add a new Pet to the - * system. - * - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -@RequestMapping("/owners/{ownerId}/pets/new") -@SessionAttributes("pet") -public class AddPetForm { - - private final Clinic clinic; - - - @Autowired - public AddPetForm(Clinic clinic) { - this.clinic = clinic; - } - - @ModelAttribute("types") - public Collection populatePetTypes() { - return this.clinic.getPetTypes(); - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @RequestMapping(method = RequestMethod.GET) - public String setupForm(@PathVariable("ownerId") int ownerId, Model model) { - Owner owner = this.clinic.loadOwner(ownerId); - Pet pet = new Pet(); - owner.addPet(pet); - model.addAttribute("pet", pet); - return "pets/form"; - } - - @RequestMapping(method = RequestMethod.POST) - public String processSubmit(@ModelAttribute("pet") Pet pet, BindingResult result, SessionStatus status) { - new PetValidator().validate(pet, result); - if (result.hasErrors()) { - return "pets/form"; - } - else { - this.clinic.storePet(pet); - status.setComplete(); - return "redirect:/owners/" + pet.getOwner().getId(); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java deleted file mode 100644 index 68368644026..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/AddVisitForm.java +++ /dev/null @@ -1,69 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.Visit; -import org.springframework.samples.petclinic.validation.VisitValidator; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.bind.support.SessionStatus; - -/** - * JavaBean form controller that is used to add a new Visit to the - * system. - * - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -@RequestMapping("/owners/*/pets/{petId}/visits/new") -@SessionAttributes("visit") -public class AddVisitForm { - - private final Clinic clinic; - - - @Autowired - public AddVisitForm(Clinic clinic) { - this.clinic = clinic; - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @RequestMapping(method = RequestMethod.GET) - public String setupForm(@PathVariable("petId") int petId, Model model) { - Pet pet = this.clinic.loadPet(petId); - Visit visit = new Visit(); - pet.addVisit(visit); - model.addAttribute("visit", visit); - return "pets/visitForm"; - } - - @RequestMapping(method = RequestMethod.POST) - public String processSubmit(@ModelAttribute("visit") Visit visit, BindingResult result, SessionStatus status) { - new VisitValidator().validate(visit, result); - if (result.hasErrors()) { - return "pets/visitForm"; - } - else { - this.clinic.storeVisit(visit); - status.setComplete(); - return "redirect:/owners/" + visit.getPet().getOwner().getId(); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicBindingInitializer.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicBindingInitializer.java deleted file mode 100644 index 2d2a8bdc15f..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicBindingInitializer.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.springframework.samples.petclinic.web; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.propertyeditors.CustomDateEditor; -import org.springframework.beans.propertyeditors.StringTrimmerEditor; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.PetType; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.support.WebBindingInitializer; -import org.springframework.web.context.request.WebRequest; - -/** - * Shared WebBindingInitializer for PetClinic's custom editors. - * - *

Alternatively, such init-binder code may be put into - * {@link org.springframework.web.bind.annotation.InitBinder} - * annotated methods on the controller classes themselves. - * - * @author Juergen Hoeller - */ -public class ClinicBindingInitializer implements WebBindingInitializer { - - @Autowired - private Clinic clinic; - - public void initBinder(WebDataBinder binder, WebRequest request) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); - dateFormat.setLenient(false); - binder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, false)); - binder.registerCustomEditor(String.class, new StringTrimmerEditor(false)); - binder.registerCustomEditor(PetType.class, new PetTypeEditor(this.clinic)); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java deleted file mode 100644 index e93ae8f6663..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/ClinicController.java +++ /dev/null @@ -1,89 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Vets; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.ModelAndView; - -/** - * Annotation-driven MultiActionController that handles all non-form - * URL's. - * - * @author Juergen Hoeller - * @author Mark Fisher - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -public class ClinicController { - - private final Clinic clinic; - - - @Autowired - public ClinicController(Clinic clinic) { - this.clinic = clinic; - } - - /** - * Custom handler for the welcome view. - *

- * Note that this handler relies on the RequestToViewNameTranslator to - * determine the logical view name based on the request URL: "/welcome.do" - * -> "welcome". - */ - @RequestMapping("/") - public String welcomeHandler() { - return "welcome"; - } - - /** - * Custom handler for displaying vets. - * - *

Note that this handler returns a plain {@link ModelMap} object instead of - * a ModelAndView, thus leveraging convention-based model attribute names. - * It relies on the RequestToViewNameTranslator to determine the logical - * view name based on the request URL: "/vets.do" -> "vets". - * - * @return a ModelMap with the model attributes for the view - */ - @RequestMapping("/vets") - public ModelMap vetsHandler() { - Vets vets = new Vets(); - vets.getVetList().addAll(this.clinic.getVets()); - return new ModelMap(vets); - } - - /** - * Custom handler for displaying an owner. - * - * @param ownerId the ID of the owner to display - * @return a ModelMap with the model attributes for the view - */ - @RequestMapping("/owners/{ownerId}") - public ModelAndView ownerHandler(@PathVariable("ownerId") int ownerId) { - ModelAndView mav = new ModelAndView("owners/show"); - mav.addObject(this.clinic.loadOwner(ownerId)); - return mav; - } - - /** - * Custom handler for displaying an list of visits. - * - * @param petId the ID of the pet whose visits to display - * @return a ModelMap with the model attributes for the view - */ - @RequestMapping(value="/owners/*/pets/{petId}/visits", method=RequestMethod.GET) - public ModelAndView visitsHandler(@PathVariable int petId) { - ModelAndView mav = new ModelAndView("visits"); - mav.addObject("visits", this.clinic.loadPet(petId).getVisits()); - return mav; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java deleted file mode 100644 index 0b65de51bf6..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditOwnerForm.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.validation.OwnerValidator; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.bind.support.SessionStatus; - -/** - * JavaBean Form controller that is used to edit an existing Owner. - * - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -@RequestMapping("/owners/{ownerId}/edit") -@SessionAttributes(types = Owner.class) -public class EditOwnerForm { - - private final Clinic clinic; - - - @Autowired - public EditOwnerForm(Clinic clinic) { - this.clinic = clinic; - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @RequestMapping(method = RequestMethod.GET) - public String setupForm(@PathVariable("ownerId") int ownerId, Model model) { - Owner owner = this.clinic.loadOwner(ownerId); - model.addAttribute(owner); - return "owners/form"; - } - - @RequestMapping(method = RequestMethod.PUT) - public String processSubmit(@ModelAttribute Owner owner, BindingResult result, SessionStatus status) { - new OwnerValidator().validate(owner, result); - if (result.hasErrors()) { - return "owners/form"; - } - else { - this.clinic.storeOwner(owner); - status.setComplete(); - return "redirect:/owners/" + owner.getId(); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java deleted file mode 100644 index 1a7fd6ed3c6..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/EditPetForm.java +++ /dev/null @@ -1,80 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import java.util.Collection; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.validation.PetValidator; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.SessionAttributes; -import org.springframework.web.bind.support.SessionStatus; - -/** - * JavaBean Form controller that is used to edit an existing Pet. - * - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -@RequestMapping("/owners/*/pets/{petId}/edit") -@SessionAttributes("pet") -public class EditPetForm { - - private final Clinic clinic; - - - @Autowired - public EditPetForm(Clinic clinic) { - this.clinic = clinic; - } - - @ModelAttribute("types") - public Collection populatePetTypes() { - return this.clinic.getPetTypes(); - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @RequestMapping(method = RequestMethod.GET) - public String setupForm(@PathVariable("petId") int petId, Model model) { - Pet pet = this.clinic.loadPet(petId); - model.addAttribute("pet", pet); - return "pets/form"; - } - - @RequestMapping(method = { RequestMethod.PUT, RequestMethod.POST }) - public String processSubmit(@ModelAttribute("pet") Pet pet, BindingResult result, SessionStatus status) { - new PetValidator().validate(pet, result); - if (result.hasErrors()) { - return "pets/form"; - } - else { - this.clinic.storePet(pet); - status.setComplete(); - return "redirect:/owners/" + pet.getOwner().getId(); - } - } - - @RequestMapping(method = RequestMethod.DELETE) - public String deletePet(@PathVariable int petId) { - Pet pet = this.clinic.loadPet(petId); - this.clinic.deletePet(petId); - return "redirect:/owners/" + pet.getOwner().getId(); - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java deleted file mode 100644 index eb93fabad0a..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/FindOwnersForm.java +++ /dev/null @@ -1,74 +0,0 @@ - -package org.springframework.samples.petclinic.web; - -import java.util.Collection; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -/** - * JavaBean Form controller that is used to search for Owners by - * last name. - * - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - */ -@Controller -public class FindOwnersForm { - - private final Clinic clinic; - - - @Autowired - public FindOwnersForm(Clinic clinic) { - this.clinic = clinic; - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @RequestMapping(value = "/owners/search", method = RequestMethod.GET) - public String setupForm(Model model) { - model.addAttribute("owner", new Owner()); - return "owners/search"; - } - - @RequestMapping(value = "/owners", method = RequestMethod.GET) - public String processSubmit(Owner owner, BindingResult result, Model model) { - - // allow parameterless GET request for /owners to return all records - if (owner.getLastName() == null) { - owner.setLastName(""); // empty string signifies broadest possible search - } - - // find owners by last name - Collection results = this.clinic.findOwners(owner.getLastName()); - if (results.size() < 1) { - // no owners found - result.rejectValue("lastName", "notFound", "not found"); - return "owners/search"; - } - if (results.size() > 1) { - // multiple owners found - model.addAttribute("selections", results); - return "owners/list"; - } - else { - // 1 owner found - owner = results.iterator().next(); - return "redirect:/owners/" + owner.getId(); - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/PetTypeEditor.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/PetTypeEditor.java deleted file mode 100644 index 812b648d711..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/PetTypeEditor.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.springframework.samples.petclinic.web; - -import java.beans.PropertyEditorSupport; - -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.PetType; - -/** - * @author Mark Fisher - * @author Juergen Hoeller - */ -public class PetTypeEditor extends PropertyEditorSupport { - - private final Clinic clinic; - - - public PetTypeEditor(Clinic clinic) { - this.clinic = clinic; - } - - @Override - public void setAsText(String text) throws IllegalArgumentException { - for (PetType type : this.clinic.getPetTypes()) { - if (type.getName().equals(text)) { - setValue(type); - } - } - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitsAtomView.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitsAtomView.java deleted file mode 100644 index e9da832e4d7..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/VisitsAtomView.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2002-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.samples.petclinic.web; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.sun.syndication.feed.atom.Content; -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Feed; - -import org.springframework.samples.petclinic.Visit; -import org.springframework.web.servlet.view.feed.AbstractAtomFeedView; - -/** - * A view creating a Atom representation from a list of Visit objects. - * - * @author Alef Arendsen - * @author Arjen Poutsma - */ -public class VisitsAtomView extends AbstractAtomFeedView { - - @Override - protected void buildFeedMetadata(Map model, Feed feed, HttpServletRequest request) { - feed.setId("tag:springsource.com"); - feed.setTitle("Pet Clinic Visits"); - @SuppressWarnings("unchecked") - List visits = (List) model.get("visits"); - for (Visit visit : visits) { - Date date = visit.getDate(); - if (feed.getUpdated() == null || date.compareTo(feed.getUpdated()) > 0) { - feed.setUpdated(date); - } - } - } - - @Override - protected List buildFeedEntries(Map model, - HttpServletRequest request, HttpServletResponse response) throws Exception { - - @SuppressWarnings("unchecked") - List visits = (List) model.get("visits"); - List entries = new ArrayList(visits.size()); - - for (Visit visit : visits) { - Entry entry = new Entry(); - String date = String.format("%1$tY-%1$tm-%1$td", visit.getDate()); - // see http://diveintomark.org/archives/2004/05/28/howto-atom-id#other - entry.setId(String.format("tag:springsource.com,%s:%d", date, visit.getId())); - entry.setTitle(String.format("%s visit on %s", visit.getPet().getName(), date)); - entry.setUpdated(visit.getDate()); - - Content summary = new Content(); - summary.setValue(visit.getDescription()); - entry.setSummary(summary); - - entries.add(entry); - } - - return entries; - - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/package-info.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/package-info.java deleted file mode 100644 index 36018d1b1b9..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/web/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ - -/** - * - * The classes in this package represent PetClinic's web presentation layer. - * - */ -package org.springframework.samples.petclinic.web; - diff --git a/org.springframework.samples.petclinic/src/main/java/overview.html b/org.springframework.samples.petclinic/src/main/java/overview.html deleted file mode 100644 index 1eb7a2e8c19..00000000000 --- a/org.springframework.samples.petclinic/src/main/java/overview.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-The Spring Data Binding framework, an internal library used by Spring Web Flow. -

- - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/resources/META-INF/aop.xml b/org.springframework.samples.petclinic/src/main/resources/META-INF/aop.xml deleted file mode 100644 index b49ffd8b19a..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/META-INF/aop.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/dropTables.txt b/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/dropTables.txt deleted file mode 100644 index 90ae6329f90..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/dropTables.txt +++ /dev/null @@ -1,7 +0,0 @@ -DROP TABLE visits; -DROP TABLE pets; -DROP TABLE owners; -DROP TABLE types; -DROP TABLE vet_specialties; -DROP TABLE specialties; -DROP TABLE vets; diff --git a/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/initDB.txt b/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/initDB.txt deleted file mode 100644 index a75bfbbd86d..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/initDB.txt +++ /dev/null @@ -1,55 +0,0 @@ -CREATE TABLE vets ( - id INTEGER NOT NULL IDENTITY PRIMARY KEY, - first_name VARCHAR(30), - last_name VARCHAR(30) -); -CREATE INDEX vets_last_name ON vets(last_name); - -CREATE TABLE specialties ( - id INTEGER NOT NULL IDENTITY PRIMARY KEY, - name VARCHAR(80) -); -CREATE INDEX specialties_name ON specialties(name); - -CREATE TABLE vet_specialties ( - vet_id INTEGER NOT NULL, - specialty_id INTEGER NOT NULL -); -alter table vet_specialties add constraint fk_vet_specialties_vets foreign key (vet_id) references vets(id); -alter table vet_specialties add constraint fk_vet_specialties_specialties foreign key (specialty_id) references specialties(id); - -CREATE TABLE types ( - id INTEGER NOT NULL IDENTITY PRIMARY KEY, - name VARCHAR(80) -); -CREATE INDEX types_name ON types(name); - -CREATE TABLE owners ( - id INTEGER NOT NULL IDENTITY PRIMARY KEY, - first_name VARCHAR(30), - last_name VARCHAR(30), - address VARCHAR(255), - city VARCHAR(80), - telephone VARCHAR(20) -); -CREATE INDEX owners_last_name ON owners(last_name); - -CREATE TABLE pets ( - id INTEGER NOT NULL IDENTITY PRIMARY KEY, - name VARCHAR(30), - birth_date DATE, - type_id INTEGER NOT NULL, - owner_id INTEGER NOT NULL -); -alter table pets add constraint fk_pets_owners foreign key (owner_id) references owners(id); -alter table pets add constraint fk_pets_types foreign key (type_id) references types(id); -CREATE INDEX pets_name ON pets(name); - -CREATE TABLE visits ( - id INTEGER NOT NULL IDENTITY PRIMARY KEY, - pet_id INTEGER NOT NULL, - visit_date DATE, - description VARCHAR(255) -); -alter table visits add constraint fk_visits_pets foreign key (pet_id) references pets(id); -CREATE INDEX visits_pet_id ON visits(pet_id); diff --git a/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/populateDB.txt b/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/populateDB.txt deleted file mode 100644 index 1bf0c4a6edb..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/META-INF/hsqldb/populateDB.txt +++ /dev/null @@ -1,53 +0,0 @@ -INSERT INTO vets VALUES (1, 'James', 'Carter'); -INSERT INTO vets VALUES (2, 'Helen', 'Leary'); -INSERT INTO vets VALUES (3, 'Linda', 'Douglas'); -INSERT INTO vets VALUES (4, 'Rafael', 'Ortega'); -INSERT INTO vets VALUES (5, 'Henry', 'Stevens'); -INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins'); - -INSERT INTO specialties VALUES (1, 'radiology'); -INSERT INTO specialties VALUES (2, 'surgery'); -INSERT INTO specialties VALUES (3, 'dentistry'); - -INSERT INTO vet_specialties VALUES (2, 1); -INSERT INTO vet_specialties VALUES (3, 2); -INSERT INTO vet_specialties VALUES (3, 3); -INSERT INTO vet_specialties VALUES (4, 2); -INSERT INTO vet_specialties VALUES (5, 1); - -INSERT INTO types VALUES (1, 'cat'); -INSERT INTO types VALUES (2, 'dog'); -INSERT INTO types VALUES (3, 'lizard'); -INSERT INTO types VALUES (4, 'snake'); -INSERT INTO types VALUES (5, 'bird'); -INSERT INTO types VALUES (6, 'hamster'); - -INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023'); -INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749'); -INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763'); -INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198'); -INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765'); -INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654'); -INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387'); -INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683'); -INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); -INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); - -INSERT INTO pets VALUES (1, 'Leo', '2000-09-07', 1, 1); -INSERT INTO pets VALUES (2, 'Basil', '2002-08-06', 6, 2); -INSERT INTO pets VALUES (3, 'Rosy', '2001-04-17', 2, 3); -INSERT INTO pets VALUES (4, 'Jewel', '2000-03-07', 2, 3); -INSERT INTO pets VALUES (5, 'Iggy', '2000-11-30', 3, 4); -INSERT INTO pets VALUES (6, 'George', '2000-01-20', 4, 5); -INSERT INTO pets VALUES (7, 'Samantha', '1995-09-04', 1, 6); -INSERT INTO pets VALUES (8, 'Max', '1995-09-04', 1, 6); -INSERT INTO pets VALUES (9, 'Lucky', '1999-08-06', 5, 7); -INSERT INTO pets VALUES (10, 'Mulligan', '1997-02-24', 2, 8); -INSERT INTO pets VALUES (11, 'Freddy', '2000-03-09', 5, 9); -INSERT INTO pets VALUES (12, 'Lucky', '2000-06-24', 2, 10); -INSERT INTO pets VALUES (13, 'Sly', '2002-06-08', 1, 10); - -INSERT INTO visits VALUES (1, 7, '1996-03-04', 'rabies shot'); -INSERT INTO visits VALUES (2, 8, '1996-03-04', 'rabies shot'); -INSERT INTO visits VALUES (3, 8, '1996-06-04', 'neutered'); -INSERT INTO visits VALUES (4, 7, '1996-09-04', 'spayed'); diff --git a/org.springframework.samples.petclinic/src/main/resources/META-INF/orm.xml b/org.springframework.samples.petclinic/src/main/resources/META-INF/orm.xml deleted file mode 100644 index d7c8f7040a1..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/META-INF/orm.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - - - - PROPERTY - - - - org.springframework.samples.petclinic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - - - - - - - - - - - -
- - - - DATE - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - - DATE - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/resources/META-INF/persistence.xml b/org.springframework.samples.petclinic/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 86bf7c115d8..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - META-INF/orm.xml - - - true - - - - diff --git a/org.springframework.samples.petclinic/src/main/resources/jdbc.properties b/org.springframework.samples.petclinic/src/main/resources/jdbc.properties deleted file mode 100644 index e039cdf1b6c..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/jdbc.properties +++ /dev/null @@ -1,63 +0,0 @@ -# Properties file with JDBC and JPA settings. -# -# Applied by from -# various application context XML files (e.g., "applicationContext-*.xml"). -# Targeted at system administrators, to avoid touching the context XML files. - - -#------------------------------------------------------------------------------- -# Common Settings - -hibernate.generate_statistics=true -hibernate.show_sql=true -jpa.showSql=true - - -#------------------------------------------------------------------------------- -# HSQL Settings - -jdbc.driverClassName=org.hsqldb.jdbcDriver -jdbc.url=jdbc:hsqldb:mem:petclinic -jdbc.username=sa -jdbc.password= - -# Properties that control the population of schema and data for a new data source -jdbc.populate=true -jdbc.schemaLocation=classpath:/META-INF/hsqldb/initDB.txt -jdbc.dataLocation=classpath:/META-INF/hsqldb/populateDB.txt -jdbc.dropLocation=classpath:/META-INF/hsqldb/dropTables.txt - -# Property that determines which Hibernate dialect to use -# (only applied with "applicationContext-hibernate.xml") -hibernate.dialect=org.hibernate.dialect.HSQLDialect - -# Property that determines which JPA DatabasePlatform to use with TopLink Essentials -jpa.databasePlatform=org.springframework.samples.petclinic.toplink.EssentialsHSQLPlatformWithNativeSequence - -# Property that determines which database to use with an AbstractJpaVendorAdapter -jpa.database=HSQL - - -#------------------------------------------------------------------------------- -# MySQL Settings - -#jdbc.driverClassName=com.mysql.jdbc.Driver -#jdbc.url=jdbc:mysql://localhost:3306/petclinic -#jdbc.username=pc -#jdbc.password=pc - -# Properties that control the population of schema and data for a new data source -#jdbc.populate=false -#jdbc.schemaLocation= -#jdbc.dataLocation= -#jdbc.dropLocation= - -# Property that determines which Hibernate dialect to use -# (only applied with "applicationContext-hibernate.xml") -#hibernate.dialect=org.hibernate.dialect.MySQLDialect - -# Property that determines which JPA DatabasePlatform to use with TopLink Essentials -#jpa.databasePlatform=oracle.toplink.essentials.platform.database.MySQL4Platform - -# Property that determines which database to use with an AbstractJpaVendorAdapter -#jpa.database=MYSQL diff --git a/org.springframework.samples.petclinic/src/main/resources/log4j.properties b/org.springframework.samples.petclinic/src/main/resources/log4j.properties deleted file mode 100644 index ebee551aa88..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/log4j.properties +++ /dev/null @@ -1,18 +0,0 @@ -# For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml! -# For all other servers: Comment out the Log4J listener in web.xml to activate Log4J. -log4j.rootLogger=INFO, stdout, logfile - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -log4j.appender.logfile=org.apache.log4j.RollingFileAppender -log4j.appender.logfile.File=${petclinic.root}/WEB-INF/petclinic.log -log4j.appender.logfile.MaxFileSize=512KB -# Keep three backup files. -log4j.appender.logfile.MaxBackupIndex=3 -# Pattern to output: date priority [category] - message -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n - -log4j.logger.org.springframework.samples.petclinic.aspects=DEBUG diff --git a/org.springframework.samples.petclinic/src/main/resources/messages.properties b/org.springframework.samples.petclinic/src/main/resources/messages.properties deleted file mode 100644 index 173417a1014..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/messages.properties +++ /dev/null @@ -1,8 +0,0 @@ -welcome=Welcome -required=is required -notFound=has not been found -duplicate=is already in use -nonNumeric=must be all numeric -duplicateFormSubmission=Duplicate form submission is not allowed -typeMismatch.date=invalid date -typeMismatch.birthDate=invalid date diff --git a/org.springframework.samples.petclinic/src/main/resources/messages_de.properties b/org.springframework.samples.petclinic/src/main/resources/messages_de.properties deleted file mode 100644 index 124bee48b2c..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/messages_de.properties +++ /dev/null @@ -1,8 +0,0 @@ -welcome=Willkommen -required=muss angegeben werden -notFound=wurde nicht gefunden -duplicate=ist bereits vergeben -nonNumeric=darf nur numerisch sein -duplicateFormSubmission=Wiederholtes Absenden des Formulars ist nicht erlaubt -typeMismatch.date=ungültiges Datum -typeMismatch.birthDate=ungültiges Datum diff --git a/org.springframework.samples.petclinic/src/main/resources/messages_en.properties b/org.springframework.samples.petclinic/src/main/resources/messages_en.properties deleted file mode 100644 index 05d519bb86d..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/messages_en.properties +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally empty. Message look-ups will fall back to the default "messages.properties" file. \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/resources/petclinic.hbm.xml b/org.springframework.samples.petclinic/src/main/resources/petclinic.hbm.xml deleted file mode 100644 index f9a993cf121..00000000000 --- a/org.springframework.samples.petclinic/src/main/resources/petclinic.hbm.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/META-INF/context.xml b/org.springframework.samples.petclinic/src/main/webapp/META-INF/context.xml deleted file mode 100644 index d5deabaf701..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-hibernate.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-hibernate.xml deleted file mode 100644 index bfc166db625..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-hibernate.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - ${hibernate.dialect} - ${hibernate.show_sql} - ${hibernate.generate_statistics} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jdbc.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jdbc.xml deleted file mode 100644 index 69a2b1f5dcc..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jdbc.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jpa.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jpa.xml deleted file mode 100644 index 25374e9abe2..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/applicationContext-jpa.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/log4j.properties b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/log4j.properties deleted file mode 100644 index ebee551aa88..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/log4j.properties +++ /dev/null @@ -1,18 +0,0 @@ -# For JBoss: Avoid to setup Log4J outside $JBOSS_HOME/server/default/deploy/log4j.xml! -# For all other servers: Comment out the Log4J listener in web.xml to activate Log4J. -log4j.rootLogger=INFO, stdout, logfile - -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n - -log4j.appender.logfile=org.apache.log4j.RollingFileAppender -log4j.appender.logfile.File=${petclinic.root}/WEB-INF/petclinic.log -log4j.appender.logfile.MaxFileSize=512KB -# Keep three backup files. -log4j.appender.logfile.MaxBackupIndex=3 -# Pattern to output: date priority [category] - message -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n - -log4j.logger.org.springframework.samples.petclinic.aspects=DEBUG diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages.properties b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages.properties deleted file mode 100644 index 173417a1014..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages.properties +++ /dev/null @@ -1,8 +0,0 @@ -welcome=Welcome -required=is required -notFound=has not been found -duplicate=is already in use -nonNumeric=must be all numeric -duplicateFormSubmission=Duplicate form submission is not allowed -typeMismatch.date=invalid date -typeMismatch.birthDate=invalid date diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_de.properties b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_de.properties deleted file mode 100644 index 124bee48b2c..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_de.properties +++ /dev/null @@ -1,8 +0,0 @@ -welcome=Willkommen -required=muss angegeben werden -notFound=wurde nicht gefunden -duplicate=ist bereits vergeben -nonNumeric=darf nur numerisch sein -duplicateFormSubmission=Wiederholtes Absenden des Formulars ist nicht erlaubt -typeMismatch.date=ungültiges Datum -typeMismatch.birthDate=ungültiges Datum diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_en.properties b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_en.properties deleted file mode 100644 index 05d519bb86d..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/classes/messages_en.properties +++ /dev/null @@ -1 +0,0 @@ -# This file is intentionally empty. Message look-ups will fall back to the default "messages.properties" file. \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/geronimo-web.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/geronimo-web.xml deleted file mode 100644 index b5d88e1ecd2..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/geronimo-web.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - /petclinic - true - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp deleted file mode 100644 index 256cca17786..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp +++ /dev/null @@ -1,19 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - -<% -Exception ex = (Exception) request.getAttribute("exception"); -%> - -

Data access failure: <%= ex.getMessage() %>

-

- -<% -ex.printStackTrace(new java.io.PrintWriter(out)); -%> - -

-
-">Home - -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp deleted file mode 100644 index 52aaffc47e7..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp +++ /dev/null @@ -1,12 +0,0 @@ - -

- - - - -
">Home" alt="Sponsored by SpringSource"/>
- - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp deleted file mode 100644 index 49393d364c9..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - " type="text/css"/> - PetClinic :: a Spring Framework demonstration - - - - -
diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/includes.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/includes.jsp deleted file mode 100644 index 96c3e304cdb..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/includes.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/form.jsp deleted file mode 100644 index 1670a7c1bf5..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/form.jsp +++ /dev/null @@ -1,61 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - - - - - -

New Owner:

- - - - - - - - - - - - - - - - - - - - -
- First Name: -
- -
- Last Name: -
- -
- Address: -
- -
- City: -
- -
- Telephone: -
- -
- - -

- - -

- - -
- - -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/list.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/list.jsp deleted file mode 100644 index 44fc3cac0b8..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/list.jsp +++ /dev/null @@ -1,34 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - -

Owners:

- - - - - - - - - - - - - - - - - - -
NameAddressCityTelephonePets
- - - - ${owner.firstName} ${owner.lastName} - ${owner.address}${owner.city}${owner.telephone} - - ${pet.name}   - -
- -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/search.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/search.jsp deleted file mode 100644 index b972390a19f..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/search.jsp +++ /dev/null @@ -1,26 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - - -

Find Owners:

- - - - - - - - - - -
- Last Name: -
- -

- - -
-Add Owner - -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/show.jsp deleted file mode 100644 index 9767c18ae17..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners/show.jsp +++ /dev/null @@ -1,108 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> - -

Owner Information

- - - - - - - - - - - - - - - - - - -
Name${owner.firstName} ${owner.lastName}
Address${owner.address}
City${owner.city}
Telephone ${owner.telephone}
- - - - - -
- - - - Edit Owner - - - - - Add New Pet -
- -

Pets and Visits

- - - - - - - -
- - - - - - - - - - - - - -
Name${pet.name}
Birth Date
Type${pet.type.name}
- 		- - - - - - - - - - - -
Visit DateDescription
${visit.description}
-
- - - - - - - - -
- - - - - Edit Pet - - - - - - Add Visit - - - - - - Atom Feed -
- - -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/form.jsp deleted file mode 100644 index 459ec63b35d..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/form.jsp +++ /dev/null @@ -1,56 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - - - - - -

New Pet

- -Owner: ${pet.owner.firstName} ${pet.owner.lastName} -
- - - - - - - - - - - - - - -
- Name: -
- -
- Birth Date: -
- (yyyy-mm-dd) -
- Type: -
- -
- - -

- - -

- - -
- - - - -

- - - -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp deleted file mode 100644 index b1207a00f3e..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp +++ /dev/null @@ -1,68 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - -

New Visit:

- - - Pet: - - - - - - - - - - - - - -
NameBirth DateTypeOwner
${visit.pet.name}${visit.pet.type.name}${visit.pet.owner.firstName} ${visit.pet.owner.lastName}
- - - - - - - - - - - - - -
- Date: -
- 		- (yyyy-mm-dd) -
- Description: -
- 		- -
- -

-
- - -
-Previous Visits: - - - - - - - - - - - - - -
DateDescription
${visit.description}
- -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp deleted file mode 100644 index e97fdf37889..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - -

Internal error

-

- -<% -try { - // The Servlet spec guarantees this attribute will be available - Throwable exception = (Throwable) request.getAttribute("javax.servlet.error.exception"); - - if (exception != null) { - if (exception instanceof ServletException) { - // It's a ServletException: we should extract the root cause - ServletException sex = (ServletException) exception; - Throwable rootCause = sex.getRootCause(); - if (rootCause == null) - rootCause = sex; - out.println("** Root cause is: "+ rootCause.getMessage()); - rootCause.printStackTrace(new java.io.PrintWriter(out)); - } - else { - // It's not a ServletException, so we'll just show it - exception.printStackTrace(new java.io.PrintWriter(out)); - } - } - else { - out.println("No error information available"); - } - - // Display cookies - out.println("\nCookies:\n"); - Cookie[] cookies = request.getCookies(); - if (cookies != null) { - for (int i = 0; i < cookies.length; i++) { - out.println(cookies[i].getName() + "=[" + cookies[i].getValue() + "]"); - } - } - -} catch (Exception ex) { - ex.printStackTrace(new java.io.PrintWriter(out)); -} -%> - -

-
- - -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/vets.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/vets.jsp deleted file mode 100644 index cff2154f290..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/vets.jsp +++ /dev/null @@ -1,31 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - -

Veterinarians:

- - - - - - - - - - - - -
NameSpecialties
${vet.firstName} ${vet.lastName} - - ${specialty.name} - - none -
- - - - -
- ">View as XML -
- -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp deleted file mode 100644 index 1b07c65c3c2..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> - -" align="right" style="position:relative;right:30px;"> -

- - - -

 

- -<%@ include file="/WEB-INF/jsp/footer.jsp" %> diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml deleted file mode 100644 index 3c05fc30003..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/petclinic-servlet.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - pageNotFound - dataAccessFailure - dataAccessFailure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 06a6a311086..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - Spring PetClinic - - Spring PetClinic sample application - - - - webAppRootKey - petclinic.root - - - - - - - log4jConfigLocation - /WEB-INF/classes/log4j.properties - - - - - contextConfigLocation - - /WEB-INF/applicationContext-jdbc.xml - - - - - - - - - - - - org.springframework.web.context.ContextLoaderListener - - - - - default - /static/* - - - - - petclinic - org.springframework.web.servlet.DispatcherServlet - 2 - - - - - petclinic - / - - - - httpMethodFilter - org.springframework.web.filter.HiddenHttpMethodFilter - - - - httpMethodFilter - petclinic - - - - 10 - - - - java.lang.Exception - - /WEB-INF/jsp/uncaughtException.jsp - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html b/org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html deleted file mode 100644 index 27bd0f37591..00000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/html/tutorial.html +++ /dev/null @@ -1,1149 +0,0 @@ - - - - The Spring PetClinic Application - - - - - - -
- -

The Spring PetClinic Application

- - - - - - - -
Updated:11.OCT.2009Sam Brannen (Work In Progress: not yet fully updated regarding Spring 3.0)
21.OCT.2007Sam Brannen
30.JUN.2006Costin Leau
01.DEC.2004Ken Krebs
16.AUG.2003Ken Krebs
- - - -

Introduction

- -

- The Spring Framework is a collection of small, well-focused, loosely coupled Java - frameworks that can be used independently or collectively to build - industrial strength applications of many different types. The PetClinic - sample application is designed to show how the Spring - application frameworks can be used to build simple, but powerful - database-oriented applications. It will demonstrate the use - of Spring's core functionality: -

- -
    -
  • JavaBeans based application configuration using Inversion-Of-Control
    • -
  • Model-View-Controller web Presentation Layer
    • -
  • Practical database access through JDBC, Hibernate, or Java Persistence API
    • -
  • Application monitoring based on JMX
    • -
  • Declarative Transaction Management using AOP
    • -
  • Data Validation that supports but is not dependent on the Presentation Layer
    • -
- -

- The Spring frameworks provide a great deal of useful infrastructure to - simplify the tasks faced by application developers. This infrastructure - helps developers to create applications that are: -

- -
    -
  • - concise - by handling a lot of the complex control flow that is needed to use the - Java API's, such as JDBC, JNDI, JTA, RMI, and EJB. -
    • -
  • - flexible - by simplifying the process of external application configuration - through the use of Reflection and JavaBeans. This allows the developer to - achieve a clean separation of configuration data from application code. - All application and web application objects, including validators, - workflow controllers, and views, are JavaBeans that can be configured - externally.
    • -
  • - testable - by supplying an interface based design to maximize pluggability. This - facilitates unit testing of Business Logic without requiring the - presence of application or live database servers.
    • -
  • - maintainable - by facilitating a clean separation of the application layers. It most - importantly helps maintain the independence of the Business Layer - from the Presentation layer. PetClinic demonstrates the use of a - Model-View-Controller - based web presentation framework that can work seamlessly with many - different types of view technologies. The Spring web application - framework helps developers to implement their Presentation as a clean - and thin layer focused on its main missions of translating user actions - into application events and rendering model data.
    • -
- -

- It is assumed that users of this tutorial will have a basic knowledge - of object-oriented design, Java, Servlets, JSP, and relational - databases. It also assumes a basic knowledge of the use of a Java EE web - application container. -

- -

- Since the purpose of the sample application is tutorial in nature, the - implementation presented here will of course provide only a small - subset of the functionality that would be needed by a real world version of a - PetClinic application. -

- - -

PetClinic Sample Application Requirements

- -

- The application requirement is for an information system that is - accessible through a web browser. The users of the application are - employees of the clinic who in the course of their work need to view - and manage information regarding the veterinarians, the clients, and their - pets. The sample application supports the following: -

- -

Use Cases

-
    -
  • View a list of veterinarians and their specialties
    • -
  • View information pertaining to a pet owner
    • -
  • Update the information pertaining to a pet owner
    • -
  • Add a new pet owner to the system
    • -
  • View information pertaining to a pet
    • -
  • Update the information pertaining to a pet
    • -
  • Add a new pet to the system
    • -
  • View information pertaining to a pet's visitation history
    • -
  • Add information pertaining to a visit to the pet's visitation history
    • -
- -

Business Rules

-
    -
  1. An owner may not have multiple pets with the same case-insensitive name.
    2. -
- - -

PetClinic Sample Application Design & Implementation

- -

Server Technology

-

- The sample application should be usable with any Java EE web application - container that is compatible with the Servlet 2.4 and JSP 2.0 - specifications. Some of the deployment files provided are designed - specifically for Apache Tomcat. These files specify container-supplied - connection-pooled data sources. It is not necessary to use these files. - The application has been configured by default to use a data source - with connection pooling. Configuration details are - provided in the Developer Instructions section. The view technologies - that are to be used for rendering the application are Java Server Pages - (JSP) along with the Java Standard Tag Library (JSTL). -

- -

Database Technology

-

- The sample application uses a relational database for data storage. - Support has been provided for a choice of 1 of 2 database selections, - MySql or HypersonicSQL. HypersonicSQL version 1.8.0 is the default - choice. It is possible to - easily configure the application to use either database. Configuration - details are provided in the Developer Instructions section. -

- -

Development Environment

-

- A copy of the Spring runtime library jar file is provided with the - sample application along with some of the other required jar files. The - developer will need to obtain the following tools externally, all of - which are freely available: -

- -
    -
  • Java SDK 1.5.x
    • -
  • Ant 1.7.x
    • -
  • Tomcat 6.x.x, or some other Java Servlet container
    • -
  • (Optional) MySQL 5.x with MySQL Connector/J 5.x
    • -
- -

- NOTE: The version numbers listed are those that were used - in the development of the PetClinic application. Other versions of the same - tools may or may not work. -

- -

- Download links for the various tools needed are provided in the Developer - Instructions section. -

- -

PetClinic Database

-

- The following is an overview of the database schema used in PetClinic. - Detailed field descriptions can be found in the - "initDB.txt" - SQL script files in the database-specific "db" sub-directories. All "id" key - fields are of Java type int. -

- -

- TABLE: owners
-     PRIMARY KEY id -

- -

- TABLE: types
-     PRIMARY KEY id -

- -

- TABLE: pets
-     PRIMARY KEY id
-     FOREIGN KEY type_id - references the types - table id field
-     FOREIGN KEY owner_id - references the owners - table id field -

- -

- TABLE: vets
-     PRIMARY KEY id -

- -

- TABLE: specialties
-     PRIMARY KEY id
-

- -

- TABLE: vet_specialties - - a link table for vets - and their specialties
-     FOREIGN KEY vet_id - references the vets - table id field
-     FOREIGN KEY specialty_id - references the specialties - table id field -

- -

- TABLE: visits
-     PRIMARY KEY id
-     FOREIGN KEY pet_id - references the pets - table id field -

- -

Directory Structure

- -

- d-- indicates a directory holding source code, configuration files, etc.
- D-- indicates a directory that is created by the build script -

- -

- d-- petclinic: - the root directory of the project contains build related files
- -     d-- src: contains - Java source code files and ORM configuration files
- -     d-- war: contains - the web application resource files
- -         d-- html: contains - tutorial files
- -         D-- docs: contains - Javadoc files
- -         d-- web-inf: - contains web application configuration files and application context - files
- -               - d-- jsp: - contains Java Server Page files
- -               - D-- lib: - contains application dependencies
- -     d-- test: contains - testing related - Java source code files
- -     d-- db: contains - database SQL scripts and other related files/directories
- -         d-- hsqldb: - contains files related to HSQL, contains scripts and a Tomcat - context definition file
- -         d-- mysql: - contains files related to MySQL, contains scripts and a Tomcat context - definition file
- -     D-- .classes: - contains compiled Java class files
- -     D-- .testclasses: - contains compiled testing related Java class files
- -     D-- junit-reports: - contains generated xml-formatted test reports
- -          D-- reports/html: - contains generated html-formatted test reports
- -     D-- dist: contains - packaged archives of files -

- - -

PetClinic Application Design

- -

Logging

-

- Spring supports the use of the Apache Commons Logging API. This API - provides the ability to use Java 1.4 loggers, the simple Commons loggers, - and Apache log4j loggers. PetClinic uses log4j to provide sophisticated - and configurable logging capabilities. The file, - src/main/resources/log4j.properties - configures the definition of log4jloggers. -

- -

Business Layer

-

- The Business Layer consists of a number of basic JavaBean classes - representing the application domain objects and associated validation - objects that are used by the Presentation Layer. The validation objects - used in PetClinic are all implementations of the - org.springframework.validation.Validator interface. -

- -
    -
  • org.springframework.samples.petclinic.Entity - is a simple JavaBean superclass used for all persistable objects.
    • -
  • org.springframework.samples.petclinic.NamedEntity - is an extension of Entity that adds a name property.
    • -
  • org.springframework.samples.petclinic.Specialty - is an extension of NamedEntity.
    • -
  • org.springframework.samples.petclinic.PetType - is an extension of NamedEntity.
    • -
  • org.springframework.samples.petclinic.Person is - an extension of Entity that provides a superclass for all objects that - implement the notion of a person.
    • -
  • org.springframework.samples.petclinic.Vet is - an extension of Person that implements a - veterinarian. It holds a List of - specialties that the Vet is capable of.
    • -
  • org.springframework.samples.petclinic.Owner - is an extension of Person that implements a pet owner. - It holds a List of pets owned.
    • -
  • org.springframework.samples.petclinic.Pet - is an extension of NamedEntity that - implements a pet. It holds a List of - visits made concerning the pet.
    • -
  • org.springframework.samples.petclinic.Visit - is a simple JavaBean that implements the notion of a clinic visit - for a pet.
    • -
  • org.springframework.samples.petclinic.util.EntityUtils - provides utility methods for handling entities.
    • -
- -
    -
  • org.springframework.samples.petclinic.validation.OwnerValidator - is a Spring Validator that - verifies correct data entry for the Add and Edit Owner forms.
    • -
  • org.springframework.samples.petclinic.validation.PetValidator - is a Spring Validator that - verifies correct data entry for the Add and Edit Pet forms.
    • -
  • org.springframework.samples.petclinic.validation.VisitValidator - is a Spring Validator that - verifies correct data entry for the AddVisit form.
    • -
- -

Business / Persistence Layer

- -

- Since the PetClinic application is all about database access and there is - very little business logic in the application outside of that, there is - no separation of the primary Business and Persistence Layer API's. - While this design technique should not be used for an application with more - complex business logic, it is acceptable here because all of the - non-persistence related business rules have been implemented in - business objects and have not leaked into the Persistence Layer. The most - important facet of the design is that the Business and Persistence - Layers are COMPLETELY independent of the Presentation Layer. -

- -

- The Persistence Layer can be configured to use either HSQL or MySQL - with any one of the following data access technologies aided by - infrastructure provided by Spring: -

- -
    -
  • JDBC
    • -
  • Hibernate 3
    • -
  • Java Persistence API
    • -
- -

- NOTE: Spring also provides - infrastructure for using other - Object/Relational Mapping - frameworks such as JDO and iBATIS SqlMaps, but these are not demonstrated in PetClinic. - (See the 'jpetstore' sample application that ships with the full Spring Framework - distribution for an example of using iBatis and Spring.) -

- -

- One of the key elements provided by Spring is the use of a common set - of meaningful data access exceptions that can be used regardless of - which database or access strategy is used. All of these exceptions - derive from org.springframework.dao.DataAccessException. - Since most exceptions encountered during database access are indicative - of programming errors, DataAccessException is an - abstract RuntimeException whose derivatives only need - to be caught by application code to handle recoverable errors when it - makes sense to do so. This greatly simplifies application code compared - to, for example, code using JDBC directly where SqlExceptions - must be caught and database specific error codes must be decoded. - Examination of the PetClinic source code will show that the - persistence-oriented code is completely focused on the relevant - transfer of data to/from the referenced objects without extraneous - error handling. -

- -

- The high-level business/persistence API for PetClinic is the - org.springframework.samples.petclinic.Clinic - interface. Each persistence strategy in PetClinic is a different implementation of the - Clinic interface. In each case, the - Clinic implementation is fronted by - a transactional proxy, configured via the - @Transactional annotation, that also - implements Clinic. These objects - are standard Java dynamic proxies which are created by an instance of - org.springframework.transaction.interceptor.TransactionProxyFactoryBean. - These proxies are configured in the respective application context file - via <tx:annotation-driven /> and specify that all - Clinic methods are run in a - transactional context. The transaction managers used in PetClinic are all - implementations of the - org.springframework.transaction.PlatformTransactionManager - interface. All of the implementations are by default configured - to use a local DataSource that - will work in any environment through the use of an instance of - org.springframework.jdbc.datasource.DriverManagerDataSource. - While this is appropriate for use in a demo or single user - program, a connection pooling DataSource, - such as an instance of org.apache.commons.dbcp.BasicDataSource, - is more appropriate for use in a multi-user application. Another - alternative is to obtain one through the Java EE environment - using an instance of - org.springframework.jndi.JndiObjectFactoryBean. -

- -

JDBC Clinic Implementation

-

- Spring provides a number of high-level database - access convenience classes in the package - org.springframework.jdbc.object. - These classes and the lower-level Spring classes that they use in the - org.springframework.jdbc.core package - provide a higher level of abstraction for using JDBC that keeps the developer - from having to correctly implement the handling of the checked - SqlExceptions with ugly error-prone - nested try-catch-finally blocks. Using the classes in this package - allows the developer to focus efforts on the functionality being - implemented rather than the mechanics of error handling. When using - these classes, it is the responsibility of the developer to provide the - SQL needed and to map the parameters to/from the respective domain - object. This typically is done by extending one of the - org.springframework.jdbc.object classes, - initializing its SQL, and overriding a method that takes care of - the mapping. In this way, the developer gets to focus on implementing - functionality rather than application plumbing. These classes also - take care of closing connections to prevent hard to find resource - leakage problems. It should be noted that instances of these classes - are lightweight, reusable, and threadsafe. -

- -

- The JDBC implementation of the Clinic interface is - org.springframework.samples.petclinic.jdbc.SimpleJdbcClinic, - which uses Java 5 language features, - org.springframework.jdbc.core.simple.SimpleJdbcTemplate, and - org.springframework.jdbc.core.simple.SimpleJdbcInsert. - It also takes advantage of classes like - org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource and - org.springframework.jdbc.core.simple.ParameterizedBeanPropertyRowMapper - which provide automatic mapping between JavaBean properties and JDBC - parameters or query results. SimpleJdbcClinic is a rewrite of the - AbstractJdbcClinic which was the base class for JDBC implementations of - the Clinic interface for Spring 2.0. -

- -

- The transaction manager used in the JDBC Clinic Implementation is an - instance of org.springframework.jdbc.datasource.DataSourceTransactionManager - that can be used for local transactions. -

- -

Hibernate 3 Clinic Implementation

-

- The Hibernate 3 implementation of the Clinic - interface is - org.springframework.samples.petclinic.hibernate.HibernateClinic. - To simplify using Hibernate, Spring provides the - org.springframework.orm.hibernate3.LocalSessionFactoryBean. - The Hibernate configuration is provided by the file src/main/resources/petclinic.hbm.xml. -

- -

Java Persistence API (JPA) Clinic Implementation

-

- The JPA implementation of the Clinic - interface is - org.springframework.samples.petclinic.jpa.EntityManagerClinic, - which is based on native JPA usage combined with Spring's - @Repository and - @Transactional annotations but - otherwise has no dependencies on any Spring API's. - To simplify JPA usage, Spring provides (among other classes) the - org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean. - The JPA configuration is provided by - src/main/resources/META-INF/orm.xml and - src/main/resources/META-INF/persistence.xml. -

- -

ApplicationContext

-

- A Spring org.springframework.context.ApplicationContext object - provides a map of user-defined JavaBeans that specify either a singleton - object or the initial construction of prototype instances. These beans - constitute the Business/Persistence - Layer of PetClinic. The following beans are defined in all 3 - versions (1 per access strategy) of the PetClinic - src/main/webapp/WEB-INF/applicationContext-*.xml - file: -

- -
    -
  1. A PropertyPlaceholderConfigurer, - which is configured via - <context:property-placeholder ... /> and - is a singleton bean that replaces ${...} placeholders with values from a - properties file, in this case, JDBC-related settings for the - dataSource bean - described below - (see src/main/resources/jdbc.properties). -
    2. -
  2. dataSource, - which is a singleton bean that defines the implementation of the source - of database connections used by the application. -
    3. -
  3. transactionManager, - which is a singleton bean that defines the implementation of the transaction - management strategy for the application. -
    4. -
  4. clinic, - which is a singleton bean that defines the implementation of the - Clinic interface that provides the - primary Business Layer API of the application. -
    5. -
- -

Presentation Layer

-

- The Presentation Layer is implemented as a Java EE Web Application and - provides a very thin and concise Model-View-Controller type user - interface to the Business and Persistence Layers. -

- -

- The PetClinic web application is configured via the following files: -

- -
    -
  • src/main/webapp/WEB-INF/web.xml: - the web application configuration file.
    • -
  • src/main/webapp/WEB-INF/petclinic-servlet.xml: - configures the petclinic dispatcher servlet and the other controllers - and forms that it uses. The beans defined in this file reference the - Business/Persistence Layer beans defined in - applicationContext-*.xml.
    • -
  • src/main/resources/messages*.properties: - configures the definition of internationalizable message resources.
    • -
- -

- Examine the comments provided in each of these files for a more - in-depth understanding of the details of how the application is - configured. -

- -

General

- -
    -
  • In web.xml, - a context-param, "webAppRootkey", - provides the key for a system property that specifies the root directory - for the web application. This parameter, - "petclinic.root", can be used to aid - in configuring the application.
    • -
  • In web.xml, - a org.springframework.web.context.ContextLoaderListener - is defined that loads the root ApplicationContext - object of this webapp at startup, by default from the designated - /WEB-INF/applicationContext-*.xml. - The root org.springframework.web.context.WebApplicationContext - of PetClinic is an instance of - org.springframework.web.context.support.XmlWebApplicationContext - and is the parent of all servlet-specific ApplicationContexts. - The Spring root ApplicationContext object - provides a map of user-defined JavaBeans that can be used in any and - all layers of the application. Beans defined in the root - ApplicationContext are automatically - available in all child ApplicationContext - objects as (external) bean references. Beans defined in an - ApplicationContext can also be - accessed directly by Java code through - getBean(name) method calls. -
    • - -
  • In web.xml, - a Servlet named - "petclinic" is specified to act as - a dispatcher for the entire application. This - org.springframework.web.servlet.DispatcherServlet - is used to handle all URL's matching the pattern "*.do". - As with any Servlet, multiple URL mappings may - be defined. It is also possible to define multiple instances of - DispatcherServlet. Each - DispatcherServlet dispatches - requests to registered handlers (Controller - interface implementations or POJOs annotated with @Controller) - indirectly through a - org.springframework.web.servlet.handler.HandlerMapping - implementation. Each DispatcherServlet - has its own ApplicationContext, - by default defined in "{servlet-name}-servlet.xml". - In this case, it is in the file "petclinic-servlet.xml". - This ApplicationContext is - used to specify the various web application user interface beans and - the URL mappings that are used by the DispatcherServlet - to control the handling of requests. -
    • -
- -

- The files web.xml and - log4j.properties specify - the configuration of logging in the system: -

- -
    -
  • In web.xml, - a "log4jConfigLocation" context-param - is specified that sets the location of the - log4j configuration file. The - default location for this file is - /WEB-INF/classes/log4j.properties. - Specifying this parameter explicitly allows the location to be changed - from the default and is also used to cause periodic - log4j configuration refresh checks.
    • -
  • In web.xml, - a Log4jConfigListener is - specified that will initialize log4j using - the specified configuration file when the web app starts. The - Log4jConfigListener is commented out - in the file because of a conflict when using JBoss. It should also be - noted that if the container initializes Servlets before Listeners as - some pre-Servlet 2.4 containers do, a Log4jConfigServlet should - be used instead.
    • -
  • In log4j.properties, - the following loggers are specified: -
      -
    • "stdout" provides - logging messages to the container's log file.
      • -
    • "logfile" provides - logging messages to a rolling file that is specified using the - previously defined "petclinic.root".
      • -
    -
    • -
- -

- Examination and study of these logging files will provide insight into - the operation of the Spring framework and the application as well as - valuable troubleshooting information should something not work - correctly. -

- -

DispatcherServlet

-

- The following beans are accessible to the - DispatcherServlet and are defined - in the PetClinic - petclinic-servlet.xml - file. This dispatcher uses these definitions to delegate actual display - and form processing tasks to implementations of the Spring - org.springframework.web.servlet.mvc.Controller - interface. The DispatcherServlet - acts as the main application Front Controller - and is responsible for dispatching all requests to the appropriate - Controller indirectly through a URL - mapping handler. These Controllers are - responsible for the mechanics of interaction with the user and ultimately - delegate action to the Business/Persistence Layers. -

- -
    -
  • - messageSource - is a singleton bean that defines a message source for this - ApplicationContext. Messages are - loaded from localized "messages_xx" - files in the classpath, such as - "/WEB-INF/classes/messages.properties" - or "/WEB-INF/classes/messages_de.properties". - getMessage() calls to this context - will use this source. Child contexts can have their own message sources, - which will inherit all messages from this source and are able to define new - messages and override ones defined in the primary message source. -
    • -
  • - InternalResourceViewResolver - is a singleton bean that defines the view mappings used by the dispatcher. - Specifically, logical view names returned by Controllers will be mapped to - physical paths using the configured 'prefix' and 'suffix' properties. For - example, a logical view name of "vets" will be mapped to "/WEB-INF/jsp/vets.jsp". -
    • -
  • - SimpleMappingExceptionResolver - is a singleton bean that defines how exceptions are propagated. Exceptions - encountered that are not specified are propagated to the servlet container. -
    • -
  • - <context:component-scan ... /> - is used to autodetect the controllers in the - org.springframework.samples.petclinic.web package, which - are POJOs labeled with the @Controller annotation. -
      -
    • - ClinicController is a singleton, annotation-driven - MultiActionController that is used by the dispatcher to handle - non-form based display tasks. A method is provided to handle each - type of request that is supported. -
      • -
    • - In addition, there are 6 singleton, annotation-driven Form controllers, - which are used to handle the various Search, Add and Edit form processing - tasks for the dispatcher. -
      • -
    -
    • -
  • - The form-based controllers within the PetClinic application provide - @RequestMapping annotations at the type level for path - mapping URLs and @RequestMapping at the method level for request type - mappings (e.g., GET and POST). In contrast, ClinicController - – which is not form-based – provides @RequestMapping only at - the method level for path mapping URLs. - DefaultAnnotationHandlerMapping is driven by these - annotations and is enabled by default with Java 5+. -
    • -
- -

Views

-

- The Controllers used by the - dispatcher handle the work flow of the application. The actual display - tasks are delegated by the Controllers - to implementations of the Spring View - interface. These View objects are - themselves beans that can render a particular type of view. The - handling Controller supplies the - View with a data model to render. - The data model is provided to the View - as a Map of objects. - Views are only responsible for - rendering a display of the data model and performing any display logic - that is particular to the type of View - being rendered. Spring provides support for rendering many different types of - views: JSP, XSLT, PDF, Velocity templates, Excel files, and others. By - using a View mapping strategy, - Spring supplies the developer with a great deal of flexibility in supporting - easily configurable view substitution. -

-

- ClinicController relies on - RequestToViewNameTranslator to automatically infer the - logical view name from the incoming request URL; whereas, all Form - controllers in the PetClinic application return logical view names as Strings. - These logical view names are then mapped to physical paths via the - configured InternalResourceViewResolver (see the - DispatcherServlet section above for further details). Logical view names that - are prepended with "redirect:" will be resolved to instances - of RedirectView, which simply redirects to another URL. - The other resolved Views will be instances of - JstlView, which provides some handy support for - internationalization & localization in JSP pages that use JSTL. -

- -

Messages

-

- The messages*.properties - files are loaded from the classpath to provide localized messages for - the supported languages. PetClinic supplies a localized - "welcome" message as well as localized form entry error - messages in the default (i.e., English) and German properties files. - See the "countries" sample application for a more detailed example of Spring's - support for internationalization. -

- -

Presentation Layer classes

-
    -
  • - org.springframework.samples.petclinic.web.ClinicController - is an annotation-driven, POJO MultiActionController - that is used to handle simple display-oriented URLs. -
    • -
  • - org.springframework.samples.petclinic.web.FindOwnersForm - is an annotation-driven, POJO Form controller that is used to search for - Owners by last name. -
    • -
  • - org.springframework.samples.petclinic.web.AddOwnerForm - is an annotation-driven, POJO Form controller that is used to add a new Owner - to the system. -
    • -
  • - org.springframework.samples.petclinic.web.EditOwnerForm - is an annotation-driven, POJO Form controller that is used to edit an existing Owner. - A copy of the existing Owner is used for editing. -
    • -
  • - org.springframework.samples.petclinic.web.AddPetForm - is an annotation-driven, POJO Form controller that is used to add a new Pet - to an existing Owner. -
    • -
  • - org.springframework.samples.petclinic.web.EditPetForm - is an annotation-driven, POJO Form controller that is used to edit an existing Pet. - A copy of the existing Pet is used for editing. -
    • -
  • - org.springframework.samples.petclinic.web.AddVisitForm - is an annotation-driven, POJO Form controller that is used to add a new Visit - to an existing Pet. -
    • -
- -

Logical Views & Implemented Use Cases

- -
    -
  • welcome is - the "home" screen. It provides links to display a list of all vets, - find an owner, or view documentation.
    • -
  • vets displays - all vets and their specialties.
    • -
  • findOwners - is used to find owners by last name.
    • -
  • findOwnersRedirect - redirects to findOwner.
    • -
  • selectOwner - allows user to select from a list of multiple owners with the same last - name.
    • -
  • owner displays - a owner's data and a list of the owner's pets and their data.
    • -
  • ownerRedirect - redirects to owner.
    • -
  • owner supports - AddOwnerForm - and EditOwnerForm
    • -
  • pet supports - AddPetForm - and web.EditPetForm
    • -
  • visit supports - AddVisitForm
    • -
  • dataAccessFailure - displays a stacktrace
    • -
- -

Java Server Pages

- -
    -
  • index.jsp - redirects to the "welcome" page.
    • -
  • includes.jsp is - statically included in all - JSP's used in the application. It specifies the taglibs that are in use.
    • -
  • header.jsp and - footer.jsp - display info common to virtually all pages. Spring also supplies - support for the integration of Tiles - (included in Struts) but this is not used in PetClinic.
    • -
  • dataAccessFailure.jsp - is the error page configured via - SimpleMappingExceptionResolver, - which displays a stack trace and normally wouldn't be used in a production - version of an application. It can be seen in action by entering a URL of - "editOwner.do" or "editPet.do" with an invalid request parameter, for example: - /petclinic/owner.do?ownerId=-1. - The handlers for these URLs normally expect to see a respective "ownerId" or "petId" - request parameter corresponding to an Owner or Pet in the database. Thus, - these handlers will throw a DataAccessException when such - a request parameter is provided which references a non-existing entity.
    • -
  • uncaughtException.jsp - is the web.xml configured - "error-page". It displays a stack trace and normally wouldn't be used - in a production version of an application. It can be seen in action by - entering a URL of "editOwner.do" or "editPet.do" without a valid request - parameter, for example: - /petclinic/owner.do. - The handlers for these URLs normally expect to see a respective "ownerId" or "petId" - request parameter and throw a ServletException when such - a request parameter is not found.
    • -
  • welcome.jsp implements - welcome.
    • -
  • vets.jsp implements - vets.
    • -
  • findOwners.jsp implements - findOwners.
    • -
  • owners.jsp implements - selectOwner.
    • -
  • owner.jsp implements - owner.
    • -
  • ownerForm.jsp implements - ownerForm.
    • -
  • petForm.jsp implements - petForm.
    • -
  • visitForm.jsp implements - visitForm.
    • -
- -

- The following items should be noted regarding the web application - implementation design: -

- -
    -
  1. all JSP's are stored under /WEB-INF/jsp except - for index.jsp which - is the configured "welcome-file"
    2. -
  2. The use of JSP technology in the application is not exposed to - the user, i.e., the end user never sees a URL ending in - ".jsp".
    3. -
  3. By convention, all URL's in the application ending in - ".do" are - handled by web application controllers. Static html pages ending in - ".html", such as - Javadoc, will be directly served to the end user.
    4. -
  4. The results of all form entries are handled using browser round - trip redirection to minimize possible end user confusion.
    5. -
  5. All pages are extremely simple JSP implementations that focus - only on providing the necessary functionality.
    6. -
  6. References to Entity objects - are passed around in the application by supplying the object's ID - as a request parameter.
    7. -
- -

Testing

-
    -
  • org.springframework.samples.petclinic.OwnerTests - is a simple JUnit 4 based TestCase that supports Business Rule #1.
    • -
  • org.springframework.samples.petclinic.AbstractClinicTests - is a JUnit 4 based TestCase requiring a live database connection that is - used to confirm correct operation of the database access objects in the - various implementations of the Clinic interface. - "AbstractClinicTests-context.xml" declares a common - javax.sql.DataSource. Subclasses specify additional - context locations which declare a - org.springframework.transaction.PlatformTransactionManager - and a concrete implementation of Clinic. -

    - AbstractClinicTests extends - AbstractTransactionalJUnit4SpringContextTests, - one of the valuable testing support classes provided by the - Spring TestContext Framework found in the - org.springframework.test.context package. The - annotation-driven configuration used here represents best practice for - integration tests with Spring. Note, however, that - AbstractTransactionalJUnit4SpringContextTests serves only as a convenience - for extension. For example, if you do not wish for your test classes to be - tied to a Spring-specific class hierarchy, you may configure your tests with - annotations such as @ContextConfiguration, - @TestExecutionListeners, @Transactional, etc. -

    -

    - AbstractClinicTests and its subclasses benefit from the following services - provided by the Spring TestContext Framework: -

    -
      -
    • Spring IoC container caching which spares us - unnecessary set up time between test execution.
      • -
    • Dependency Injection of test fixture instances, - meaning that we don't need to perform application context lookups. See the - use of @Autowired on the clinic instance - variable, which uses autowiring by type. As an alternative, we - could annotate clinic with JSR 250's - @Resource to achieve dependency injection by name. - (see: @ContextConfiguration, - DependencyInjectionTestExecutionListener)
      • -
    • Transaction management, meaning each test method is - executed in its own transaction, which is automatically rolled back by - default. Thus, even if tests insert or otherwise change database state, there - is no need for a teardown or cleanup script. - (see: @TransactionConfiguration, - @Transactional, TransactionalTestExecutionListener)
      • -
    • Useful inherited protected fields, such as a - SimpleJdbcTemplate that can be used to verify - database state after test operations or to verify the results of - queries performed by application code. An - ApplicationContext is also inherited and can be - used for explicit bean lookup if necessary. - (see: AbstractJUnit4SpringContextTests, - AbstractTransactionalJUnit4SpringContextTests)
      • -
    -

    - The Spring TestContext Framework and related unit and - integration testing support classes are shipped in - spring-test.jar. -

    - -
    • -
- -

Downloads

-
    -
  • Download and install the - Spring Framework - (the PetClinic sample application is included)
    • -
  • Download and install a Java - Software Developer Kit, version 1.5 or later
    • -
  • Download and install Apache Ant, - preferably version 1.7.1 or later
    • -
  • Download and install Apache Tomcat, - preferably version 6.0.20 or later
    • -
  • Download and install MySQL, - preferably version 5.1.x or later (optional)
    • -
  • Hypersonic SQL, and - Hibernate are provided with the - application.
    • -
  • PetClinic and Spring use the Apache - Commons Logging - and log4j - packages.
    • -
- -

Ant Setup

-

- Make sure that the Ant executable is in your command shell path. -

- -

MYSQL Setup (optional)

-

- Add the PetClinic database to a running MySQL server by following the - explicit instructions found in - db/mysql/petclinic_db_setup_mysql.txt. - PetClinic expects by default to be able to access the server via the - standard port 3306. To use a different port, it will be - necessary to change the PetClinic Database Setup. -

- -

PetClinic Database Setup

-

- To use a Java EE server supplied connection-pooled data source with - Tomcat, it will be necessary to use and possibly edit the appropriate - context definition file for the petclinic webapp. To use it, deploy a - copy of the appropriate context definition file in Tomcat's webapps - directory and restart the server. Consult the Tomcat log files if - something goes wrong when starting either Tomcat or the PetClinic - application. The context files are named - petclinic_tomcat_*.xml, - where * is either "hsqldb" or "mysql". - There is a context file supplied for each - database in its respective directory. There is also a context file - db/petclinic_tomcat_all.xml - that will provide a JNDI connection-pooled DataSource for all supported - databases. Should you use this file, you must of course make sure that all the - database servers are running when you restart Tomcat. -

- -

- - NOTES: -

- -
    -
  1. Should you deploy one of the context files or define a context in - Tomcat's server.xml, - Tomcat will not automatically deploy the webapp from the - petclinic.war file. - The webapp will then need to be manually extracted to the target - directory.
    2. -
  2. The context files will also configure logging to supply a - separate log file for the petclinic context. This will separate the - container logging for petclinic from that of the other webapps. This - should not be confused with the application log file provided through - log4j.
    3. -
  3. An Ant script (db/build.xml) - has been provided that can be used to re-initialize either database. To - select or configure the data source and database used for the webapp and - for testing, you will need to edit the following files: -
      -
    • src/main/webapp/WEB-INF/applicationContext-*.xml: - for configuring the DataSource in the webapp
      • -
    • src/main/resources/jdbc.properties: - for configuring JDBC connection settings for both the webapp and testing
      • -
    • build.properties: - for running the "tests" target in Ant
      • -
    -
    4. -
- -

Building the PetClinic Application

-

- Open a command line shell and navigate to the directory containing - PetClinic and execute "ant -p". This will display a list of the Ant - targets that are available. Make sure the database is running and execute - "ant clean test". This will run clean and compile everything - and execute the tests, including integration tests against an in-memory - database. -

- -

Deploying the PetClinic Application

-

- Deploy the web application to the server in the usual way (see - notes regarding database setup). If you need - instructions for web application deployment, see the Tomcat - documentation for details. The Web Application aRrchive file is - org.springframework.samples.petclinic.war - and can be found in the - target/artifacts directory. -

- -

Using the PetClinic Application

-

- Make sure the PetClinic web application is running and browse to - http://localhost:8080/org.springframework.samples.petclinic/. -

- - - - - - -
Home
-
- - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png b/org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png deleted file mode 100644 index e6d01d5885266efbf4dc99431576a13dee5725e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13773 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 diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png b/org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png deleted file mode 100644 index e170f8abf778b24ed1de11dad6f1444e849269ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4974 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 WST*12Q+YoC0000 - * Base class for {@link Clinic} integration tests. - *

- *

- * "AbstractClinicTests-context.xml" declares a common - * {@link javax.sql.DataSource DataSource}. Subclasses should specify - * additional context locations which declare a - * {@link org.springframework.transaction.PlatformTransactionManager PlatformTransactionManager} - * and a concrete implementation of {@link Clinic}. - *

- *

- * This class extends {@link AbstractTransactionalJUnit4SpringContextTests}, - * one of the valuable testing support classes provided by the - * Spring TestContext Framework found in the - * org.springframework.test.context package. The - * annotation-driven configuration used here represents best practice for - * integration tests with Spring. Note, however, that - * AbstractTransactionalJUnit4SpringContextTests serves only as a convenience - * for extension. For example, if you do not wish for your test classes to be - * tied to a Spring-specific class hierarchy, you may configure your tests with - * annotations such as {@link ContextConfiguration @ContextConfiguration}, - * {@link org.springframework.test.context.TestExecutionListeners @TestExecutionListeners}, - * {@link org.springframework.transaction.annotation.Transactional @Transactional}, - * etc. - *

- *

- * AbstractClinicTests and its subclasses benefit from the following services - * provided by the Spring TestContext Framework: - *

- *
    - *
  • Spring IoC container caching which spares us - * unnecessary set up time between test execution.
    • - *
  • Dependency Injection of test fixture instances, - * meaning that we don't need to perform application context lookups. See the - * use of {@link Autowired @Autowired} on the clinic instance - * variable, which uses autowiring by type. As an alternative, we - * could annotate clinic with - * {@link javax.annotation.Resource @Resource} to achieve dependency injection - * by name. - * (see: {@link ContextConfiguration @ContextConfiguration}, - * {@link org.springframework.test.context.support.DependencyInjectionTestExecutionListener DependencyInjectionTestExecutionListener})
    • - *
  • Transaction management, meaning each test method is - * executed in its own transaction, which is automatically rolled back by - * default. Thus, even if tests insert or otherwise change database state, there - * is no need for a teardown or cleanup script. - * (see: {@link org.springframework.test.context.transaction.TransactionConfiguration @TransactionConfiguration}, - * {@link org.springframework.transaction.annotation.Transactional @Transactional}, - * {@link org.springframework.test.context.transaction.TransactionalTestExecutionListener TransactionalTestExecutionListener})
    • - *
  • Useful inherited protected fields, such as a - * {@link org.springframework.jdbc.core.simple.SimpleJdbcTemplate SimpleJdbcTemplate} - * that can be used to verify database state after test operations or to verify - * the results of queries performed by application code. An - * {@link org.springframework.context.ApplicationContext ApplicationContext} is - * also inherited and can be used for explicit bean lookup if necessary. - * (see: {@link org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests AbstractJUnit4SpringContextTests}, - * {@link AbstractTransactionalJUnit4SpringContextTests})
    • - *
- *

- * The Spring TestContext Framework and related unit and integration testing - * support classes are shipped in spring-test.jar. - *

- * - * @author Ken Krebs - * @author Rod Johnson - * @author Juergen Hoeller - * @author Sam Brannen - */ -@ContextConfiguration -public abstract class AbstractClinicTests extends AbstractTransactionalJUnit4SpringContextTests { - - @Autowired - protected Clinic clinic; - - - @Test - public void getVets() { - Collection vets = this.clinic.getVets(); - // Use the inherited countRowsInTable() convenience method (from - // AbstractTransactionalJUnit4SpringContextTests) to verify the results. - assertEquals("JDBC query must show the same number of vets", super.countRowsInTable("VETS"), vets.size()); - Vet v1 = EntityUtils.getById(vets, Vet.class, 2); - assertEquals("Leary", v1.getLastName()); - assertEquals(1, v1.getNrOfSpecialties()); - assertEquals("radiology", (v1.getSpecialties().get(0)).getName()); - Vet v2 = EntityUtils.getById(vets, Vet.class, 3); - assertEquals("Douglas", v2.getLastName()); - assertEquals(2, v2.getNrOfSpecialties()); - assertEquals("dentistry", (v2.getSpecialties().get(0)).getName()); - assertEquals("surgery", (v2.getSpecialties().get(1)).getName()); - } - - @Test - public void getPetTypes() { - Collection petTypes = this.clinic.getPetTypes(); - assertEquals("JDBC query must show the same number of pet types", super.countRowsInTable("TYPES"), - petTypes.size()); - PetType t1 = EntityUtils.getById(petTypes, PetType.class, 1); - assertEquals("cat", t1.getName()); - PetType t4 = EntityUtils.getById(petTypes, PetType.class, 4); - assertEquals("snake", t4.getName()); - } - - @Test - public void findOwners() { - Collection owners = this.clinic.findOwners("Davis"); - assertEquals(2, owners.size()); - owners = this.clinic.findOwners("Daviss"); - assertEquals(0, owners.size()); - } - - @Test - public void loadOwner() { - Owner o1 = this.clinic.loadOwner(1); - assertTrue(o1.getLastName().startsWith("Franklin")); - Owner o10 = this.clinic.loadOwner(10); - assertEquals("Carlos", o10.getFirstName()); - - // XXX: Add programmatic support for ending transactions with the - // TestContext Framework. - - // Check lazy loading, by ending the transaction: - // endTransaction(); - - // Now Owners are "disconnected" from the data store. - // We might need to touch this collection if we switched to lazy loading - // in mapping files, but this test would pick this up. - o1.getPets(); - } - - @Test - public void insertOwner() { - Collection owners = this.clinic.findOwners("Schultz"); - int found = owners.size(); - Owner owner = new Owner(); - owner.setLastName("Schultz"); - this.clinic.storeOwner(owner); - // assertTrue(!owner.isNew()); -- NOT TRUE FOR TOPLINK (before commit) - owners = this.clinic.findOwners("Schultz"); - assertEquals("Verifying number of owners after inserting a new one.", found + 1, owners.size()); - } - - @Test - public void updateOwner() throws Exception { - Owner o1 = this.clinic.loadOwner(1); - String old = o1.getLastName(); - o1.setLastName(old + "X"); - this.clinic.storeOwner(o1); - o1 = this.clinic.loadOwner(1); - assertEquals(old + "X", o1.getLastName()); - } - - @Test - public void loadPet() { - Collection types = this.clinic.getPetTypes(); - Pet p7 = this.clinic.loadPet(7); - assertTrue(p7.getName().startsWith("Samantha")); - assertEquals(EntityUtils.getById(types, PetType.class, 1).getId(), p7.getType().getId()); - assertEquals("Jean", p7.getOwner().getFirstName()); - Pet p6 = this.clinic.loadPet(6); - assertEquals("George", p6.getName()); - assertEquals(EntityUtils.getById(types, PetType.class, 4).getId(), p6.getType().getId()); - assertEquals("Peter", p6.getOwner().getFirstName()); - } - - @Test - public void insertPet() { - Owner o6 = this.clinic.loadOwner(6); - int found = o6.getPets().size(); - Pet pet = new Pet(); - pet.setName("bowser"); - Collection types = this.clinic.getPetTypes(); - pet.setType(EntityUtils.getById(types, PetType.class, 2)); - pet.setBirthDate(new Date()); - o6.addPet(pet); - assertEquals(found + 1, o6.getPets().size()); - // both storePet and storeOwner are necessary to cover all ORM tools - this.clinic.storePet(pet); - this.clinic.storeOwner(o6); - // assertTrue(!pet.isNew()); -- NOT TRUE FOR TOPLINK (before commit) - o6 = this.clinic.loadOwner(6); - assertEquals(found + 1, o6.getPets().size()); - } - - @Test - public void updatePet() throws Exception { - Pet p7 = this.clinic.loadPet(7); - String old = p7.getName(); - p7.setName(old + "X"); - this.clinic.storePet(p7); - p7 = this.clinic.loadPet(7); - assertEquals(old + "X", p7.getName()); - } - - @Test - public void insertVisit() { - Pet p7 = this.clinic.loadPet(7); - int found = p7.getVisits().size(); - Visit visit = new Visit(); - p7.addVisit(visit); - visit.setDescription("test"); - // both storeVisit and storePet are necessary to cover all ORM tools - this.clinic.storeVisit(visit); - this.clinic.storePet(p7); - // assertTrue(!visit.isNew()); -- NOT TRUE FOR TOPLINK (before commit) - p7 = this.clinic.loadPet(7); - assertEquals(found + 1, p7.getVisits().size()); - } - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/OwnerTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/OwnerTests.java deleted file mode 100644 index 84b5f62c6c2..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/OwnerTests.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.springframework.samples.petclinic; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - -import org.junit.Test; - -/** - * JUnit test for the {@link Owner} class. - * - * @author Ken Krebs - */ -public class OwnerTests { - - @Test - public void testHasPet() { - Owner owner = new Owner(); - Pet fido = new Pet(); - fido.setName("Fido"); - assertNull(owner.getPet("Fido")); - assertNull(owner.getPet("fido")); - owner.addPet(fido); - assertEquals(fido, owner.getPet("Fido")); - assertEquals(fido, owner.getPet("fido")); - } - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/PetClinicTestSuite.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/PetClinicTestSuite.java deleted file mode 100644 index d5619939937..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/PetClinicTestSuite.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.springframework.samples.petclinic; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; -import org.springframework.samples.petclinic.hibernate.HibernateClinicTests; -import org.springframework.samples.petclinic.jdbc.SimpleJdbcClinicTests; -import org.springframework.samples.petclinic.jpa.EntityManagerClinicTests; -import org.springframework.samples.petclinic.jpa.HibernateEntityManagerClinicTests; -import org.springframework.samples.petclinic.jpa.OpenJpaEntityManagerClinicTests; -import org.springframework.samples.petclinic.web.VisitsAtomViewTest; - -/** - * JUnit 4 based test suite for all PetClinic tests. - * - * @author Sam Brannen - */ -@RunWith(Suite.class) -@SuiteClasses({ - OwnerTests.class, - SimpleJdbcClinicTests.class, - HibernateClinicTests.class, - EntityManagerClinicTests.class, - HibernateEntityManagerClinicTests.class, - OpenJpaEntityManagerClinicTests.class, - VisitsAtomViewTest.class -}) -public class PetClinicTestSuite { -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java deleted file mode 100644 index 3c275c820b2..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.springframework.samples.petclinic.hibernate; - -import org.springframework.samples.petclinic.AbstractClinicTests; -import org.springframework.test.context.ContextConfiguration; - -/** - *

- * Integration tests for the {@link HibernateClinic} implementation. - *

- *

- * "HibernateClinicTests-context.xml" determines the actual beans to test. - *

- * - * @author Juergen Hoeller - * @author Sam Brannen - */ -@ContextConfiguration -public class HibernateClinicTests extends AbstractClinicTests { - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests.java deleted file mode 100644 index 709100d1a12..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springframework.samples.petclinic.jdbc; - -import org.springframework.samples.petclinic.AbstractClinicTests; -import org.springframework.test.context.ContextConfiguration; - -/** - *

- * Integration tests for the {@link SimpleJdbcClinic} implementation. - *

- *

- * "SimpleJdbcClinicTests-context.xml" determines the actual beans to test. - *

- * - * @author Thomas Risberg - */ -@ContextConfiguration -public class SimpleJdbcClinicTests extends AbstractClinicTests { - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java deleted file mode 100644 index 251af819d16..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java +++ /dev/null @@ -1,199 +0,0 @@ - -package org.springframework.samples.petclinic.jpa; - -import java.util.Collection; -import java.util.Date; - -import javax.persistence.EntityManager; - -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; -import org.springframework.samples.petclinic.Clinic; -import org.springframework.samples.petclinic.Owner; -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.Vet; -import org.springframework.samples.petclinic.Visit; -import org.springframework.samples.petclinic.util.EntityUtils; -import org.springframework.test.annotation.ExpectedException; -import org.springframework.test.jpa.AbstractJpaTests; - -/** - *

- * This class extends {@link AbstractJpaTests}, one of the valuable test - * superclasses provided in the org.springframework.test package. - * This represents best practice for integration tests with Spring for JPA based - * tests which require shadow class loading. For all other types of - * integration testing, the Spring TestContext Framework is - * preferred. - *

- *

- * AbstractJpaTests and its superclasses provide the following services: - *

    - *
  • Injects test dependencies, meaning that we don't need to perform - * application context lookups. See the setClinic() method. Injection uses - * autowiring by type.
    • - *
  • Executes each test method in its own transaction, which is automatically - * rolled back by default. This means that even if tests insert or otherwise - * change database state, there is no need for a teardown or cleanup script.
    • - *
  • Provides useful inherited protected fields, such as a - * {@link SimpleJdbcTemplate} that can be used to verify database state after - * test operations, or verify the results of queries performed by application - * code. Alternatively, you can use protected convenience methods such as - * {@link #countRowsInTable(String)}, {@link #deleteFromTables(String[])}, - * etc. An ApplicationContext is also inherited, and can be used for explicit - * lookup if necessary.
    • - *
- *

- * {@link AbstractJpaTests} and related classes are shipped in - * spring-test.jar. - *

- * - * @author Rod Johnson - * @author Sam Brannen - * @see AbstractJpaTests - */ -public abstract class AbstractJpaClinicTests extends AbstractJpaTests { - - protected Clinic clinic; - - - /** - * This method is provided to set the Clinic instance being tested by the - * Dependency Injection injection behaviour of the superclass from the - * org.springframework.test package. - * - * @param clinic clinic to test - */ - public void setClinic(Clinic clinic) { - this.clinic = clinic; - } - - @ExpectedException(IllegalArgumentException.class) - public void testBogusJpql() { - this.sharedEntityManager.createQuery("SELECT RUBBISH FROM RUBBISH HEAP").executeUpdate(); - } - - public void testApplicationManaged() { - EntityManager appManaged = this.entityManagerFactory.createEntityManager(); - appManaged.joinTransaction(); - } - - public void testGetVets() { - Collection vets = this.clinic.getVets(); - // Use the inherited countRowsInTable() convenience method (from - // AbstractTransactionalDataSourceSpringContextTests) to verify the - // results. - assertEquals("JDBC query must show the same number of vets", super.countRowsInTable("VETS"), vets.size()); - Vet v1 = EntityUtils.getById(vets, Vet.class, 2); - assertEquals("Leary", v1.getLastName()); - assertEquals(1, v1.getNrOfSpecialties()); - assertEquals("radiology", (v1.getSpecialties().get(0)).getName()); - Vet v2 = EntityUtils.getById(vets, Vet.class, 3); - assertEquals("Douglas", v2.getLastName()); - assertEquals(2, v2.getNrOfSpecialties()); - assertEquals("dentistry", (v2.getSpecialties().get(0)).getName()); - assertEquals("surgery", (v2.getSpecialties().get(1)).getName()); - } - - public void testGetPetTypes() { - Collection petTypes = this.clinic.getPetTypes(); - assertEquals("JDBC query must show the same number of pet types", super.countRowsInTable("TYPES"), - petTypes.size()); - PetType t1 = EntityUtils.getById(petTypes, PetType.class, 1); - assertEquals("cat", t1.getName()); - PetType t4 = EntityUtils.getById(petTypes, PetType.class, 4); - assertEquals("snake", t4.getName()); - } - - public void testFindOwners() { - Collection owners = this.clinic.findOwners("Davis"); - assertEquals(2, owners.size()); - owners = this.clinic.findOwners("Daviss"); - assertEquals(0, owners.size()); - } - - public void testLoadOwner() { - Owner o1 = this.clinic.loadOwner(1); - assertTrue(o1.getLastName().startsWith("Franklin")); - Owner o10 = this.clinic.loadOwner(10); - assertEquals("Carlos", o10.getFirstName()); - - // Check lazy loading, by ending the transaction - endTransaction(); - - // Now Owners are "disconnected" from the data store. - // We might need to touch this collection if we switched to lazy loading - // in mapping files, but this test would pick this up. - o1.getPets(); - } - - public void testInsertOwner() { - Collection owners = this.clinic.findOwners("Schultz"); - int found = owners.size(); - Owner owner = new Owner(); - owner.setLastName("Schultz"); - this.clinic.storeOwner(owner); - // assertTrue(!owner.isNew()); -- NOT TRUE FOR TOPLINK (before commit) - owners = this.clinic.findOwners("Schultz"); - assertEquals(found + 1, owners.size()); - } - - public void testUpdateOwner() throws Exception { - Owner o1 = this.clinic.loadOwner(1); - String old = o1.getLastName(); - o1.setLastName(old + "X"); - this.clinic.storeOwner(o1); - o1 = this.clinic.loadOwner(1); - assertEquals(old + "X", o1.getLastName()); - } - - public void testLoadPet() { - Collection types = this.clinic.getPetTypes(); - Pet p7 = this.clinic.loadPet(7); - assertTrue(p7.getName().startsWith("Samantha")); - assertEquals(EntityUtils.getById(types, PetType.class, 1).getId(), p7.getType().getId()); - assertEquals("Jean", p7.getOwner().getFirstName()); - Pet p6 = this.clinic.loadPet(6); - assertEquals("George", p6.getName()); - assertEquals(EntityUtils.getById(types, PetType.class, 4).getId(), p6.getType().getId()); - assertEquals("Peter", p6.getOwner().getFirstName()); - } - - public void testInsertPet() { - Owner o6 = this.clinic.loadOwner(6); - int found = o6.getPets().size(); - Pet pet = new Pet(); - pet.setName("bowser"); - Collection types = this.clinic.getPetTypes(); - pet.setType(EntityUtils.getById(types, PetType.class, 2)); - pet.setBirthDate(new Date()); - o6.addPet(pet); - assertEquals(found + 1, o6.getPets().size()); - this.clinic.storeOwner(o6); - // assertTrue(!pet.isNew()); -- NOT TRUE FOR TOPLINK (before commit) - o6 = this.clinic.loadOwner(6); - assertEquals(found + 1, o6.getPets().size()); - } - - public void testUpdatePet() throws Exception { - Pet p7 = this.clinic.loadPet(7); - String old = p7.getName(); - p7.setName(old + "X"); - this.clinic.storePet(p7); - p7 = this.clinic.loadPet(7); - assertEquals(old + "X", p7.getName()); - } - - public void testInsertVisit() { - Pet p7 = this.clinic.loadPet(7); - int found = p7.getVisits().size(); - Visit visit = new Visit(); - p7.addVisit(visit); - visit.setDescription("test"); - this.clinic.storePet(p7); - // assertTrue(!visit.isNew()); -- NOT TRUE FOR TOPLINK (before commit) - p7 = this.clinic.loadPet(7); - assertEquals(found + 1, p7.getVisits().size()); - } - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java deleted file mode 100644 index 67c472fdeea..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.springframework.samples.petclinic.jpa; - -import java.util.List; - -import org.springframework.samples.petclinic.aspects.UsageLogAspect; - -/** - *

- * Tests for the DAO variant based on the shared EntityManager approach. Uses - * TopLink Essentials (the reference implementation) for testing. - *

- *

- * Specifically tests usage of an orm.xml file, loaded by the - * persistence provider through the Spring-provided persistence unit root URL. - *

- * - * @author Rod Johnson - * @author Juergen Hoeller - */ -public class EntityManagerClinicTests extends AbstractJpaClinicTests { - - private UsageLogAspect usageLogAspect; - - public void setUsageLogAspect(UsageLogAspect usageLogAspect) { - this.usageLogAspect = usageLogAspect; - } - - @Override - protected String[] getConfigPaths() { - return new String[] { - "applicationContext-jpaCommon.xml", - "applicationContext-toplinkAdapter.xml", - "applicationContext-entityManager.xml" - }; - } - - public void testUsageLogAspectIsInvoked() { - String name1 = "Schuurman"; - String name2 = "Greenwood"; - String name3 = "Leau"; - - assertTrue(this.clinic.findOwners(name1).isEmpty()); - assertTrue(this.clinic.findOwners(name2).isEmpty()); - - List namesRequested = this.usageLogAspect.getNamesRequested(); - assertTrue(namesRequested.contains(name1)); - assertTrue(namesRequested.contains(name2)); - assertFalse(namesRequested.contains(name3)); - } - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java deleted file mode 100644 index d95b452e17c..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.springframework.samples.petclinic.jpa; - -/** - *

- * Tests for the DAO variant based on the shared EntityManager approach, using - * Hibernate EntityManager for testing instead of the reference implementation. - *

- *

- * Specifically tests usage of an orm.xml file, loaded by the - * persistence provider through the Spring-provided persistence unit root URL. - *

- * - * @author Juergen Hoeller - */ -public class HibernateEntityManagerClinicTests extends EntityManagerClinicTests { - - @Override - protected String[] getConfigPaths() { - return new String[] { - "applicationContext-jpaCommon.xml", - "applicationContext-hibernateAdapter.xml", - "applicationContext-entityManager.xml" - }; - } - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/OpenJpaEntityManagerClinicTests.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/OpenJpaEntityManagerClinicTests.java deleted file mode 100644 index 98e38ed6134..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/jpa/OpenJpaEntityManagerClinicTests.java +++ /dev/null @@ -1,27 +0,0 @@ - -package org.springframework.samples.petclinic.jpa; - -/** - *

- * Tests for the DAO variant based on the shared EntityManager approach, using - * Apache OpenJPA for testing instead of the reference implementation. - *

- *

- * Specifically tests usage of an orm.xml file, loaded by the - * persistence provider through the Spring-provided persistence unit root URL. - *

- * - * @author Juergen Hoeller - */ -public class OpenJpaEntityManagerClinicTests extends EntityManagerClinicTests { - - @Override - protected String[] getConfigPaths() { - return new String[] { - "applicationContext-jpaCommon.xml", - "applicationContext-openJpaAdapter.xml", - "applicationContext-entityManager.xml" - }; - } - -} diff --git a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java b/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java deleted file mode 100644 index 1e82e1d5bb1..00000000000 --- a/org.springframework.samples.petclinic/src/test/java/org/springframework/samples/petclinic/web/VisitsAtomViewTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2002-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.samples.petclinic.web; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.sun.syndication.feed.atom.Entry; -import com.sun.syndication.feed.atom.Feed; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import org.junit.Before; -import org.junit.Test; - -import org.springframework.samples.petclinic.Pet; -import org.springframework.samples.petclinic.PetType; -import org.springframework.samples.petclinic.Visit; - -/** - * @author Arjen Poutsma - */ -public class VisitsAtomViewTest { - - private VisitsAtomView visitView; - - private Map model; - - private Feed feed; - - @Before - public void setUp() { - visitView = new VisitsAtomView(); - PetType dog = new PetType(); - dog.setName("dog"); - Pet bello = new Pet(); - bello.setName("Bello"); - bello.setType(dog); - Visit belloVisit = new Visit(); - belloVisit.setPet(bello); - belloVisit.setDate(new Date(2009, 0, 1)); - belloVisit.setDescription("Bello visit"); - Pet wodan = new Pet(); - wodan.setName("Wodan"); - wodan.setType(dog); - Visit wodanVisit = new Visit(); - wodanVisit.setPet(wodan); - wodanVisit.setDate(new Date(2009, 0, 2)); - wodanVisit.setDescription("Wodan visit"); - List visits = new ArrayList(); - visits.add(belloVisit); - visits.add(wodanVisit); - - model = new HashMap(); - model.put("visits", visits); - feed = new Feed(); - - } - - @Test - public void buildFeedMetadata() { - visitView.buildFeedMetadata(model, feed, null); - - assertNotNull("No id set", feed.getId()); - assertNotNull("No title set", feed.getTitle()); - assertEquals("Invalid update set", new Date(2009, 0, 2), feed.getUpdated()); - } - - @Test - public void buildFeedEntries() throws Exception { - List entries = visitView.buildFeedEntries(model, null, null); - assertEquals("Invalid amount of entries", 2, entries.size()); - } -} diff --git a/org.springframework.samples.petclinic/src/test/resources/log4j.xml b/org.springframework.samples.petclinic/src/test/resources/log4j.xml deleted file mode 100644 index 767b96d6206..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/AbstractClinicTests-context.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/AbstractClinicTests-context.xml deleted file mode 100644 index 3f79cbc0939..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/AbstractClinicTests-context.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml deleted file mode 100644 index 7320035cece..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - ${hibernate.dialect} - ${hibernate.show_sql} - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests-context.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests-context.xml deleted file mode 100644 index 81a536988bc..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinicTests-context.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-entityManager.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-entityManager.xml deleted file mode 100644 index a9d25738584..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-entityManager.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-hibernateAdapter.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-hibernateAdapter.xml deleted file mode 100644 index 447d1bce08f..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-hibernateAdapter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-jpaCommon.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-jpaCommon.xml deleted file mode 100644 index b873dfc47ed..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-jpaCommon.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml deleted file mode 100644 index 8f6f7c4427c..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml b/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml deleted file mode 100644 index ac031de8e14..00000000000 --- a/org.springframework.samples.petclinic/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - -