diff --git a/.classpath b/.classpath index 8122bbbe4..c99cf8646 100644 --- a/.classpath +++ b/.classpath @@ -1,15 +1,37 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/.project b/.project index 239f04e3c..7d7f5c1eb 100644 --- a/.project +++ b/.project @@ -1,9 +1,8 @@ - org.springframework.samples.petclinic - + spring-petclinic + NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse. - Servers @@ -38,12 +37,12 @@ - org.eclipse.jem.workbench.JavaEMFNature org.springframework.ide.eclipse.core.springnature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.jsdt.core.jsNature org.eclipse.m2e.core.maven2Nature + 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/.settings/.jsdtscope b/.settings/.jsdtscope index bbb8e68be..b72a6a47b 100644 --- a/.settings/.jsdtscope +++ b/.settings/.jsdtscope @@ -1,5 +1,7 @@ + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 9ec44e3e6..69c31cd49 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,8 @@ -#Tue Mar 17 10:00:21 EDT 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.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.settings/org.eclipse.jst.common.project.facet.core.prefs b/.settings/org.eclipse.jst.common.project.facet.core.prefs deleted file mode 100644 index 763a1503d..000000000 --- a/.settings/org.eclipse.jst.common.project.facet.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Mar 17 09:59:19 EDT 2009 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.5.0\ (MacOS\ X\ Default)/owners=jst.java\:5.0 -eclipse.preferences.version=1 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.m2e.wtp.prefs b/.settings/org.eclipse.m2e.wtp.prefs new file mode 100644 index 000000000..ef8608962 --- /dev/null +++ b/.settings/org.eclipse.m2e.wtp.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.m2e.wtp.enabledProjectSpecificPrefs=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 89d4f2ab5..256741333 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,11 @@ - - - - - - - + + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index d24a733bd..97d312c6a 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,7 +1,7 @@ - - - - + + + + diff --git a/README.md b/README.md deleted file mode 100644 index 560aaaa5e..000000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -spring-petclinic -================ - -sample application for the Spring framework \ No newline at end of file diff --git a/org.springframework.samples.petclinic/.classpath b/org.springframework.samples.petclinic/.classpath deleted file mode 100644 index 5c40e0b3f..000000000 --- a/org.springframework.samples.petclinic/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/.project b/org.springframework.samples.petclinic/.project deleted file mode 100644 index ed4ca5e5a..000000000 --- a/org.springframework.samples.petclinic/.project +++ /dev/null @@ -1,42 +0,0 @@ - - - org.springframework.samples.petclinic - - - Servers - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.maven.ide.eclipse.maven2Builder - - - - - - org.maven.ide.eclipse.maven2Nature - org.springframework.ide.eclipse.core.springnature - org.eclipse.jdt.core.javanature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.common.modulecore.ModuleCoreNature - - 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 0a4413c52..000000000 --- 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 9ec44e3e6..000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Tue Mar 17 10:00:21 EDT 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 763a1503d..000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.jst.common.project.facet.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Mar 17 09:59:19 EDT 2009 -classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.launching.macosx.MacOSXType\:\:JVM\ 1.5.0\ (MacOS\ X\ Default)/owners=jst.java\:5.0 -eclipse.preferences.version=1 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 89d4f2ab5..000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,10 +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 d24a733bd..000000000 --- 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.validation.prefs b/org.springframework.samples.petclinic/.settings/org.eclipse.wst.validation.prefs deleted file mode 100644 index 75abca5ce..000000000 --- a/org.springframework.samples.petclinic/.settings/org.eclipse.wst.validation.prefs +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Jun 06 17:00:12 BST 2008 -DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator; -USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsf.validation.internal.JSPSemanticsValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.common.componentcore.internal.ModuleCoreValidator;org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidator;org.eclipse.jst.jsp.core.internal.validation.JSPBatchValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPContentValidator;org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator; -USER_PREFERENCE=overrideGlobalPreferencesfalse -eclipse.preferences.version=1 diff --git a/org.springframework.samples.petclinic/.settings/org.maven.ide.eclipse.prefs b/org.springframework.samples.petclinic/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 0b751087c..000000000 --- a/org.springframework.samples.petclinic/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Mar 17 14:28:16 EDT 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/org.springframework.samples.petclinic/.settings/org.springframework.ide.eclipse.beans.core.prefs b/org.springframework.samples.petclinic/.settings/org.springframework.ide.eclipse.beans.core.prefs deleted file mode 100644 index a7eb2b337..000000000 --- a/org.springframework.samples.petclinic/.settings/org.springframework.ide.eclipse.beans.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Dec 17 01:09:03 EST 2008 -eclipse.preferences.version=1 -org.springframework.ide.eclipse.beans.core.ignoreMissingNamespaceHandler=false diff --git a/org.springframework.samples.petclinic/.settings/org.springframework.ide.eclipse.core.prefs b/org.springframework.samples.petclinic/.settings/org.springframework.ide.eclipse.core.prefs deleted file mode 100644 index e096d67b6..000000000 --- a/org.springframework.samples.petclinic/.settings/org.springframework.ide.eclipse.core.prefs +++ /dev/null @@ -1,67 +0,0 @@ -#Tue Mar 17 10:00:21 EDT 2009 -eclipse.preferences.version=1 -org.springframework.ide.eclipse.core.builders.enable.aopreferencemodelbuilder=true -org.springframework.ide.eclipse.core.builders.enable.beanmetadatabuilder=false -org.springframework.ide.eclipse.core.builders.enable.osgibundleupdater=true -org.springframework.ide.eclipse.core.enable.project.preferences=false -org.springframework.ide.eclipse.core.validator.enable.com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.enable.com.springsource.sts.server.quickfix.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.core.springvalidator=false -org.springframework.ide.eclipse.core.validator.enable.org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.applicationVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivationPolicyRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleActivatorRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleManifestVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleSymbolicNameRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.bundleVersionRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.exportPackageRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.importRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.parsingProblemsRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.server.ide.manifest.core.requireBundleRule-com.springsource.server.ide.manifest.core.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.AvoidDriverManagerDataSource-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ImportElementsAtTopRulee-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.ParentBeanSpecifiesAbstractClassRule-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.RefElementRule-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.TooManyBeansInFileRule-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UnnecessaryValueElementRule-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.com.springsource.sts.bestpractices.UseBeanInheritance-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.bestpractices.legacyxmlusage.jndiobjectfactory-com.springsource.sts.bestpractices.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importBundleVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importLibraryVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.importPackageVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.com.springsource.sts.server.quickfix.requireBundleVersionRule-com.springsource.sts.server.quickfix.manifestvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanAlias-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanClass-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanConstructorArgument-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinition-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanDefinitionHolder-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanFactory-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanInitDestroyMethod-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.beanReference-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.methodOverride-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.parsingProblems-org.springframework.ide.eclipse.beans.core.beansvalidator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.beans.core.requiredProperty-org.springframework.ide.eclipse.beans.core.beansvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.core.springClasspath-org.springframework.ide.eclipse.core.springvalidator=false -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.action-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.actionstate-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attribute-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.attributemapper-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.beanaction-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationaction-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.evaluationresult-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.exceptionhandler-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.import-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.inputattribute-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.mapping-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.outputattribute-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.set-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.state-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.subflowstate-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.transition-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.variable-org.springframework.ide.eclipse.webflow.core.validator=true -org.springframework.ide.eclipse.core.validator.rule.enable.org.springframework.ide.eclipse.webflow.core.validation.webflowstate-org.springframework.ide.eclipse.webflow.core.validator=true diff --git a/org.springframework.samples.petclinic/.springBeans b/org.springframework.samples.petclinic/.springBeans deleted file mode 100644 index 24e2d6593..000000000 --- a/org.springframework.samples.petclinic/.springBeans +++ /dev/null @@ -1,13 +0,0 @@ - - - 1 - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/pom.xml b/org.springframework.samples.petclinic/pom.xml deleted file mode 100644 index df94a059a..000000000 --- a/org.springframework.samples.petclinic/pom.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - 4.0.0 - org.springframework.samples - org.springframework.samples.petclinic - org.springframework.samples.petclinic - war - 1.0.0-SNAPSHOT - - 3.0.0.M3 - - - - - javax.servlet - jstl - 1.2 - - - log4j - log4j - 1.2.14 - - - commons-fileupload - commons-fileupload - 1.2.1 - - - - commons-io - commons-io - 1.3.2 - - - - hsqldb - hsqldb - 1.8.0.7 - - - - org.apache.tiles - tiles-core - 2.0.7 - - - org.apache.tiles - tiles-jsp - 2.0.7 - - - - org.tuckey - urlrewritefilter - 3.1.0 - - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - - org.springframework.webflow - spring-js - 2.0.7.RELEASE - - - - javax.servlet - servlet-api - 2.5 - provided - - - javax.servlet.jsp - jsp-api - 2.1 - provided - - - - junit - junit - 4.5 - test - - - - - org.springsource.maven.snapshot - SpringSource Maven Central-compatible Milestone Repository - http://maven.springframework.org/milestone - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.maven.plugins - maven-dependency-plugin - - - install - install - - sources - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/HomeController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/HomeController.java deleted file mode 100644 index 797ca81e0..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/HomeController.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.springframework.samples.petclinic; - -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -@Controller -public class HomeController { - - @RequestMapping(value="/", method = RequestMethod.GET) - public String get() { - return "home"; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/Appointment.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/Appointment.java deleted file mode 100644 index d193117e0..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/Appointment.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.springframework.samples.petclinic.appointments; - -import java.util.Date; - -public class Appointment { - - private String owner; - - private String ownerPhone; - - private String pet; - - private String notes; - - private Date dateTime; - - public String getOwner() { - return owner; - } - - public String getOwnerPhone() { - return ownerPhone; - } - - public String getPet() { - return pet; - } - - public Date getDateTime() { - return dateTime; - } - - public String getNotes() { - return notes; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentBook.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentBook.java deleted file mode 100644 index 55ebd488b..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentBook.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springframework.samples.petclinic.appointments; - -import java.util.Date; - -public interface AppointmentBook { - - Appointments getAppointmentsForToday(); - - Appointments getAppointmentsForDay(Date day); - - Long createAppointment(AppointmentForm form); - -} \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentForm.java deleted file mode 100644 index d3d7abaaf..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentForm.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.springframework.samples.petclinic.appointments; - -import java.util.Date; - -public class AppointmentForm { - - private Long doctor; - - private Long owner; - - private String pet; - - private Date date; - - private Date time; - - private String notes; - - public Long getDoctor() { - return doctor; - } - - public void setDoctor(Long doctor) { - this.doctor = doctor; - } - - public Long getOwner() { - return owner; - } - - public void setOwner(Long owner) { - this.owner = owner; - } - - public String getPet() { - return pet; - } - - public void setPet(String pet) { - this.pet = pet; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } - - public Date getTime() { - return time; - } - - public void setTime(Date time) { - this.time = time; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - -} \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/Appointments.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/Appointments.java deleted file mode 100644 index f2aa85e68..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/Appointments.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.springframework.samples.petclinic.appointments; - -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -public class Appointments { - - private Map> vetAppointments = new LinkedHashMap>(); - - public Map> getAllByVet() { - return vetAppointments; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentsController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentsController.java deleted file mode 100644 index e3c786017..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/AppointmentsController.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.springframework.samples.petclinic.appointments; - -import java.util.Date; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -@Controller -@RequestMapping("/appointments") -public class AppointmentsController { - - private AppointmentBook appointmentBook; - - @Autowired - public AppointmentsController(AppointmentBook appointmentBook) { - this.appointmentBook = appointmentBook; - } - - @RequestMapping(method = RequestMethod.GET) - public Appointments get() { - return appointmentBook.getAppointmentsForToday(); - } - - @RequestMapping(value="/{day}", method = RequestMethod.GET) - public Appointments getForDay(@PathVariable Date day) { - return appointmentBook.getAppointmentsForDay(day); - } - - @RequestMapping(value="/new", method = RequestMethod.GET) - public AppointmentForm getNewForm() { - return new AppointmentForm(); - } - - @RequestMapping(method = RequestMethod.POST) - public String post(AppointmentForm form) { - appointmentBook.createAppointment(form); - return "redirect:/appointments"; - } -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/StubAppointmentBook.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/StubAppointmentBook.java deleted file mode 100644 index 92525a365..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/appointments/StubAppointmentBook.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.springframework.samples.petclinic.appointments; - -import java.util.Date; - -import org.springframework.stereotype.Repository; - -@Repository -public class StubAppointmentBook implements AppointmentBook { - - public Appointments getAppointmentsForDay(Date day) { - return new Appointments(); - } - - public Appointments getAppointmentsForToday() { - return new Appointments(); - } - - public Long createAppointment(AppointmentForm form) { - return 1L; - } - - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java deleted file mode 100644 index 9841482b5..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/Owner.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.springframework.samples.petclinic.owners; - -public class Owner { - - private Long id; - - private String firstName; - - private String lastName; - - private String address; - - private String city; - - private String phone; - - public Owner() { - - } - - public Owner(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone; - } - -} \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java deleted file mode 100644 index d357c0471..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.springframework.samples.petclinic.owners; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.util.ExternalContext; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -@Controller -@RequestMapping(value="/owners/{owner}") -public class OwnerController { - - private final OwnerRepository repository; - - @Autowired - public OwnerController(OwnerRepository repository) { - this.repository = repository; - } - - @RequestMapping(method=RequestMethod.GET) - public String get(@PathVariable Long owner, Model model) { - model.addAttribute(repository.getOwner(owner)); - return "owner"; - } - - @RequestMapping(value="/edit", method=RequestMethod.GET) - public Owner getEditForm(@PathVariable Long owner) { - return repository.getOwner(owner); - } - - @RequestMapping(method = RequestMethod.PUT) - public void put(Owner owner, ExternalContext response) { - repository.saveOwner(owner); - response.redirect(owner.getId()); - } - -} \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java deleted file mode 100644 index 10702243d..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.springframework.samples.petclinic.owners; - -import java.util.Collection; - -public interface OwnerRepository { - - Collection findOwnersByLastName(String lastName); - - Owner getOwner(Long id); - - Long saveOwner(Owner owner); - -} \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerSearchForm.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerSearchForm.java deleted file mode 100644 index c9c589607..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnerSearchForm.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.springframework.samples.petclinic.owners; - -public class OwnerSearchForm { - - private String lastName; - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java deleted file mode 100644 index f24cd0745..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/OwnersController.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.springframework.samples.petclinic.owners; - -import java.util.Collection; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; - -@Controller -@RequestMapping("/owners") -public class OwnersController { - - private final OwnerRepository repository; - - @Autowired - public OwnersController(OwnerRepository repository) { - this.repository = repository; - } - - @RequestMapping(method = RequestMethod.GET) - public OwnerSearchForm get() { - return new OwnerSearchForm(); - } - - @RequestMapping(value="/search", method = RequestMethod.GET) - public Collection getSearchResults(@RequestParam String lastName) { - return repository.findOwnersByLastName(lastName); - } - - @RequestMapping(value="/new", method = RequestMethod.GET) - public Owner getNewForm() { - return new Owner(); - } - - @RequestMapping(method = RequestMethod.POST) - public String post(Owner owner) { - Long ownerId = repository.saveOwner(owner); - return "redirect:/owners/" + ownerId; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java deleted file mode 100644 index d442ee994..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/StubOwnerRepository.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.samples.petclinic.owners; - -import java.util.Collection; - -import org.springframework.stereotype.Repository; - -@Repository -public class StubOwnerRepository implements OwnerRepository { - - public Collection findOwnersByLastName(String lastName) { - return null; - } - - public Owner getOwner(Long id) { - return new Owner(id); - } - - public Long saveOwner(Owner owner) { - return 1L; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java deleted file mode 100644 index 6691f557e..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Gender.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.samples.petclinic.owners.pets; - -public enum Gender { - MALE, FEMALE -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java deleted file mode 100644 index 63f189d3a..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/Pet.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.springframework.samples.petclinic.owners.pets; - -import java.util.Date; - -import org.springframework.samples.petclinic.util.Measurement; - -public class Pet { - - private String name; - - private String species; - - private String breed; - - private Gender gender; - - private Date birthDate; - - private Measurement weight; - - public String getName() { - return name; - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java deleted file mode 100644 index a0a7e74e8..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetController.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.springframework.samples.petclinic.owners.pets; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.samples.petclinic.util.ExternalContext; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -@Controller -@RequestMapping(value="/owners/{owner}/pets/{pet}") -public class PetController { - - private final PetRepository repository; - - @Autowired - public PetController(PetRepository repository) { - this.repository = repository; - } - - @RequestMapping(method=RequestMethod.GET) - public Pet get(Long owner, String pet) { - return repository.getPet(owner, pet); - } - - @RequestMapping(value="/edit", method=RequestMethod.GET) - public Pet getEditForm(Long owner, String pet) { - return repository.getPet(owner, pet); - } - - @RequestMapping(method = RequestMethod.PUT) - public void put(Pet pet, ExternalContext response) { - repository.savePet(pet); - response.redirect(pet.getName()); - } - - @RequestMapping(method = RequestMethod.DELETE) - public void delete(Long owner, String pet, ExternalContext context) { - context.forResource("owners").redirect(owner); - } - -} \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java deleted file mode 100644 index 76afff837..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/PetRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.springframework.samples.petclinic.owners.pets; - -public interface PetRepository { - - Pet getPet(Long owner, String name); - - void savePet(Pet pet); - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java deleted file mode 100644 index 0dae2f563..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/owners/pets/StubPetRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.springframework.samples.petclinic.owners.pets; - -import org.springframework.stereotype.Repository; - -@Repository -public class StubPetRepository implements PetRepository { - - public Pet getPet(Long owner, String name) { - return null; - } - - public void savePet(Pet pet) { - } - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/ExternalContext.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/ExternalContext.java deleted file mode 100644 index 5f4fc1e3e..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/ExternalContext.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.springframework.samples.petclinic.util; - -import org.springframework.ui.Model; - -// This is an idea as a context object to make avail to @Controller methods to interact with Dispatcher -public interface ExternalContext { - - Model getModel(); - - void selectView(String viewName); - - void renderFragment(String fragment); - - void redirect(Object resource); - - ExternalContext forResource(Object resource); - - Object getNativeRequest(); - - Object getNativeResponse(); - -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/Measurement.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/Measurement.java deleted file mode 100644 index 9120e5838..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/Measurement.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.springframework.samples.petclinic.util; - -import java.math.BigDecimal; - -public class Measurement { - - private BigDecimal amount; - - private Unit unit; -} diff --git a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/Unit.java b/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/Unit.java deleted file mode 100644 index 6bcf4e2e7..000000000 --- a/org.springframework.samples.petclinic/src/main/java/org/springframework/samples/petclinic/util/Unit.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.springframework.samples.petclinic.util; - -public enum Unit { - POUNDS -} diff --git a/org.springframework.samples.petclinic/src/main/resources/log4j.xml b/org.springframework.samples.petclinic/src/main/resources/log4j.xml deleted file mode 100644 index e09edc3bf..000000000 --- a/org.springframework.samples.petclinic/src/main/resources/log4j.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/addNewForm.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/addNewForm.jsp deleted file mode 100644 index 997640df0..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/addNewForm.jsp +++ /dev/null @@ -1,31 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -

Add New Appointment

- - - - Doctor - - - - Owner - - - - Pet - - - - Date - - - - Time - - - - Notes - - - - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/calendar.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/calendar.jsp deleted file mode 100644 index 692d0bb0d..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/calendar.jsp +++ /dev/null @@ -1,2 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -

Appointment Calendar

\ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/content.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/content.jsp deleted file mode 100644 index b171fb5ad..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/appointments/content.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> - - -
- -
\ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/home.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/home.jsp deleted file mode 100644 index 08ab75826..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/home.jsp +++ /dev/null @@ -1,6 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -

Welcome to the Spring 3 Petclinic

- -

- This sample application demonstrates many of the features Spring provides for web application development. -

\ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/layouts/page.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/layouts/page.jsp deleted file mode 100644 index b92d0ffa1..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/layouts/page.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> -<%@ page session="false" %> - - - <tiles:insertAttribute name="title"/> - - - -
- -
- -
- -
- - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/addNewForm.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/addNewForm.jsp deleted file mode 100644 index 68ad9dd6f..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/addNewForm.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -

Add New Owner

- - - - First Name - - - - Last Name - - - - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/content.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/content.jsp deleted file mode 100644 index c0dae0e50..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/content.jsp +++ /dev/null @@ -1,11 +0,0 @@ -<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %> - - -
- -
\ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/owner.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/owner.jsp deleted file mode 100644 index 85dcec17b..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/owner.jsp +++ /dev/null @@ -1,2 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -

Owner Details

\ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/searchForm.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/searchForm.jsp deleted file mode 100644 index 1a5830d29..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/searchForm.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> - -

Search Owners

- - - - Last Name - - - - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/searchResults.jsp b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/searchResults.jsp deleted file mode 100644 index c01fd8abb..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/owners/searchResults.jsp +++ /dev/null @@ -1,2 +0,0 @@ -<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -

Search Results

\ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/app-config.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/app-config.xml deleted file mode 100644 index 63165f80e..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/app-config.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/mvc-config.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/mvc-config.xml deleted file mode 100644 index 8f2b7f1d2..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/mvc-config.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/tiles.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/tiles.xml deleted file mode 100644 index e87543e73..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/tiles.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/urlrewrite.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/urlrewrite.xml deleted file mode 100644 index 9e3a4589b..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/urlrewrite.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - /resources/** - /resources/$1 - - - /** - /app/$1 - - - /app/** - /$1 - - 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 8238f5100..000000000 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - - - - UrlRewriteFilter - /* - - - - - Spring MVC Dispatcher Servlet - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - - /WEB-INF/spring/*.xml - - - 1 - - - - - Spring MVC Dispatcher Servlet - /app/* - - - - - Resources Servlet - org.springframework.js.resource.ResourceServlet - 0 - - - - - Resources Servlet - /resources/* - - - diff --git a/org.springframework.samples.petclinic/src/main/webapp/styles/main.css b/org.springframework.samples.petclinic/src/main/webapp/styles/main.css deleted file mode 100644 index e69de29bb..000000000 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 f2c798d46..000000000 --- a/org.springframework.samples.petclinic/src/test/resources/log4j.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index f0c6167f6..a60fcf2ce 100644 --- a/pom.xml +++ b/pom.xml @@ -3,98 +3,89 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.springframework.samples - org.springframework.samples.petclinic + spring-petclinic petclinic war 1.0.0-SNAPSHOT - 3.0.0.RELEASE - 1.5.6 + 3.2.0.RELEASE + 1.7.0 + 1.2.17 + 4.1.4.Final + 1.7.1 - + org.springframework - org.springframework.context + spring-context ${spring.version} org.apache.commons - com.springsource.org.apache.commons.logging + commons-logging org.springframework - org.springframework.orm + spring-orm ${spring.version} org.springframework - org.springframework.oxm + spring-oxm ${spring.version} org.springframework - org.springframework.web.servlet - ${spring.version} - - - org.springframework - org.springframework.aspects - ${spring.version} - - - - org.aspectj - com.springsource.org.aspectj.weaver - 1.6.8.RELEASE + spring-webmvc + ${spring.version} - org.slf4j - com.springsource.slf4j.api - ${slf4j.version} - - - org.slf4j - com.springsource.slf4j.org.apache.commons.logging - ${slf4j.version} - runtime - - - org.slf4j - com.springsource.slf4j.log4j - ${slf4j.version} - runtime - - - org.apache.log4j - com.springsource.org.apache.log4j - 1.2.15 - runtime - + org.slf4j + jcl-over-slf4j + ${slf4j.version} + runtime + + + + org.slf4j + slf4j-api + ${slf4j.version} + runtime + + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + runtime + + + + log4j + log4j + ${log4j.version} + runtime + - org.apache.commons - com.springsource.org.apache.commons.dbcp - 1.2.2.osgi - runtime - - - org.apache.commons - com.springsource.org.apache.commons.pool - 1.5.3 + commons-dbcp + commons-dbcp + 1.4 runtime + org.hsqldb - com.springsource.org.hsqldb - 1.8.0.9 + hsqldb + 1.8.0.10 runtime @@ -103,153 +94,87 @@ com.springsource.com.mysql.jdbc 5.1.6 --> + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + + org.aspectj + aspectjweaver + ${aspectj.version} + - - org.hibernate - com.springsource.org.hibernate - 3.3.2.GA - - - javax.persistence - com.springsource.javax.persistence - 1.0.0 - - - - com.oracle.toplink.essentials - com.springsource.oracle.toplink.essentials - 2.0.0.b41-beta2 - org.hibernate - com.springsource.org.hibernate.ejb - 3.4.0.GA - - - - org.apache.commons - com.springsource.org.apache.commons.logging - - - - - org.hibernate - com.springsource.org.hibernate.annotations - 3.4.0.GA - - - - org.apache.commons - com.springsource.org.apache.commons.logging - - - - - - org.apache.openjpa - com.springsource.org.apache.openjpa - 1.1.0 - - - - org.apache.commons - com.springsource.org.apache.commons.logging - - + hibernate-entitymanager + ${hibernate.version} + javax.servlet - com.springsource.javax.servlet - 2.5.0 + servlet-api + 2.5 provided javax.servlet - com.springsource.javax.servlet.jsp - 2.1.0 - provided - - - javax.servlet - com.springsource.javax.servlet.jsp.jstl - 1.2.0 - - - org.apache.taglibs - com.springsource.org.apache.taglibs.standard - 1.1.2 + jstl + 1.2 - com.sun.syndication - com.springsource.com.sun.syndication - 1.0.0 + rome + rome + 1.0 + org.jdom - com.springsource.org.jdom - 1.1.0 + jdom + 2.0.2 runtime - javax.xml.bind - com.springsource.javax.xml.bind - 2.1.7 + com.sun.xml.bind + jaxb-impl + 2.2.6 provided - org.junit - com.springsource.org.junit - 4.7.0 + junit + junit + 4.10 test org.springframework - org.springframework.test + spring-test ${spring.version} test javax.transaction - com.springsource.javax.transaction - 1.1.0 + jta + 1.1 test - - - com.springsource.repository.bundles.release - SpringSource Enterprise Bundle Repository - SpringSource Releases - http://repository.springsource.com/maven/bundles/release - - - com.springsource.repository.bundles.external - SpringSource Enterprise Bundle Repository - External Releases - http://repository.springsource.com/maven/bundles/external - - - com.springsource.repository.bundles.milestone - SpringSource Enterprise Bundle Repository - SpringSource Milestones - http://repository.springsource.com/maven/bundles/milestone - - - com.springsource.repository.bundles.snapshot - SpringSource Enterprise Bundle Repository - Snapshot Releases - http://repository.springsource.com/maven/bundles/snapshot - - @@ -257,8 +182,8 @@ maven-compiler-plugin true - 1.5 - 1.5 + 1.6 + 1.6 true @@ -278,6 +203,19 @@ petclinic + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + true + true + 2.0 + + **/*.* + + + org.apache.maven.plugins maven-dependency-plugin diff --git a/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java b/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java index 1d9894d38..cc2633875 100644 --- a/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java +++ b/src/main/java/org/springframework/samples/petclinic/jdbc/SimpleJdbcClinic.java @@ -18,7 +18,7 @@ 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.jdbc.core.JdbcTemplate; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.orm.ObjectRetrievalFailureException; @@ -58,7 +58,7 @@ public class SimpleJdbcClinic implements Clinic, SimpleJdbcClinicMBean { private final Logger logger = LoggerFactory.getLogger(getClass()); - private SimpleJdbcTemplate simpleJdbcTemplate; + private JdbcTemplate simpleJdbcTemplate; private SimpleJdbcInsert insertOwner; private SimpleJdbcInsert insertPet; @@ -69,7 +69,7 @@ public class SimpleJdbcClinic implements Clinic, SimpleJdbcClinicMBean { @Autowired public void init(DataSource dataSource) { - this.simpleJdbcTemplate = new SimpleJdbcTemplate(dataSource); + this.simpleJdbcTemplate = new JdbcTemplate(dataSource); this.insertOwner = new SimpleJdbcInsert(dataSource) .withTableName("owners") diff --git a/src/main/java/org/springframework/samples/petclinic/toplink/EssentialsHSQLPlatformWithNativeSequence.java b/src/main/java/org/springframework/samples/petclinic/toplink/EssentialsHSQLPlatformWithNativeSequence.java deleted file mode 100644 index 1086591de..000000000 --- a/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/src/main/java/org/springframework/samples/petclinic/toplink/package-info.java b/src/main/java/org/springframework/samples/petclinic/toplink/package-info.java deleted file mode 100644 index 3bcc9add7..000000000 --- a/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/src/main/resources/log4j.dtd b/src/main/resources/log4j.dtd new file mode 100755 index 000000000..d92a6e7bc --- /dev/null +++ b/src/main/resources/log4j.dtd @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties deleted file mode 100644 index ebee551aa..000000000 --- a/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/src/main/resources/log4j.xml b/src/main/resources/log4j.xml new file mode 100755 index 000000000..13330e6ff --- /dev/null +++ b/src/main/resources/log4j.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/footer.jsp b/src/main/webapp/WEB-INF/jsp/footer.jsp index 52aaffc47..486957def 100644 --- a/src/main/webapp/WEB-INF/jsp/footer.jsp +++ b/src/main/webapp/WEB-INF/jsp/footer.jsp @@ -1,12 +1,10 @@ +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - + - - - diff --git a/src/main/webapp/WEB-INF/jsp/header.jsp b/src/main/webapp/WEB-INF/jsp/header.jsp index 49393d364..1cdc67061 100644 --- a/src/main/webapp/WEB-INF/jsp/header.jsp +++ b/src/main/webapp/WEB-INF/jsp/header.jsp @@ -1,7 +1,8 @@ +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> + - @@ -9,6 +10,4 @@ PetClinic :: a Spring Framework demonstration - -

diff --git a/src/main/webapp/WEB-INF/jsp/owners/search.jsp b/src/main/webapp/WEB-INF/jsp/owners/search.jsp index b972390a1..7b6b5c880 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/search.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/search.jsp @@ -1,26 +1,38 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + -

Find Owners:

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

-
+ -
-Add Owner +
-<%@ include file="/WEB-INF/jsp/footer.jsp" %> +

Find Owners:

+ + + +
+ +
+ + +
+
+ +
+
+
+ +
+ Add Owner + + + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/src/main/webapp/WEB-INF/jsp/owners/show.jsp index 9767c18ae..cd7334db1 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/show.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/show.jsp @@ -1,7 +1,16 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + + +
+

Owner Information

@@ -105,4 +114,9 @@
-<%@ include file="/WEB-INF/jsp/footer.jsp" %> + + +
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 308581897..9b431e482 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -1,16 +1,29 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -" align="right" style="position:relative;right:30px;"> + + + + + + + +
+" align="right" style="position:relative;right:30px;">

 

 

-<%@ include file="/WEB-INF/jsp/footer.jsp" %> + + +
+ + + diff --git a/src/main/webapp/WEB-INF/petclinic-servlet.xml b/src/main/webapp/WEB-INF/petclinic-servlet.xml index e55766ac4..345a2da8a 100644 --- a/src/main/webapp/WEB-INF/petclinic-servlet.xml +++ b/src/main/webapp/WEB-INF/petclinic-servlet.xml @@ -3,11 +3,12 @@ - DispatcherServlet application context for PetClinic's web tier. --> + xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" + xmlns:oxm="http://www.springframework.org/schema/oxm" xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd + http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm.xsd + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + @@ -58,15 +59,21 @@ - BeanNameViewResolver. Note the use of the expression language to refer to the contentType - property of the vets view bean, setting it to 'application/vnd.springsource.samples.petclinic+xml'. --> - - - - - - - - + + + + + + + + + + atom=application/atom+xml + xml=#{vets.contentType} + + + - @@ -32,14 +32,14 @@ - + - diff --git a/src/main/webapp/images/banner-graphic.png b/src/main/webapp/images/banner-graphic.png deleted file mode 100644 index e6d01d588..000000000 Binary files a/src/main/webapp/images/banner-graphic.png and /dev/null differ diff --git a/src/main/webapp/images/pets.png b/src/main/webapp/images/pets.png deleted file mode 100644 index 0fe63c282..000000000 Binary files a/src/main/webapp/images/pets.png and /dev/null differ diff --git a/src/main/webapp/images/springsource-logo.png b/src/main/webapp/images/springsource-logo.png deleted file mode 100644 index e170f8abf..000000000 Binary files a/src/main/webapp/images/springsource-logo.png and /dev/null differ diff --git a/src/main/webapp/html/tutorial.html b/src/main/webapp/resources/html/tutorial.html similarity index 100% rename from src/main/webapp/html/tutorial.html rename to src/main/webapp/resources/html/tutorial.html diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png b/src/main/webapp/resources/images/banner-graphic.png similarity index 100% rename from org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png rename to src/main/webapp/resources/images/banner-graphic.png diff --git a/src/main/webapp/images/bullet-arrow.png b/src/main/webapp/resources/images/bullet-arrow.png similarity index 100% rename from src/main/webapp/images/bullet-arrow.png rename to src/main/webapp/resources/images/bullet-arrow.png diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/pets.png b/src/main/webapp/resources/images/pets.png similarity index 100% rename from org.springframework.samples.petclinic/src/main/webapp/images/pets.png rename to src/main/webapp/resources/images/pets.png diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png b/src/main/webapp/resources/images/springsource-logo.png similarity index 100% rename from org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png rename to src/main/webapp/resources/images/springsource-logo.png diff --git a/src/main/webapp/images/submit-bg.png b/src/main/webapp/resources/images/submit-bg.png similarity index 100% rename from src/main/webapp/images/submit-bg.png rename to src/main/webapp/resources/images/submit-bg.png diff --git a/src/main/webapp/styles/petclinic.css b/src/main/webapp/resources/styles/petclinic.css similarity index 100% rename from src/main/webapp/styles/petclinic.css rename to src/main/webapp/resources/styles/petclinic.css diff --git a/src/test/java/org/springframework/samples/petclinic/AbstractClinicTests.java b/src/test/java/org/springframework/samples/petclinic/AbstractClinicTests.java index 63010dc34..a62cb201f 100644 --- a/src/test/java/org/springframework/samples/petclinic/AbstractClinicTests.java +++ b/src/test/java/org/springframework/samples/petclinic/AbstractClinicTests.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.samples.petclinic.util.EntityUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractTransactionalJUnit4SpringContextTests; +import org.springframework.transaction.annotation.Transactional; /** *

@@ -81,18 +82,16 @@ import org.springframework.test.context.junit4.AbstractTransactionalJUnit4Spring * @author Sam Brannen */ @ContextConfiguration -public abstract class AbstractClinicTests extends AbstractTransactionalJUnit4SpringContextTests { +public abstract class AbstractClinicTests { @Autowired protected Clinic clinic; - @Test + @Test @Transactional 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()); @@ -107,8 +106,7 @@ public abstract class AbstractClinicTests extends AbstractTransactionalJUnit4Spr @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); diff --git a/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java b/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java index 4f50d7231..cedbba3c9 100644 --- a/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java +++ b/src/test/java/org/springframework/samples/petclinic/hibernate/HibernateClinicTests.java @@ -1,8 +1,10 @@ package org.springframework.samples.petclinic.hibernate; +import org.junit.runner.RunWith; import org.springframework.samples.petclinic.AbstractClinicTests; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** *

@@ -17,6 +19,7 @@ import org.springframework.test.context.ContextConfiguration; */ @ContextConfiguration @DirtiesContext +@RunWith(SpringJUnit4ClassRunner.class) public class HibernateClinicTests extends AbstractClinicTests { } diff --git a/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java b/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java index 335297d90..77b08a19b 100644 --- a/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java +++ b/src/test/java/org/springframework/samples/petclinic/jpa/AbstractJpaClinicTests.java @@ -1,12 +1,18 @@ package org.springframework.samples.petclinic.jpa; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.fail; + import java.util.Collection; import java.util.Date; import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; -import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; +import org.junit.Test; +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; @@ -14,8 +20,6 @@ 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; /** *

@@ -35,13 +39,6 @@ import org.springframework.test.jpa.AbstractJpaTests; *

  • 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 @@ -52,38 +49,30 @@ import org.springframework.test.jpa.AbstractJpaTests; * @author Sam Brannen * @see AbstractJpaTests */ -public abstract class AbstractJpaClinicTests extends AbstractJpaTests { +public abstract class AbstractJpaClinicTests { + + @PersistenceContext + private EntityManager entityManager; + @Autowired 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) + @Test public void testBogusJpql() { - this.sharedEntityManager.createQuery("SELECT RUBBISH FROM RUBBISH HEAP").executeUpdate(); + try { + this.entityManager.createQuery("SELECT RUBBISH FROM RUBBISH HEAP").executeUpdate(); + fail("exception was expected because of incorrect SQL statement"); + } catch (Exception e) { + // expected + } } - public void testApplicationManaged() { - EntityManager appManaged = this.entityManagerFactory.createEntityManager(); - appManaged.joinTransaction(); - } + @Test 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()); @@ -95,16 +84,17 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals("surgery", (v2.getSpecialties().get(1)).getName()); } + @Test 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()); } + @Test public void testFindOwners() { Collection owners = this.clinic.findOwners("Davis"); assertEquals(2, owners.size()); @@ -112,21 +102,15 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals(0, owners.size()); } + @Test 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(); } + @Test public void testInsertOwner() { Collection owners = this.clinic.findOwners("Schultz"); int found = owners.size(); @@ -138,6 +122,7 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals(found + 1, owners.size()); } + @Test public void testUpdateOwner() throws Exception { Owner o1 = this.clinic.loadOwner(1); String old = o1.getLastName(); @@ -147,6 +132,7 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals(old + "X", o1.getLastName()); } + @Test public void testLoadPet() { Collection types = this.clinic.getPetTypes(); Pet p7 = this.clinic.loadPet(7); @@ -159,6 +145,7 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals("Peter", p6.getOwner().getFirstName()); } + @Test public void testInsertPet() { Owner o6 = this.clinic.loadOwner(6); int found = o6.getPets().size(); @@ -175,6 +162,7 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals(found + 1, o6.getPets().size()); } + @Test public void testUpdatePet() throws Exception { Pet p7 = this.clinic.loadPet(7); String old = p7.getName(); @@ -184,6 +172,7 @@ public abstract class AbstractJpaClinicTests extends AbstractJpaTests { assertEquals(old + "X", p7.getName()); } + @Test public void testInsertVisit() { Pet p7 = this.clinic.loadPet(7); int found = p7.getVisits().size(); diff --git a/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java b/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java index 67c472fde..669cdcd94 100644 --- a/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java +++ b/src/test/java/org/springframework/samples/petclinic/jpa/EntityManagerClinicTests.java @@ -2,7 +2,14 @@ package org.springframework.samples.petclinic.jpa; import java.util.List; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.samples.petclinic.aspects.UsageLogAspect; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.assertFalse; /** *

    @@ -17,23 +24,16 @@ import org.springframework.samples.petclinic.aspects.UsageLogAspect; * @author Rod Johnson * @author Juergen Hoeller */ +@ContextConfiguration(locations={"applicationContext-jpaCommon.xml", "applicationContext-hibernateAdapter.xml", + "applicationContext-entityManager.xml"}) +@RunWith(SpringJUnit4ClassRunner.class) public class EntityManagerClinicTests extends AbstractJpaClinicTests { + @Autowired 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" - }; - } + @Test public void testUsageLogAspectIsInvoked() { String name1 = "Schuurman"; String name2 = "Greenwood"; diff --git a/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java b/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java index d95b452e1..d5dac397e 100644 --- a/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java +++ b/src/test/java/org/springframework/samples/petclinic/jpa/HibernateEntityManagerClinicTests.java @@ -1,5 +1,9 @@ package org.springframework.samples.petclinic.jpa; +import org.junit.runner.RunWith; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + /** *

    * Tests for the DAO variant based on the shared EntityManager approach, using @@ -12,15 +16,9 @@ package org.springframework.samples.petclinic.jpa; * * @author Juergen Hoeller */ +@ContextConfiguration(locations={"applicationContext-jpaCommon.xml", "applicationContext-hibernateAdapter.xml", +"applicationContext-entityManager.xml"}) +@RunWith(SpringJUnit4ClassRunner.class) public class HibernateEntityManagerClinicTests extends EntityManagerClinicTests { - @Override - protected String[] getConfigPaths() { - return new String[] { - "applicationContext-jpaCommon.xml", - "applicationContext-hibernateAdapter.xml", - "applicationContext-entityManager.xml" - }; - } - } diff --git a/src/test/java/org/springframework/samples/petclinic/jpa/OpenJpaEntityManagerClinicTests.java b/src/test/java/org/springframework/samples/petclinic/jpa/OpenJpaEntityManagerClinicTests.java deleted file mode 100644 index 98e38ed61..000000000 --- a/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/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml b/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml index 7320035ce..bcf48e75c 100644 --- a/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml +++ b/src/test/resources/org/springframework/samples/petclinic/hibernate/HibernateClinicTests-context.xml @@ -1,13 +1,13 @@ + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - @@ -15,16 +15,9 @@ ${hibernate.show_sql} - - - - - - - - diff --git a/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml b/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml deleted file mode 100644 index 8f6f7c442..000000000 --- a/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-openJpaAdapter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml b/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml deleted file mode 100644 index ac031de8e..000000000 --- a/src/test/resources/org/springframework/samples/petclinic/jpa/applicationContext-toplinkAdapter.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - -