org.webjars
diff --git a/readme.md b/readme.md
index bcedd41e9..d0ad14f94 100644
--- a/readme.md
+++ b/readme.md
@@ -73,10 +73,6 @@ File -> Import -> Maven -> Existing Maven project
| Caching |
Use of EhCache CacheConfig.java ehcache.xml |
-
- | Dandelion |
- DatatablesFilter, DandelionFilter and DandelionServlet registration DandelionConfig.java |
-
| Spring MVC - XML integration |
CustomViewsConfiguration.java |
@@ -104,15 +100,6 @@ File -> Import -> Maven -> Existing Maven project
sample usage in JSP
-
- | Dandelion-datatables |
-
- ownersList.jsp
- vetList.jsp
- web.xml
- datatables.properties
- |
-
diff --git a/src/main/java/org/springframework/samples/petclinic/config/DandelionConfig.java b/src/main/java/org/springframework/samples/petclinic/config/DandelionConfig.java
deleted file mode 100644
index b13737fca..000000000
--- a/src/main/java/org/springframework/samples/petclinic/config/DandelionConfig.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.samples.petclinic.config;
-
-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.beans.factory.annotation.Autowired;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.ServletRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Description;
-import org.springframework.core.env.Environment;
-
-import javax.annotation.PostConstruct;
-
-/**
- * Java configuration for the Dandelion datatables component.
- *
- * @author Antoine Rey
- */
-@Configuration
-public class DandelionConfig {
-
- @Autowired
- private Environment environment;
-
- @PostConstruct
- public void init() {
- if (environment.acceptsProfiles("production")) {
- System.setProperty("dandelion.profile.active", "prod");
- }
- }
-
- @Bean
- @Description("Dandelion filter definition and mapping")
- public FilterRegistrationBean filterRegistrationBean() {
- FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
- filterRegistrationBean.setFilter(new DandelionFilter());
- return filterRegistrationBean;
- }
-
- @Bean
- @Description("Dandelion-Datatables filter, used for basic export")
- public FilterRegistrationBean datatablesRegistrationBean() {
- FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
- filterRegistrationBean.setFilter(new DatatablesFilter());
- return filterRegistrationBean;
- }
-
- @Bean
- public ServletRegistrationBean servletRegistrationBean() {
- ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean();
- servletRegistrationBean.setServlet(new DandelionServlet());
- servletRegistrationBean.addUrlMappings("/dandelion-assets/*");
- servletRegistrationBean.setName("dandelionServlet");
- return servletRegistrationBean;
- }
-}
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/jetty-web.xml b/src/main/webapp/WEB-INF/jetty-web.xml
new file mode 100644
index 000000000..5bb92f033
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jetty-web.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+ true
+
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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ | Name |
+ Address |
+ City |
+ Telephone |
+ Pets |
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+ |
+
+
+
+
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
-
-
+
+
+
+ | Name |
+ Specialties |
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+ none
+ |
+
+
+
+