diff --git a/pom.xml b/pom.xml
index 2302123042914cad03d90a31e42beed005b5383e..186d27465f5eb8c49bcb40363be41498cc8c4b91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
<packaging>war</packaging>
<properties>
+ <antlr.version>2.7.7</antlr.version>
<aspectj.version>1.7.1</aspectj.version>
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-lang3.version>3.1</commons-lang3.version>
@@ -70,6 +71,7 @@
<maven-taglist-plugin.version>2.4</maven-taglist-plugin.version>
<maven.version.range>[2.2.1,3.1.0)</maven.version.range>
<maven-war-plugin.version>2.3</maven-war-plugin.version>
+ <maven-tomcat-plugin.version>2.0</maven-tomcat-plugin.version>
<mysql.version>5.1.22</mysql.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -353,88 +355,20 @@
</filesets>
</configuration>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${maven-jetty-plugin.version}</version>
- <configuration>
- <webAppConfig>
- <contextPath>/${project.name}</contextPath>
- </webAppConfig>
- <!--
- "stopPort" - Port number to receive a stop command and shutdown - use "mvn jetty:stop"
- "stopKey" - String value that must be sent to the stopPort to validate the stop command
- -->
- <stopPort>9966</stopPort>
- <stopKey>shutterdown</stopKey>
- <systemProperties>
- <systemProperty>
- <name>logback.configurationFile</name>
- <value>./src/main/resources/logback.xml</value>
- </systemProperty>
- <systemProperty>
- <name>com.sun.management.jmxremote</name>
- <value>true</value>
- </systemProperty>
- <systemProperty>
- <name>com.sun.management.jmxremote.port</name>
- <value>8050</value>
- </systemProperty>
- <systemProperty>
- <name>com.sun.management.jmxremote.ssl</name>
- <value>false</value>
- </systemProperty>
- <systemProperty>
- <name>com.sun.management.jmxremote.authenticate</name>
- <value>false</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>${logback.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>${commons-dbcp.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons-pool.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>${maven-tomcat-plugin.version}</version>
+ <configuration>
+ <server>tomcat-development-server</server>
+ <port>9966</port>
+ <path>/petclinic</path>
+ </configuration>
+ </plugin>
+
+
<!-- *******************************************************
gDickens: For reliable builds, ensure:
* NO duplicate jars of differing versions
@@ -870,7 +804,12 @@
<artifactId>joda-time-jsptags</artifactId>
<version>${jodatime-jsptags.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>${antlr.version}</version>
+ </dependency>
+
<!-- Databases - Uses HSQL by default -->
<!-- <dependency>
<groupId>mysql</groupId>
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000000000000000000000000000000000000..effcff0554cb3bc2041913b8911ba3991e689e5a
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,156 @@
+# Spring PetClinic Sample Application
+
+## What does it look like?
+spring-petclinic has been deployed here on cloudfoundry: http://spring-petclinic.cloudfoundry.com/
+
+## Running petclinic locally
+```git clone https://github.com/SpringSource/spring-petclinic.git
+mvn tomcat7:run```
+You can then access petclinic here: http://localhost:9966/petclinic/
+
+
+
+
+## Petclinic in Eclipse/STS
+
+###prerequisites
+The following items should be installed in your system:
+* Maven 3 (http://www.sonatype.com/books/mvnref-book/reference/installation.html)
+* git command line tool
+Maven 3 should be installed on your system.
+If you're not sure how to install Maven, you can follow the instructions here:
+
+You then have several options:
+
+A) Using the command line and the m2e plugin for Eclipse/STS
+
+In the command line
+```git clone https://github.com/SpringSource/spring-petclinic.git```
+Inside Eclipse: make sure that Eclipse Maven Integration (m2e) is installed.
+(You should have m2 icon in Help -> About dialog)
+If m2e is not there and if you wish to install it: http://www.eclipse.org/m2e/
+
+```File -> Import -> Maven -> Existing Maven project```
+
+
+
+B) Using Maven the command line
+git clone git@github.com:michaelisvy/mvc-layout-samples.git
+cd mvc-layout-samples
+mvn eclipse:eclipse
+
+NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
+Your project is now ready to be imported into Eclipse.
+File -> Import -> Existing project into Eclipse
+
+
+
+
+
+
+@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 <context:mbean-export/> 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 Maven.
+When the project is first built, Maven will automatically download all required
+dependencies (if these haven't been downloaded before). 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:
+
+- mvn clean --> cleans the project
+- mvn clean test --> cleans the project and runs all tests
+- mvn clean package --> cleans the project and builds the WAR
+
+After building the project with "mvn clean package", you will find the
+resulting WAR file in the "target/" 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.
+
+Notes on service static resources:
+ - Most web containers provide a 'default' servlet for serving static
+ resources; Petclinic relies on it for its images.
+ - On containers without such a mapping (ex: GlassFish), uncomment the
+ 'default' declaration in "WEB-INF/web.xml".
+
+==========================================================================
+=== 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 "<Context>" 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.
+
+<Context path="/petclinic" docBase="/petclinic/location" ...>
+ <!-- please note that useSystemClassLoaderAsParent is available since Tomcat 5.5.20; remove it if previous versions are being used -->
+ <Loader loaderClass="org.springframework.instrument.classloading.tomcat.TomcatInstrumentableClassLoader" useSystemClassLoaderAsParent="false"/>
+ ...
+</Context>
diff --git a/src/main/resources/spring/dao-config.xml b/src/main/resources/spring/dao-config.xml
index c29a9bd4ca5e36182e10b7cd4ad8f99e4ff229f9..620f8852747feb0d8fa56a8f25311a499f3cdb8e 100644
--- a/src/main/resources/spring/dao-config.xml
+++ b/src/main/resources/spring/dao-config.xml
@@ -16,7 +16,7 @@
http://www.springframework.org/schema/tx/spring-tx.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context.xsd">
-
+
<!-- ========================= RESOURCE DEFINITIONS ========================= -->
<!-- import the dataSource definition -->