update velocity-tool3 and update some templates engines

Daniel-Dos · chkal · commit 17bc30aa6e57 · 2018-11-01T08:53:47.000+01:00
diff --git a/examples/velocity/src/main/java/org/mvcspec/ozark/test/velocity/HelloController.java b/examples/velocity/src/main/java/org/mvcspec/ozark/test/velocity/HelloController.java
@@ -39,7 +39,17 @@ public class HelloController {
     @Controller
     @Produces("text/html")
     @View("hello.vm")
+    @Path("v1")
     public void hello(@QueryParam("user") String user) {
         models.put("user", user);
     }
+
+    @GET
+    @Controller
+    @Produces("text/html")
+    @View("hello2.vhtml")
+    @Path("v2")
+    public void hello2(@QueryParam("user2") String user2) {
+        models.put("user2", user2);
+    }
 }
diff --git a/examples/velocity/src/main/webapp/WEB-INF/views/hello2.vhtml b/examples/velocity/src/main/webapp/WEB-INF/views/hello2.vhtml
@@ -0,0 +1,9 @@
+<html>
+    <head>
+      <title>Hello</title>
+      <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
+    </head>
+    <body>
+      <h1>Hello $mvc.encoders.html($user2)!</h1>
+    </body>
+</html>
diff --git a/examples/velocity/src/main/webapp/index.html b/examples/velocity/src/main/webapp/index.html
@@ -8,7 +8,8 @@
 <body>
 <h1>Hello Controller using Velocity</h1>
 <ul>
-    <li><a href="resources/hello?user=mvc">resources/hello?user=mvc</a>
+    <li><a href="resources/hello/v1?user=mvc">resources/hello/v1?user=mvc</a>
+    <li><a href="resources/hello/v2?user2=mvc">resources/hello/v2?user2=mvc</a>
 </ul>
 <br/>
 <a class="source" href="https://github.com/mvc-spec/ozark/blob/master/test/velocity/src/main/java/org/mvcspec/ozark/test/velocity/HelloController.java">Source Code</a>
diff --git a/examples/velocity/src/test/java/org/mvcspec/ozark/test/velocity/VelocityIT.java b/examples/velocity/src/test/java/org/mvcspec/ozark/test/velocity/VelocityIT.java
@@ -44,7 +44,14 @@ public void tearDown() {
 
     @Test
     public void testView1() throws Exception {
-        final HtmlPage page = webClient.getPage(webUrl + "resources/hello?user=mvc");
+        final HtmlPage page = webClient.getPage(webUrl + "resources/hello/v1?user=mvc");
+        final Iterator<HtmlElement> it = page.getDocumentElement().getHtmlElementsByTagName("h1").iterator();
+        assertTrue(it.next().asText().contains("mvc"));
+    }
+    
+    @Test
+    public void testView2() throws Exception {
+        final HtmlPage page = webClient.getPage(webUrl + "resources/hello/v2?user2=mvc");
         final Iterator<HtmlElement> it = page.getDocumentElement().getHtmlElementsByTagName("h1").iterator();
         assertTrue(it.next().asText().contains("mvc"));
     }
diff --git a/ext/asciidoc/pom.xml b/ext/asciidoc/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>org.asciidoctor</groupId>
             <artifactId>asciidoctorj</artifactId>
-            <version>1.5.4</version>
+            <version>1.5.7</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/ext/freemarker/pom.xml b/ext/freemarker/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>
-            <version>2.3.26-incubating</version>
+            <version>2.3.28</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/ext/groovy/pom.xml b/ext/groovy/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-templates</artifactId>
-			<version>2.5.0</version>
+			<version>2.5.3</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/ext/handlebars/pom.xml b/ext/handlebars/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.github.jknack</groupId>
             <artifactId>handlebars</artifactId>
-            <version>4.0.6</version>
+            <version>4.1.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/ext/jade/pom.xml b/ext/jade/pom.xml
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>de.neuland-bfi</groupId>
             <artifactId>jade4j</artifactId>
-            <version>1.2.5</version>
+            <version>1.2.7</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/JadeOzarkConfiguration.java b/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/JadeOzarkConfiguration.java
@@ -95,9 +95,9 @@ JadeConfiguration produce() {
         jade.setMode(Mode.valueOf(property(MODE).orElse("XHTML")));
         jade.setCaching(Boolean.valueOf(property(CACHING).orElse("true")));
         jade.setPrettyPrint(Boolean.valueOf(property(PRETTY_PRINT).orElse("false")));
-        for (Map.Entry<String, Object> filter : getExtensions(FILTER_QUALIFIER).entrySet()) {
+        getExtensions(FILTER_QUALIFIER).entrySet().forEach(filter -> {
             jade.setFilter(filter.getKey(), (Filter) filter.getValue());
-        }
+        });
         jade.setSharedVariables(getExtensions(HELPER_QUALIFIER));
         String encoding = property(ENCODING).orElse("UTF-8");
         jade.setTemplateLoader(new ServletContextTemplateLoader(servletContext, encoding));
diff --git a/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/JadeViewEngine.java b/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/JadeViewEngine.java
@@ -52,7 +52,7 @@ public class JadeViewEngine extends ViewEngineBase {
 
     @Override
     public boolean supports(String view) {
-        return view.endsWith(".jade");
+        return view.endsWith(".".concat(jade.getTemplateLoader().getExtension()));
     }
 
     @Override
diff --git a/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/ServletContextTemplateLoader.java b/ext/jade/src/main/java/org/mvcspec/ozark/ext/jade/ServletContextTemplateLoader.java
@@ -68,4 +68,9 @@ public long getLastModified(String name) throws IOException {
         }
         return template.lastModified();
     }
+
+    @Override
+    public String getExtension() {
+        return "jade";
+    }
 }
diff --git a/ext/jetbrick/pom.xml b/ext/jetbrick/pom.xml
@@ -31,17 +31,17 @@
 		<dependency>
 			<groupId>com.github.subchen</groupId>
 			<artifactId>jetbrick-template</artifactId>
-			<version>2.1.5</version>
+			<version>2.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.subchen</groupId>
 			<artifactId>jetbrick-template-web</artifactId>
-			<version>2.1.5</version>
+			<version>2.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
 			<artifactId>antlr4-runtime</artifactId>
-			<version>4.7</version>
+			<version>4.7.1</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/ext/thymeleaf/pom.xml b/ext/thymeleaf/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf</artifactId>
-            <version>3.0.6.RELEASE</version>
+            <version>3.0.10.RELEASE</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/ext/velocity/pom.xml b/ext/velocity/pom.xml
@@ -29,9 +29,9 @@
     <name>Ozark Velocity Extension</name>
     <dependencies>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.0</version>
+            <groupId>org.apache.velocity.tools</groupId>
+            <artifactId>velocity-tools-view</artifactId>
+            <version>3.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/DefaultVelocityEngineProducer.java b/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/DefaultVelocityEngineProducer.java
@@ -17,11 +17,11 @@
 
 import org.mvcspec.ozark.engine.ViewEngineConfig;
 import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.tools.view.WebappResourceLoader;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
-import org.mvcspec.ozark.ext.velocity.tools.WebappResourceLoader;
 
 /**
  * Producer for the VelocityEngine used by VelocityViewEngine.
diff --git a/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/VelocityViewEngine.java b/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/VelocityViewEngine.java
@@ -50,7 +50,7 @@ public class VelocityViewEngine extends ViewEngineBase {
 
     @Override
     public boolean supports(String view) {
-        return view.endsWith(".vm");
+        return view.endsWith(".vm") || view.endsWith(".vhtml");
     }
 
     @Override
diff --git a/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/tools/WebappResourceLoader.java b/ext/velocity/src/main/java/org/mvcspec/ozark/ext/velocity/tools/WebappResourceLoader.java
