From 1e489c1a5891883d2677c9531c2874ab7dec5ea0 Mon Sep 17 00:00:00 2001
From: Kai Moritz <kai@juplo.de>
Date: Tue, 24 Jan 2017 15:04:51 +0100
Subject: [PATCH] =?utf8?q?Paket=20umbenannt=20und=20=C3=BCberarbeitet=20(F?=
 =?utf8?q?einschliff)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 package.json                           |  2 +-
 pom.xml                                | 19 ++++++++++---------
 src/main/resources/branding.properties |  1 -
 src/main/resources/spring/mvc.xml      | 10 +++++-----
 src/main/resources/website.properties  |  1 +
 src/main/webapp/WEB-INF/web.xml        |  6 +++---
 6 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 src/main/resources/branding.properties
 create mode 100644 src/main/resources/website.properties

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 @@
 
 
   <groupId>de.juplo</groupId>
-  <artifactId>branding</artifactId>
-  <name>Juplo - branding</name>
+  <artifactId>website</artifactId>
+  <name>Juplo - Website</name>
+  <description>WAR, that deliveres one ore more statically defined websites with thymeleaf-power layout-sugar</description>
   <version>1.0-SNAPSHOT</version>
   <packaging>war</packaging>
-  <url>http://www.juplo.de/branding</url>
+  <url>http://www.juplo.de/website</url>
 
 
   <prerequisites>
@@ -18,9 +19,9 @@
 
 
   <scm>
-    <connection>scm:git:http://juplo.de/git/branding</connection>
-    <developerConnection>scm:git:ssh://juplo.de:/var/lib/git/juplo/branding</developerConnection>
-    <url>http://juplo.de/gitweb/?p=branding;a=summary</url>
+    <connection>scm:git:http://juplo.de/git/website</connection>
+    <developerConnection>scm:git:ssh://juplo.de:/var/lib/git/juplo/website</developerConnection>
+    <url>http://juplo.de/gitweb/?p=website;a=summary</url>
   </scm>
 
 
@@ -149,14 +150,14 @@
 
 
   <build>
-    <finalName>branding</finalName>
+    <finalName>website</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <encoding>utf8</encoding>
           <showWarnings>true</showWarnings>
         </configuration>
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
            ">
 
-  <!-- Anwendungs-Parameter über Java-Systemproperties auflösen -->
-  <context:property-placeholder location="classpath:branding.properties" />
+  <!-- Resolve application-parameters through java-systemproperties -->
+  <context:property-placeholder location="classpath:website.properties" />
 
-  <!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
+  <!-- Necesarry, to map the DispatcherServlet on /* -->
   <mvc:default-servlet-handler/>
   <mvc:view-controller path="/" view-name="index"/>
 
   <!-- Scann classpath for classes anntated as components -->
-  <context:component-scan base-package="de.juplo.branding"/>
+  <context:component-scan base-package="de.juplo.website"/>
 
   <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
     <property name="mappings">
@@ -58,7 +58,7 @@
     <property name="suffix" value=".html" />
     <property name="templateMode" value="HTML5" />
     <property name="characterEncoding" value="UTF-8" />
-    <property name="cacheable" value="${branding.cacheable}" />
+    <property name="cacheable" value="${website.cacheable}" />
   </bean>
 
   <!-- Thymeleaf Spring4-Template-Engine -->
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">
 
-  <display-name>branding</display-name>
+  <display-name>website</display-name>
 
   <!-- Context Configuration locations for Spring XML files -->
 
@@ -44,7 +44,7 @@
   <!-- Handles all requests into the application -->
 
   <servlet>
-    <servlet-name>Dispatcher Servlet - Branding</servlet-name>
+    <servlet-name>Dispatcher Servlet - Website</servlet-name>
     <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
     <init-param>
       <param-name>contextConfigLocation</param-name>
@@ -55,7 +55,7 @@
   </servlet>
 
   <servlet-mapping>
-    <servlet-name>Dispatcher Servlet - Branding</servlet-name>
+    <servlet-name>Dispatcher Servlet - Website</servlet-name>
     <url-pattern>/</url-pattern>
   </servlet-mapping>
 
-- 
2.20.1