From e44552ea4c45c98ca6b7e3918748b13a9200b83c Mon Sep 17 00:00:00 2001 From: Thibault Duchateau Date: Sun, 24 Feb 2013 20:36:09 +0100 Subject: [PATCH 1/2] Added Dandelion-Datatables New dependencies added Old tables replaced by Datatables using Dandelion-Datatables --- pom.xml | 17 +++++- .../webapp/WEB-INF/jsp/owners/ownersList.jsp | 55 ++++++++----------- src/main/webapp/WEB-INF/jsp/vets/vetList.jsp | 35 +++++------- 3 files changed, 52 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 186d27465..03307a235 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,9 @@ 2.3.0 1.9.2 1.9.0 - + 0.8.5 + 0.1.5 + 2.4 2.5 3.0 @@ -234,7 +236,18 @@ org.aspectj aspectjweaver - + + + com.github.dandelion + datatables-jsp + ${dandelion.datatables.version} + + + com.github.dandelion + datatables-export-itext + ${dandelion.datatables.export.itext.version} + + diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp index 03f785821..ac2aafdb9 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp @@ -2,7 +2,7 @@ <%@ 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="datatables" uri="http://github.com/dandelion/datatables" %> @@ -12,36 +12,29 @@

Owners

- - - - - - - - - - - - - - - - - - - - -
NameAddressCityTelephonePets
- - - - - - - - -
+ + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp index 4adaa14db..93ad827d9 100644 --- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp @@ -1,7 +1,7 @@ <%@ 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="datatables" uri="http://github.com/dandelion/datatables" %> @@ -14,27 +14,18 @@

Veterinarians

- - - - - - - - - - - - - - - -
NameSpecialties
- - - - none -
+ + + + + + + + + none + + +
From 65065a8979ff6e72385fe8dc4bb1a98dba6a491e Mon Sep 17 00:00:00 2001 From: Thibault Duchateau Date: Sun, 24 Feb 2013 21:36:36 +0100 Subject: [PATCH 2/2] Added compatibility with Servlet2.x containers --- pom.xml | 6 ++ src/main/webapp/WEB-INF/web.xml | 152 ++++++++++++++++++-------------- 2 files changed, 94 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index 03307a235..9bd081f59 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,7 @@ 1.9.0 0.8.5 0.1.5 + 0.1.4 2.4 2.5 @@ -247,6 +248,11 @@ datatables-export-itext ${dandelion.datatables.export.itext.version} + + com.github.dandelion + datatables-servlet2 + ${dandelion.datatables.servlet2.version} + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index ef04c4a18..f987a66a9 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,65 +1,89 @@ - - - - Spring PetClinic - Spring PetClinic sample application - - - spring.profiles.active - jdbc - - - - - - contextConfigLocation - classpath:spring/dao-config.xml, classpath:spring/tools-config.xml - - - - org.springframework.web.context.ContextLoaderListener - - - - - petclinic - org.springframework.web.servlet.DispatcherServlet - - contextConfigLocation - classpath:spring/mvc-core-config.xml - - 1 - - - - petclinic - / - - - - - httpMethodFilter - org.springframework.web.filter.HiddenHttpMethodFilter - - - - httpMethodFilter - petclinic - - + + + + Spring PetClinic + Spring PetClinic sample application + + + spring.profiles.active + jdbc + + + + + + contextConfigLocation + classpath:spring/dao-config.xml, classpath:spring/tools-config.xml + + + + org.springframework.web.context.ContextLoaderListener + + + + + petclinic + org.springframework.web.servlet.DispatcherServlet + + contextConfigLocation + classpath:spring/mvc-core-config.xml + + 1 + + + + petclinic + / + + + + + datatablesController + com.github.dandelion.datatables.extras.servlet2.servlet.DatatablesServlet + + + + + datatablesController + /datatablesController/* + + + + + datatablesFilter + com.github.dandelion.datatables.extras.servlet2.filter.DatatablesFilter + + + + + datatablesFilter + /* + + + + + httpMethodFilter + org.springframework.web.filter.HiddenHttpMethodFilter + + + + httpMethodFilter + petclinic + + \ No newline at end of file