From: Kai Moritz <kai@juplo.de>
Date: Fri, 25 May 2018 13:12:01 +0000 (+0200)
Subject: WIP
X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=cad9765ac28b46e57562c45808bcc19865812e01;p=website

WIP
---

diff --git a/pom.xml b/pom.xml
index 7d35979b..ce43e833 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,12 +42,14 @@
     <!-- Verwendete Versionen -->
     <jsp-api.version>2.2.1</jsp-api.version>
     <jstl.version>1.2</jstl.version>
+    <juplo-dialect.version>1.0.0</juplo-dialect.version>
     <servlet-api.version>3.0.1</servlet-api.version>
     <slf4j.version>1.6.1</slf4j.version>
     <springframework.version>4.0.6.RELEASE</springframework.version>
     <thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
     <thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
     <thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
+    <thymeproxy.version>1.1.0</thymeproxy.version>
 
   </properties>
 
@@ -92,6 +94,18 @@
       <version>${thymeleaf-extras-conditionalcomments.version}</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>de.juplo</groupId>
+      <artifactId>thymeproxy</artifactId>
+      <version>${thymeproxy.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>de.juplo.thymeleaf</groupId>
+      <artifactId>juplo-dialect</artifactId>
+      <version>${juplo-dialect.version}</version>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- Servlet -->
     <dependency>
@@ -212,35 +226,6 @@
         <artifactId>appengine-maven-plugin</artifactId>
         <version>1.8.2</version>
       </plugin>
-      <plugin>
-        <groupId>com.github.eirslett</groupId>
-        <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.25</version>
-        <executions>
-          <execution>
-            <id>install node and npm</id>
-            <goals>
-              <goal>install-node-and-npm</goal>
-            </goals>
-            <configuration>
-              <nodeVersion>v0.10.18</nodeVersion>
-              <npmVersion>1.3.8</npmVersion>
-            </configuration>
-          </execution>
-          <execution>
-            <id>npm install</id>
-            <goals>
-              <goal>npm</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>grunt build</id>
-            <goals>
-              <goal>grunt</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml
index 04c56376..58a5ec15 100644
--- a/src/main/resources/spring/mvc.xml
+++ b/src/main/resources/spring/mvc.xml
@@ -68,6 +68,8 @@
       <util:set>
         <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
         <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
+        <bean class="de.juplo.thymeproxy.ThymeproxyDialect"/>
+        <bean class="de.juplo.thymeleaf.JuploDialect"/>
       </util:set>
     </property>
   </bean>