diff --git a/pom.xml b/pom.xml index 9673702ad..6284eab6b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,10 +30,6 @@ 5.1.36 - - 1.1.1 - 1.1.0 - 2.7 HSQL @@ -85,6 +81,14 @@ taglibs-standard-jstlel + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + com.jayway.jsonpath json-path @@ -218,22 +222,6 @@ test - - - com.github.dandelion - dandelion-jsp - ${dandelion.version} - - - com.github.dandelion - datatables-jsp - ${dandelion.datatables.version} - - - com.github.dandelion - datatables-export-itext - ${dandelion.datatables.version} - diff --git a/readme.md b/readme.md index e7ea14156..6edb3ae87 100644 --- a/readme.md +++ b/readme.md @@ -107,15 +107,6 @@ File -> Import -> Maven -> Existing Maven project sample usage in JSP - - Dandelion-datatables - - ownersList.jsp - vetList.jsp - PetclinicInitializer.java - datatables.properties - - Thymeleaf branch diff --git a/src/main/java/org/springframework/samples/petclinic/PetclinicInitializer.java b/src/main/java/org/springframework/samples/petclinic/PetclinicInitializer.java index d1c759db9..66e4e351a 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetclinicInitializer.java +++ b/src/main/java/org/springframework/samples/petclinic/PetclinicInitializer.java @@ -15,19 +15,14 @@ */ package org.springframework.samples.petclinic; -import com.github.dandelion.core.web.DandelionFilter; -import com.github.dandelion.core.web.DandelionServlet; -import com.github.dandelion.datatables.core.web.filter.DatatablesFilter; -import org.springframework.util.Assert; -import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.XmlWebApplicationContext; import org.springframework.web.filter.CharacterEncodingFilter; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer; -import javax.servlet.*; -import java.util.EnumSet; +import javax.servlet.Filter; +import javax.servlet.ServletContext; /** @@ -35,8 +30,8 @@ import java.util.EnumSet; * {@link ServletContext} programmatically. *

* Create the Spring "root" application context.
- * Register a {@link DispatcherServlet} and a {@link DandelionServlet} in the servlet context.
- * For both servlets, register a {@link CharacterEncodingFilter}, a {@link DandelionFilter} an a {@link DatatablesFilter}. + * Register a {@link DispatcherServlet} in the servlet context.
+ * For both servlets, register a {@link CharacterEncodingFilter}. *

* * @author Antoine Rey @@ -52,14 +47,6 @@ public class PetclinicInitializer extends AbstractDispatcherServletInitializer { */ private static final String SPRING_PROFILE = "jpa"; - private static final String DANDELION_SERVLET = "dandelionServlet"; - - @Override - public void onStartup(ServletContext servletContext) throws ServletException { - super.onStartup(servletContext); - registerDandelionServlet(servletContext); - } - @Override protected WebApplicationContext createRootApplicationContext() { XmlWebApplicationContext rootAppContext = new XmlWebApplicationContext(); @@ -68,7 +55,6 @@ public class PetclinicInitializer extends AbstractDispatcherServletInitializer { return rootAppContext; } - @Override protected WebApplicationContext createServletApplicationContext() { XmlWebApplicationContext webAppContext = new XmlWebApplicationContext(); @@ -85,27 +71,7 @@ public class PetclinicInitializer extends AbstractDispatcherServletInitializer { protected Filter[] getServletFilters() { // Used to provide the ability to enter Chinese characters inside the Owner Form CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter("UTF-8", true); - - // Dandelion filter definition and mapping --> - DandelionFilter dandelionFilter = new DandelionFilter(); - - // Dandelion-Datatables filter, used for basic export --> - DatatablesFilter datatablesFilter = new DatatablesFilter(); - - return new Filter[]{characterEncodingFilter, dandelionFilter, datatablesFilter}; + return new Filter[]{characterEncodingFilter}; } - @Override - protected FilterRegistration.Dynamic registerServletFilter(ServletContext servletContext, Filter filter) { - FilterRegistration.Dynamic registration = super.registerServletFilter(servletContext, filter); - registration.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, DispatcherType.INCLUDE), false, DANDELION_SERVLET); - return registration; - } - - private void registerDandelionServlet(ServletContext servletContext) { - DandelionServlet dandelionServlet = new DandelionServlet(); - ServletRegistration.Dynamic registration = servletContext.addServlet(DANDELION_SERVLET, dandelionServlet); - registration.setLoadOnStartup(2); - registration.addMapping("/dandelion-assets/*"); - } } diff --git a/src/main/resources/dandelion/datatables/datatables.properties b/src/main/resources/dandelion/datatables/datatables.properties deleted file mode 100644 index 08b1e439c..000000000 --- a/src/main/resources/dandelion/datatables/datatables.properties +++ /dev/null @@ -1,6 +0,0 @@ -# ================================== -# Dandelion-Datatables configuration -# ================================== - -# Disable the asset management of Dandelion-Core for all non-DataTable-related assets -main.standalone=true \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp index 2f862488f..08b1605cf 100644 --- a/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/owners/ownersList.jsp @@ -3,31 +3,46 @@ <%@ 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" %> <%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>

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 d8e48e853..a46434a7f 100644 --- a/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp +++ b/src/main/webapp/WEB-INF/jsp/vets/vetList.jsp @@ -2,24 +2,34 @@ <%@ 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" %> <%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>

Veterinarians

- - - - - - - - - none - - + + + + + + + + + + + + + + + +
NameSpecialties
+ + + + + + none +