diff --git a/org.springframework.samples.petclinic/pom.xml b/org.springframework.samples.petclinic/pom.xml index e38359706..808c5f6f6 100644 --- a/org.springframework.samples.petclinic/pom.xml +++ b/org.springframework.samples.petclinic/pom.xml @@ -22,11 +22,41 @@ 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 @@ -57,6 +87,12 @@ spring-jdbc ${spring.version} + + + org.springframework.webflow + spring-js + 2.0.7.RELEASE + javax.servlet 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 index b37beeda4..08ab75826 100644 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/home.jsp +++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/home.jsp @@ -1,12 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> -<%@ page session="false" %> - - - Welcome - - -

- Congratulations! You're running Spring! -

- - +

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/spring/mvc-config.xml b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/spring/mvc-config.xml index c9833d687..15466b8fc 100644 --- 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 @@ -28,9 +28,21 @@ + + + + + + + + + + + + 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 index 26672b6cd..9e3a4589b 100644 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/urlrewrite.xml +++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/urlrewrite.xml @@ -1,6 +1,10 @@ + + /resources/** + /resources/$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 index 95239d4a2..8238f5100 100644 --- a/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml +++ b/org.springframework.samples.petclinic/src/main/webapp/WEB-INF/web.xml @@ -32,5 +32,18 @@ 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/images/banner-graphic.png b/org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png new file mode 100644 index 000000000..e6d01d588 Binary files /dev/null and b/org.springframework.samples.petclinic/src/main/webapp/images/banner-graphic.png differ diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/pets.png b/org.springframework.samples.petclinic/src/main/webapp/images/pets.png new file mode 100644 index 000000000..0fe63c282 Binary files /dev/null and b/org.springframework.samples.petclinic/src/main/webapp/images/pets.png differ diff --git a/org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png b/org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png new file mode 100644 index 000000000..e170f8abf Binary files /dev/null and b/org.springframework.samples.petclinic/src/main/webapp/images/springsource-logo.png differ diff --git a/org.springframework.samples.petclinic/src/main/webapp/styles/main.css b/org.springframework.samples.petclinic/src/main/webapp/styles/main.css new file mode 100644 index 000000000..2eb8f819f --- /dev/null +++ b/org.springframework.samples.petclinic/src/main/webapp/styles/main.css @@ -0,0 +1,118 @@ +* { + margin: 0px; + padding: 0px; +} + +body { + background-image: url(../images/banner-graphic.png); + background-position: top; + background-repeat: no-repeat; + width: 820px; + margin: auto; + margin-top: 60px; + font-family:verdana; + font-size: 62.5%; +} + +h2 { + text-align: center; +} + +/* Header */ +#header { + height: 50px; +} + +#signin { + float: right; + list-style: none; + width: 100px; + overflow: hidden; +} +#signin li{ + display: inline; + padding: 0 2px; + border-left: 1px solid #000; + margin-left: -1px; +} +#signin li a{ + +} +#nav { + margin-left: auto; + margin-right: auto; + width: 600px; + clear: right; + padding: 1em; +} +#nav ul { + list-style: none; +} +#nav ul li { + display: inline; +} +#nav ul li a { + display: block; + float: left; + width: 150px; + font-size: 1.2em; +} + +/* Sidebar */ +#sidebar { + float: left; + width: 200px; +} +#sub-nav { + list-style: none; +} +#sub-nav li { + display: inline; +} +#sub-nav li a { + display: block; + font-size: 1.2em; +} + +/* content */ +#content{ + font-size: 1.2em; +} + +#petlogo { + display: block; + margin-left: auto; + margin-right: auto; +} + +#main{ + padding-left: 200px; +} +#main label{ + display: block; + padding: 1em 0; +} +/* content - application */ + +#footer { + clear: both; + padding-top: 1em; +} +#copyright{ + float: left; +} +ul#legal{ + list-style: none; + width: 300px; + overflow: hidden; + float: right; +} +ul#legal li{ + display: inline; + padding: 0px 4px 0px 5px; + border-left: 1px solid #000; + margin-left: -1px; +} +ul#legal li a{ + +} \ No newline at end of file