petclinic-uncached
Changes
pom.xml 9(+8 -1)
src/main/webapp/WEB-INF/jsp/header.jsp 12(+9 -3)
src/main/webapp/WEB-INF/jsp/owners/form.jsp 105(+51 -54)
src/main/webapp/WEB-INF/jsp/vets.jsp 10(+4 -6)
src/main/webapp/WEB-INF/jsp/welcome.jsp 11(+3 -8)
Details
pom.xml 9(+8 -1)
diff --git a/pom.xml b/pom.xml
index a60fcf2..a5606ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,14 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
-
+
+ <!-- Webjars (static dependencies distributed as JAR files) -->
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+
<!-- Rome RSS -->
<dependency>
<groupId>rome</groupId>
diff --git a/src/main/webapp/resources/css/petclinic.css b/src/main/webapp/resources/css/petclinic.css
new file mode 100644
index 0000000..ebf2eb1
--- /dev/null
+++ b/src/main/webapp/resources/css/petclinic.css
@@ -0,0 +1,5 @@
+.container {
+ padding-top: 10px;
+ margin-left: 50px;
+}
+
src/main/webapp/WEB-INF/jsp/header.jsp 12(+9 -3)
diff --git a/src/main/webapp/WEB-INF/jsp/header.jsp b/src/main/webapp/WEB-INF/jsp/header.jsp
index 1cdc670..7ca6578 100644
--- a/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -5,9 +5,15 @@
-->
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <link rel="stylesheet" href="<spring:url value="/static/styles/petclinic.css" htmlEscape="true" />" type="text/css"/>
- <title>PetClinic :: a Spring Framework demonstration</title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>PetClinic :: a Spring Framework demonstration</title>
+
+ <spring:url value="/resources/css/petclinic.css" var="petclinicCss" />
+ <link href="${petclinicCss}" rel="stylesheet"/>
+
+ <spring:url value="/webjars/bootstrap/2.2.1/css/bootstrap.min.css" var="bootstrapCss" />
+ <link href="${bootstrapCss}" rel="stylesheet"/>
+
</head>
src/main/webapp/WEB-INF/jsp/owners/form.jsp 105(+51 -54)
diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/form.jsp
index 6ebdf28..f051703 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/form.jsp
@@ -10,69 +10,66 @@
<jsp:include page="../header.jsp"/>
<body>
- <div id="header">
+ <div id="header well">
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
</div>
- <div id="main">
+ <div class="container" style="padding-top: 50px;">
<c:choose>
<c:when test="${owner['new']}"><c:set var="method" value="post"/></c:when>
<c:otherwise><c:set var="method" value="put"/></c:otherwise>
</c:choose>
- <h2><c:if test="${owner['new']}">New </c:if>Owner:</h2>
- <form:form modelAttribute="owner" method="${method}">
- <table>
- <tr>
- <th>
- First Name: <form:errors path="firstName" cssClass="errors"/>
- <br/>
- <form:input path="firstName" size="30" maxlength="80"/>
- </th>
- </tr>
- <tr>
- <th>
- Last Name: <form:errors path="lastName" cssClass="errors"/>
- <br/>
- <form:input path="lastName" size="30" maxlength="80"/>
- </th>
- </tr>
- <tr>
- <th>
- Address: <form:errors path="address" cssClass="errors"/>
- <br/>
- <form:input path="address" size="30" maxlength="80"/>
- </th>
- </tr>
- <tr>
- <th>
- City: <form:errors path="city" cssClass="errors"/>
- <br/>
- <form:input path="city" size="30" maxlength="80"/>
- </th>
- </tr>
- <tr>
- <th>
- Telephone: <form:errors path="telephone" cssClass="errors"/>
- <br/>
- <form:input path="telephone" size="20" maxlength="20"/>
- </th>
- </tr>
- <tr>
- <td>
- <c:choose>
- <c:when test="${owner['new']}">
- <p class="submit"><input type="submit" value="Add Owner"/></p>
- </c:when>
- <c:otherwise>
- <p class="submit"><input type="submit" value="Update Owner"/></p>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </table>
+ <h2><c:if test="${owner['new']}">New </c:if>Owner</h2>
+ <form:form modelAttribute="owner" method="${method}" class="form-horizontal" id="add-owner-form">
+ <fieldset>
+ <div class="control-group" id="firstName">
+ <label class="control-label">First Name </label>
+ <div class="controls">
+ <form:input path="firstName" />
+ <span class="help-inline"><form:errors path="firstName" /></span>
+ </div>
+ </div>
+ <div class="control-group" id="lastName">
+ <label class="control-label">Last Name </label>
+ <div class="controls">
+ <form:input path="lastName" />
+ <span class="help-inline"><form:errors path="lastName" /></span>
+ </div>
+ </div>
+ <div class="control-group" id="address">
+ <label class="control-label">Address </label>
+ <div class="controls">
+ <form:input path="address" />
+ <span class="help-inline"><form:errors path="address" /></span>
+ </div>
+ </div>
+ <div class="control-group" id="city">
+ <label class="control-label">City </label>
+ <div class="controls">
+ <form:input path="city" />
+ <span class="help-inline"><form:errors path="city" /></span>
+ </div>
+ </div>
+ <div class="control-group" id="telephone">
+ <label class="control-label">Telephone </label>
+ <div class="controls">
+ <form:input path="telephone" />
+ <span class="help-inline"><form:errors path="telephone" /></span>
+ </div>
+ </div>
+ <div class="form-actions">
+ <c:choose>
+ <c:when test="${owner['new']}">
+ <button type="submit">Add Owner</button>
+ </c:when>
+ <c:otherwise>
+ <button type="submit">Update Owner</button>
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </fieldset>
</form:form>
-
</div>
<jsp:include page="../footer.jsp"/>
</body>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/list.jsp b/src/main/webapp/WEB-INF/jsp/owners/list.jsp
index cb679b0..5ca9cec 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/list.jsp
@@ -9,15 +9,14 @@
<jsp:include page="../header.jsp"/>
<body>
- <div id="header">
+
+ <div class="container">
+
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
- </div>
- <div id="main">
-
- <h2>Owners:</h2>
+ <h2>Owners</h2>
- <table>
+ <table class="table table-striped">
<thead>
<tr>
<th>Name</th>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/search.jsp b/src/main/webapp/WEB-INF/jsp/owners/search.jsp
index 1a1614f..440da97 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/search.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/search.jsp
@@ -9,23 +9,21 @@
<body>
- <div id="header">
+ <div class="container">
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
- </div>
- <div id="main">
- <h2>Find Owners:</h2>
+ <h2>Find Owners</h2>
<spring:url value="/owners" var="formUrl"/>
- <form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get">
+ <form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get" class="form-horizontal">
<fieldset>
- <label class="control-label">Last name:</label>
<div class="controls">
+ <label class="control-label">Last name </label>
<form:input path="lastName" size="30" maxlength="80"/>
- <form:errors path="*" cssClass="errors"/>
+ <span class="help-inline"><form:errors path="*" /></span>
</div>
- <div>
+ <div class="form-actions">
<button type="submit">Find Owner</button>
</div>
</fieldset>
@@ -36,7 +34,7 @@
<jsp:include page="../footer.jsp"/>
- </div>
+ </div>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/src/main/webapp/WEB-INF/jsp/owners/show.jsp
index 60c0c03..640d31e 100644
--- a/src/main/webapp/WEB-INF/jsp/owners/show.jsp
+++ b/src/main/webapp/WEB-INF/jsp/owners/show.jsp
@@ -3,21 +3,19 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+<html lang="en">
<jsp:include page="../header.jsp"/>
<body>
- <div id="header">
+ <div class="container">
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
- </div>
- <div id="main">
- <h2>Owner Information</h2>
+ <h2>Owner Information</h2>
- <table>
+ <table class="table table-striped" style="width:600px;">
<tr>
<th>Name</th>
<td><b>${owner.firstName} ${owner.lastName}</b></td>
@@ -55,7 +53,7 @@
<h2>Pets and Visits</h2>
<c:forEach var="pet" items="${owner.pets}">
- <table width="94%">
+ <table class="table" style="width:600px;">
<tr>
<td valign="top">
<table>
@@ -119,10 +117,11 @@
</tr>
</table>
</c:forEach>
+
+ <jsp:include page="../footer.jsp"/>
</div>
- <jsp:include page="../footer.jsp"/>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/form.jsp
index c3d9427..495e7df 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/form.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/form.jsp
@@ -8,12 +8,10 @@
<jsp:include page="../header.jsp"/>
<body>
- <div id="header">
+
+ <div class="container">
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
- </div>
-
- <div id="main">
<c:choose>
<c:when test="${pet['new']}"><c:set var="method" value="post"/></c:when>
<c:otherwise><c:set var="method" value="put"/></c:otherwise>
diff --git a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
index 0756eed..871c99a 100644
--- a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp
@@ -9,13 +9,11 @@
<jsp:include page="../header.jsp"/>
<body>
- <div id="header">
- <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
- <img src="${banner}" />
- </div>
- <div id="main">
+ <div class="container">
+ <spring:url value="/resources/images/banner-graphic.png" var="banner"/>
+ <img src="${banner}" />
<h2><c:if test="${visit['new']}">New </c:if>Visit:</h2>
<form:form modelAttribute="visit">
src/main/webapp/WEB-INF/jsp/vets.jsp 10(+4 -6)
diff --git a/src/main/webapp/WEB-INF/jsp/vets.jsp b/src/main/webapp/WEB-INF/jsp/vets.jsp
index 8c12018..bb9e0d0 100644
--- a/src/main/webapp/WEB-INF/jsp/vets.jsp
+++ b/src/main/webapp/WEB-INF/jsp/vets.jsp
@@ -5,17 +5,15 @@
<html lang="en">
-<jsp:include page="header.jsp"/>
<body>
- <div id="header">
+ <div class="container">
+ <jsp:include page="header.jsp"/>
+
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
- </div>
-
- <div id="main">
- <h2>Veterinarians:</h2>
+ <h2>Veterinarians</h2>
<table>
<thead>
src/main/webapp/WEB-INF/jsp/welcome.jsp 11(+3 -8)
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 95270b8..f292716 100644
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -7,27 +7,22 @@
<jsp:include page="header.jsp"/>
<body>
- <div id="header">
+ <div class="container">
<spring:url value="/resources/images/banner-graphic.png" var="banner"/>
<img src="${banner}" />
- </div>
-
- <div id="main">
<img src="<spring:url value="/resources/images/pets.png" htmlEscape="true" />" align="right" style="position:relative;right:30px;"></img>
<h2><fmt:message key="welcome"/></h2>
- <ul>
+ <ul class="unstyled">
<li><a href="<spring:url value="/owners/search" htmlEscape="true" />">Find owner</a></li>
<li><a href="<spring:url value="/vets" htmlEscape="true" />">Display all veterinarians</a></li>
<li><a href="<spring:url value="/resources/html/tutorial.html" htmlEscape="true" />">Tutorial</a></li>
</ul>
- <p> </p>
- <p> </p>
+ <jsp:include page="footer.jsp"/>
</div>
- <jsp:include page="footer.jsp"/>
</body>
</html>
diff --git a/src/main/webapp/WEB-INF/petclinic-servlet.xml b/src/main/webapp/WEB-INF/petclinic-servlet.xml
index 4c56a42..095746e 100644
--- a/src/main/webapp/WEB-INF/petclinic-servlet.xml
+++ b/src/main/webapp/WEB-INF/petclinic-servlet.xml
@@ -64,6 +64,9 @@
<mvc:annotation-driven content-negotiation-manager="contentNegotiationManager" />
<mvc:resources mapping="/resources/**" location="/resources/"/>
+
+ <mvc:resources mapping="/webjars/**" location="classpath:/META-INF/resources/webjars/"/>
+
<bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
<property name="favorPathExtension" value="false" />
diff --git a/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml b/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml
index a45edac..162fab1 100644
--- a/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml
+++ b/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml
@@ -53,7 +53,7 @@
Exporter that exposes the Clinic DAO and the CallMonitoringAspect via JMX,
based on the @ManagedResource, @ManagedAttribute, and @ManagedOperation annotations.
-->
- <context:mbean-export/>
+ <context:mbean-export/>
<!-- PetClinic's central data access object using Spring's SimpleJdbcTemplate -->
<bean id="clinic" class="org.springframework.samples.petclinic.jdbc.SimpleJdbcClinic"/>