diff --git a/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp b/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp index 256cca177..5674cabab 100644 --- a/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp +++ b/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp @@ -1,19 +1,30 @@ -<%@ include file="/WEB-INF/jsp/includes.jsp" %> -<%@ include file="/WEB-INF/jsp/header.jsp" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<% -Exception ex = (Exception) request.getAttribute("exception"); -%> -

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

-

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

-
-">Home + +

+ <% + Exception ex = (Exception) request.getAttribute("exception"); + %> + +

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

+

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

+
+ ">Home + +

+ -<%@ include file="/WEB-INF/jsp/footer.jsp" %> + + + diff --git a/src/main/webapp/WEB-INF/jsp/includes.jsp b/src/main/webapp/WEB-INF/jsp/includes.jsp deleted file mode 100644 index 96c3e304c..000000000 --- a/src/main/webapp/WEB-INF/jsp/includes.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> diff --git a/src/main/webapp/WEB-INF/jsp/owners/form.jsp b/src/main/webapp/WEB-INF/jsp/owners/form.jsp index b4c2b2100..208f521f4 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/form.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/form.jsp @@ -1,61 +1,77 @@ -<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -

New Owner:

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

- - -

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

New Owner:

+ + + + + + + + + + + + + + + + + + + + +
+ First Name: +
+ +
+ Last Name: +
+ +
+ Address: +
+ +
+ City: +
+ +
+ Telephone: +
+ +
+ + +

+ + +

+ + +
+ + +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/owners/list.jsp b/src/main/webapp/WEB-INF/jsp/owners/list.jsp index 44fc3cac0..b28ce6b6b 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/list.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/list.jsp @@ -1,34 +1,51 @@ -<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> + + + + + + + + +

Owners:

- - - - - - - - - - - - - - - - - -
NameAddressCityTelephonePets
- - - - ${owner.firstName} ${owner.lastName} - ${owner.address}${owner.city}${owner.telephone} - - ${pet.name}   - -
+ + + + + + + + + + + + + + + + + + + +
NameAddressCityTelephonePets
+ + + + ${owner.firstName} ${owner.lastName} + ${owner.address}${owner.city}${owner.telephone} + + ${pet.name}   + +
-<%@ include file="/WEB-INF/jsp/footer.jsp" %> +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/owners/show.jsp b/src/main/webapp/WEB-INF/jsp/owners/show.jsp index cd7334db1..077d8cff5 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/show.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/show.jsp @@ -11,112 +11,114 @@
-

Owner Information

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

Pets and Visits

- - - - - - - -
- - - - - - - - - - - - - -
Name${pet.name}
Birth Date
Type${pet.type.name}
- 		- - - - - - - - - - - -
Visit DateDescription
${visit.description}
-
- - - - - - - - -
- - - - - Edit Pet - - - - - - Add Visit - - - - - - Atom Feed -
- +

Owner Information

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

Pets and Visits

+ + + + + + + +
+ + + + + + + + + + + + + +
Name${pet.name}
Birth Date
Type${pet.type.name}
+ 		+ + + + + + + + + + + + + +
Visit DateDescription
${visit.description}
+
+ + + + + + + + +
+ + + + + Edit Pet + + + + + + Add Visit + + + + + + Atom Feed +
+ - +
- + diff --git a/src/main/webapp/WEB-INF/jsp/pets/form.jsp b/src/main/webapp/WEB-INF/jsp/pets/form.jsp index 12f503db5..ec06dc162 100644 --- a/src/main/webapp/WEB-INF/jsp/pets/form.jsp +++ b/src/main/webapp/WEB-INF/jsp/pets/form.jsp @@ -1,56 +1,70 @@ -<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -

New Pet

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

- - -

- - -
- + - - -

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

New Pet

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

+ + +

+ + +
+ + + + +

+ + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp index 97183f46c..08dda8e81 100644 --- a/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/pets/visitForm.jsp @@ -1,68 +1,85 @@ -<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -

New Visit:

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

-
- + -
-Previous Visits: - - - - - - - - - - - - - -
DateDescription
${visit.description}
+ -<%@ include file="/WEB-INF/jsp/footer.jsp" %> +
+ +

New Visit:

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

+
+ + +
+ Previous Visits: + + + + + + + + + + + + + +
DateDescription
${visit.description}
+ +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp b/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp index e97fdf378..236a7b9b3 100644 --- a/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp +++ b/src/main/webapp/WEB-INF/jsp/uncaughtException.jsp @@ -1,49 +1,64 @@ -<%@ 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" %> -

Internal error

-

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

+ +

Internal error

+

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

-
+

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

+ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/vets.jsp b/src/main/webapp/WEB-INF/jsp/vets.jsp index cff2154f2..81f3fdfe3 100644 --- a/src/main/webapp/WEB-INF/jsp/vets.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets.jsp @@ -1,31 +1,49 @@ -<%@ 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="c" uri="http://java.sun.com/jsp/jstl/core" %> -

Veterinarians:

- - - - - - - - - - - -
NameSpecialties
${vet.firstName} ${vet.lastName} - - ${specialty.name} - - none -
- - - - -
- ">View as XML -
+ -<%@ include file="/WEB-INF/jsp/footer.jsp" %> + + + + +
+ +

Veterinarians:

+ + + + + + + + + + + + + + + + +
NameSpecialties
${vet.firstName} ${vet.lastName} + + ${specialty.name} + + none +
+ + + + +
+ ">View as XML +
+ +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 9b431e482..9cddcd629 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -2,28 +2,28 @@ <%@ 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;"> +

+ + + +

 

+

 

+ - - -

 

-

 

- - - -
+
+ diff --git a/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml b/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml index 6819d6db4..a45edac8e 100644 --- a/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml +++ b/src/main/webapp/WEB-INF/spring/applicationContext-jdbc.xml @@ -52,7 +52,7 @@ + -->