From: Kai Moritz Date: Tue, 24 Jan 2017 14:04:51 +0000 (+0100) Subject: Paket umbenannt und überarbeitet (Feinschliff) X-Git-Url: http://juplo.de/gitweb/?a=commitdiff_plain;h=1e489c1a5891883d2677c9531c2874ab7dec5ea0;p=website Paket umbenannt und überarbeitet (Feinschliff) --- diff --git a/package.json b/package.json index 05027f84..9fcdeb09 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "branding", + "name": "website", "version": "1.0.0", "devDependencies": { "grunt": "~0.4.5", diff --git a/pom.xml b/pom.xml index 1f38b119..7d35979b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,12 @@ de.juplo - branding - Juplo - branding + website + Juplo - Website + WAR, that deliveres one ore more statically defined websites with thymeleaf-power layout-sugar 1.0-SNAPSHOT war - http://www.juplo.de/branding + http://www.juplo.de/website @@ -18,9 +19,9 @@ - scm:git:http://juplo.de/git/branding - scm:git:ssh://juplo.de:/var/lib/git/juplo/branding - http://juplo.de/gitweb/?p=branding;a=summary + scm:git:http://juplo.de/git/website + scm:git:ssh://juplo.de:/var/lib/git/juplo/website + http://juplo.de/gitweb/?p=website;a=summary @@ -149,14 +150,14 @@ - branding + website org.apache.maven.plugins maven-compiler-plugin - 1.6 - 1.6 + 1.8 + 1.8 utf8 true diff --git a/src/main/resources/branding.properties b/src/main/resources/branding.properties deleted file mode 100644 index 5fea927e..00000000 --- a/src/main/resources/branding.properties +++ /dev/null @@ -1 +0,0 @@ -branding.cacheable=true diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml index bd792076..04c56376 100644 --- a/src/main/resources/spring/mvc.xml +++ b/src/main/resources/spring/mvc.xml @@ -15,15 +15,15 @@ http://www.springframework.org/schema/util/spring-util-4.0.xsd "> - - + + - + - + @@ -58,7 +58,7 @@ - + diff --git a/src/main/resources/website.properties b/src/main/resources/website.properties new file mode 100644 index 00000000..4f5e8dd8 --- /dev/null +++ b/src/main/resources/website.properties @@ -0,0 +1 @@ +website.cacheable=true diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index a204d6b3..763fc1bd 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - branding + website @@ -44,7 +44,7 @@ - Dispatcher Servlet - Branding + Dispatcher Servlet - Website org.springframework.web.servlet.DispatcherServlet contextConfigLocation @@ -55,7 +55,7 @@ - Dispatcher Servlet - Branding + Dispatcher Servlet - Website /