Umstellung auf Thymeleaf: Schritt 3 RELOADED - Thymleaf mit LayoutDialect
authorKai Moritz <km@juplo.de>
Tue, 2 Sep 2014 12:51:13 +0000 (14:51 +0200)
committerKai Moritz <kai@juplo.de>
Tue, 19 Jan 2016 16:45:42 +0000 (17:45 +0100)
115 files changed:
pom.xml
src/main/java/de/juplo/branding/web/ForceIncludeFilter.java [deleted file]
src/main/resources/spring/mvc.xml
src/main/resources/spring/tiles.xml [deleted file]
src/main/webapp/WEB-INF/templates/about.jsp [deleted file]
src/main/webapp/WEB-INF/templates/article.jsp [deleted file]
src/main/webapp/WEB-INF/templates/footer.jsp [deleted file]
src/main/webapp/WEB-INF/templates/header.jsp [deleted file]
src/main/webapp/WEB-INF/templates/html-head.jsp [deleted file]
src/main/webapp/WEB-INF/templates/html5page.jsp [deleted file]
src/main/webapp/WEB-INF/templates/maincontent.jsp [deleted file]
src/main/webapp/WEB-INF/templates/marginalcontent.jsp [deleted file]
src/main/webapp/WEB-INF/templates/navigation.jsp [deleted file]
src/main/webapp/WEB-INF/templates/test/breadcrumb.jsp [deleted file]
src/main/webapp/WEB-INF/templates/test/experimente.jsp [deleted file]
src/main/webapp/WEB-INF/templates/test/navigation.jsp [deleted file]
src/main/webapp/WEB-INF/templates/testlab.jsp [deleted file]
src/main/webapp/WEB-INF/templates/wip.jsp [deleted file]
src/main/webapp/WEB-INF/views/about.jsp [deleted file]
src/main/webapp/WEB-INF/views/agb.jsp [deleted file]
src/main/webapp/WEB-INF/views/blog.jsp [deleted file]
src/main/webapp/WEB-INF/views/blog/article.jsp [deleted file]
src/main/webapp/WEB-INF/views/blog/comments.jsp [deleted file]
src/main/webapp/WEB-INF/views/contact.jsp [deleted file]
src/main/webapp/WEB-INF/views/datenschutz.jsp [deleted file]
src/main/webapp/WEB-INF/views/expertise.jsp [deleted file]
src/main/webapp/WEB-INF/views/google-analytics.jsp [deleted file]
src/main/webapp/WEB-INF/views/haftung-inhalte.jsp [deleted file]
src/main/webapp/WEB-INF/views/haftung-links.jsp [deleted file]
src/main/webapp/WEB-INF/views/impressum.jsp [deleted file]
src/main/webapp/WEB-INF/views/index.jsp [deleted file]
src/main/webapp/WEB-INF/views/projects.jsp [deleted file]
src/main/webapp/WEB-INF/views/projects/fix-swf.jsp [deleted file]
src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp [deleted file]
src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp [deleted file]
src/main/webapp/WEB-INF/views/projects/html-experimente.jsp [deleted file]
src/main/webapp/WEB-INF/views/projects/typo.jsp [deleted file]
src/main/webapp/WEB-INF/views/references.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/basis-layout.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/breadcrumb.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/druck-layout.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/error.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü-aber-marginalinhalt.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/fast-leer-mit-menü-und-marginalinhalt.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/fast-leer-mit-menü.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/formulare.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/kein-layout.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/phone.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/seitenaufteilung.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/seitenkopf.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/symbole.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/tablet.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/testlab.jsp [deleted file]
src/main/webapp/WEB-INF/views/test/tiny.jsp [deleted file]
src/main/webapp/WEB-INF/views/tiles.jsp [deleted file]
src/main/webapp/WEB-INF/views/urheberrechte.jsp [deleted file]
src/main/webapp/WEB-INF/web.xml
src/main/webapp/js/less-1.5.1.js [deleted file]
src/main/webapp/less/screen.less
src/main/webapp/less/tablet/footer.less
src/main/webapp/less/tablet/head.less
src/main/webapp/less/tablet/layout.less
src/main/webapp/less/tablet/typo.less
src/main/webapp/less/variables.less
src/main/webapp/thymeleaf/404.html [new file with mode: 0644]
src/main/webapp/thymeleaf/about.html [new file with mode: 0644]
src/main/webapp/thymeleaf/agb.html [new file with mode: 0644]
src/main/webapp/thymeleaf/blog.html [new file with mode: 0644]
src/main/webapp/thymeleaf/blog/article.html [new file with mode: 0644]
src/main/webapp/thymeleaf/blog/comments.html [new file with mode: 0644]
src/main/webapp/thymeleaf/contact.html [new file with mode: 0644]
src/main/webapp/thymeleaf/datenschutz.html [new file with mode: 0644]
src/main/webapp/thymeleaf/error.html [new file with mode: 0644]
src/main/webapp/thymeleaf/expertise.html [new file with mode: 0644]
src/main/webapp/thymeleaf/google-analytics.html [new file with mode: 0644]
src/main/webapp/thymeleaf/haftung-inhalte.html [new file with mode: 0644]
src/main/webapp/thymeleaf/haftung-links.html [new file with mode: 0644]
src/main/webapp/thymeleaf/impressum.html [new file with mode: 0644]
src/main/webapp/thymeleaf/index.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/fix-swf.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/fix-swf/getting-started.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/fix-swf/overview.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/basis-layout.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/breadcrumb.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/druck-layout.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/fast-leer-einspaltig-mit-marginalinhalt.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/fast-leer-einspaltig.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/fast-leer-kein-menü-aber-marginalinhalt.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/fast-leer-kein-menü.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/fast-leer-mit-menü-und-marginalinhalt.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/fast-leer-mit-menü.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/formulare.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/kein-layout.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/phone.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/seitenaufteilung.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/seitenkopf.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/symbole.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/tablet.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/testlab.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/html-experimente/tiny.html [new file with mode: 0644]
src/main/webapp/thymeleaf/projects/typo.html [new file with mode: 0644]
src/main/webapp/thymeleaf/references.html [new file with mode: 0644]
src/main/webapp/thymeleaf/templates/defaults.html [deleted file]
src/main/webapp/thymeleaf/templates/fragments.html [new file with mode: 0644]
src/main/webapp/thymeleaf/templates/html5page.html [deleted file]
src/main/webapp/thymeleaf/templates/layout.html [new file with mode: 0644]
src/main/webapp/thymeleaf/templates/testlab.html [new file with mode: 0644]
src/main/webapp/thymeleaf/urheberrechte.html [new file with mode: 0644]
src/main/webapp/thymeleaf/views/404.html [deleted file]
src/main/webapp/thymeleaf/views/error.html [deleted file]
src/main/webapp/thymeleaf/views/index.html [deleted file]
src/main/webapp/thymeleaf/views/projects/fix-swf/overview.html [deleted file]

diff --git a/pom.xml b/pom.xml
index 256cbbc..6e9bc67 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,8 +45,7 @@
     <slf4j.version>1.6.1</slf4j.version>
     <springframework.version>4.0.6.RELEASE</springframework.version>
     <thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
-    <thymeleaf-extras.version>2.1.1.RELEASE</thymeleaf-extras.version>
-    <tiles.version>2.2.2</tiles.version>
+    <thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
     <wro4j.version>1.7.3-SNAPSHOT</wro4j.version>
 
   </properties>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-tiles2</artifactId>
-      <version>${thymeleaf-extras.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.thymeleaf</groupId>
-          <artifactId>thymeleaf</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.thymeleaf</groupId>
-          <artifactId>thymeleaf-spring4</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>nz.net.ultraq.thymeleaf</groupId>
+      <artifactId>thymeleaf-layout-dialect</artifactId>
+      <version>${thymeleaf-layout-dialect.version}</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.thymeleaf.extras</groupId>
-      <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
-      <version>${thymeleaf-extras.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.thymeleaf</groupId>
-          <artifactId>thymeleaf</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.thymeleaf</groupId>
-          <artifactId>thymeleaf-spring4</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>runtime</scope>
-    </dependency>
-
-    <!-- Tiles -->
-    <dependency>
-      <groupId>org.apache.tiles</groupId>
-      <artifactId>tiles-core</artifactId>
-      <version>${tiles.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>jcl-over-slf4j</artifactId>
-        </exclusion>
-      </exclusions>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tiles</groupId>
-      <artifactId>tiles-servlet</artifactId>
-      <version>${tiles.version}</version>
-    </dependency>
 
     <!-- Servlet -->
     <dependency>
diff --git a/src/main/java/de/juplo/branding/web/ForceIncludeFilter.java b/src/main/java/de/juplo/branding/web/ForceIncludeFilter.java
deleted file mode 100644 (file)
index 953e8b2..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-package de.juplo.branding.web;
-
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.tiles.servlet.context.ServletUtil;
-
-
-
-/**
- * Fixes a logic-bug in the colaboration of Thymeleaf and Tiles.
- *
- * Tiles 2.2.x tries to use RequestDispatcher.forward() whenever possible, but
- * this breaks Thymeleaf, because the original response is marked as committed,
- * when forwarding. Hence, Thymeleaf cannot render its result in the response
- * and an empty page is returned.
- * 
- * @author kai
- */
-public class ForceIncludeFilter implements Filter
-{
-
-  @Override
-  public void init(FilterConfig filterConfig) throws ServletException
-  {
-  }
-
-  @Override
-  public void doFilter(
-      ServletRequest request,
-      ServletResponse response,
-      FilterChain chain
-      )
-      throws
-        IOException,
-        ServletException
-  {
-    if ((response instanceof HttpServletResponse))
-      ServletUtil.setForceInclude((HttpServletRequest)request, true);
-    chain.doFilter(request, response);
-  }
-
-  @Override
-  public void destroy()
-  {
-  }
-  
-}
index 87c2a01..4bf0a0a 100644 (file)
   <!-- Thymeleaf Spring-View-Resolver -->
   <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
     <property name="templateEngine" ref="templateEngine" />
-    <property name="viewNames" value="views/*,templates/*"/>
-    <property name="order" value="1"/>
-  </bean>
-
-  <!-- Thymeleaf Tiles-View-Resolver -->
-  <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
-    <property name="templateEngine" ref="templateEngine" />
-    <property name="viewClass" value="org.thymeleaf.extras.tiles2.spring4.web.view.ThymeleafTilesView"/>
-    <property name="order" value="2"/>
-  </bean>
-
-
-  <!-- Thymeleaf Tiles-Configurer -->
-  <bean class="org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer">
-    <property name="definitions">
-      <list>
-        <value>classpath:/spring/tiles.xml</value>
-      </list>
-    </property>
-    <property name="useMutableTilesContainer" value="true"/>
   </bean>
 
 
@@ -80,7 +60,7 @@
     <property name="templateResolver" ref="templateResolver" />
     <property name="additionalDialects">
       <util:set>
-        <bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
+        <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
       </util:set>
     </property>
   </bean>
diff --git a/src/main/resources/spring/tiles.xml b/src/main/resources/spring/tiles.xml
deleted file mode 100644 (file)
index f77fb85..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE tiles-definitions PUBLIC
-       "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
-       "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
-<tiles-definitions>
-
-  <!--
-    Main definition that uses layout.html to put title and content attributes from
-    Thymeleaf fragments; {1} will be evaluated to either 'list', 'form' or 'view'.
-  -->
-  <definition name="*" template="templates/html5page">
-    <put-attribute name="title" value="views/{1} :: title"/>
-    <put-attribute name="htmlhead" value="templates/defaults :: htmlhead"/>
-    <put-attribute name="header" value="templates/defaults :: header"/>
-    <put-attribute name="breadcrumb" value="views/{1} :: breadcrumb"/>
-    <put-attribute name="maincontent" value="templates/defaults :: maincontent"/>
-    <put-attribute name="contentclass" value="test" type="string"/>
-    <put-attribute name="marginalcontent" value="views/{1} :: marginalcontent"/>
-    <put-attribute name="navigation" value="views/{1} :: navigation"/>
-    <put-attribute name="footer" value="templates/defaults :: footer"/>
-  </definition>
-
-  <!-- Make JSP-templates available through a view-name -->
-  <definition name="jsp/**" template="/WEB-INF/templates/{1}.jsp" templateType="jsp"/>
-
-  <definition name="BASEPAGE" template="/WEB-INF/templates/html5page.jsp">
-    <put-attribute name="title" value="TITLE IS MISSING" type="string" cascade="true"/>
-    <put-attribute name="htmlhead" value="/WEB-INF/templates/html-head.jsp" type="template"/>
-    <put-attribute name="header" value="/WEB-INF/templates/header.jsp" type="template"/>
-    <put-attribute name="breadcrumb" value="BREADCRUMB IS MISSING" type="string"/>
-    <put-attribute name="contentcontainer" value="/WEB-INF/templates/article.jsp" type="template"/>
-    <put-attribute name="maincontent" value="/WEB-INF/templates/maincontent.jsp" type="template" cascade="true"/>
-    <put-attribute name="contentclass" value="menu" type="string"/>
-    <put-attribute name="marginalcontent" value="/WEB-INF/templates/marginalcontent.jsp" type="template"/>
-    <put-attribute name="navigation" value="/WEB-INF/templates/navigation.jsp" type="template"/>
-    <put-attribute name="footer" value="/WEB-INF/templates/footer.jsp" type="template"/>
-  </definition>
-
-  <definition name="NOMENU" extends="BASEPAGE">
-    <put-attribute name="contentclass" value="nomenu" type="string"/>
-  </definition>
-
-  <definition name="test" extends="BASEPAGE">
-    <put-attribute name="breadcrumb" value="/WEB-INF/templates/test/breadcrumb.jsp" type="template"/>
-    <put-attribute name="navigation" value="/WEB-INF/templates/test/navigation.jsp" type="template"/>
-    <put-attribute name="maincontent" value="/WEB-INF/templates/test/experimente.jsp" type="template"/>
-  </definition>
-
-  <definition name="TESTLAB" template="/WEB-INF/templates/testlab.jsp">
-    <put-attribute name="htmlhead" value="/WEB-INF/templates/html-head.jsp" type="template"/>
-    <put-attribute name="title" value="TEST-TITLE IS MISSING" type="string"/>
-    <put-attribute name="content" value="&lt;div class='testlab'&gt;TEST-CONTENT IS MISSING&lt;div&gt;" type="string"/>
-  </definition>
-
-</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/templates/about.jsp b/src/main/webapp/WEB-INF/templates/about.jsp
deleted file mode 100644 (file)
index cc3f87f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<aside class="m">
-  <h1>What the f*#!@ is an <em>Impressum</em> ?!?</h1>
-  The german law enforces the so called <em>Impressum</em> to enable
-  customers to easily find out all juristically relevant informations
-  about the company, that rules a site.
-  <h1>Find out more...</h1>
-  If you just want to learn more about juplo you should better
-  <a href="${base}about.html" title="Learn more about juplo now">visit our about-pages</a>.
-</aside>
diff --git a/src/main/webapp/WEB-INF/templates/article.jsp b/src/main/webapp/WEB-INF/templates/article.jsp
deleted file mode 100644 (file)
index d145080..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<article id="content" class="main">
-  <header><h1><t:getAsString name="title"/></h1></header>
-  <t:insertAttribute name="maincontent"/>
-</article>
diff --git a/src/main/webapp/WEB-INF/templates/footer.jsp b/src/main/webapp/WEB-INF/templates/footer.jsp
deleted file mode 100644 (file)
index 9c7005e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<li class="f" id="copyright">© <strong>mo</strong> 2013</li>
-<li class="f"><a class="f" href="${base}impressum.html">Impressum</a></li>
-<li class="f about"><a class="f" href="${base}about.html">About</a></li>
diff --git a/src/main/webapp/WEB-INF/templates/header.jsp b/src/main/webapp/WEB-INF/templates/header.jsp
deleted file mode 100644 (file)
index 3a27951..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<h1 id="logo"><a href="${base}index.html" title="Home" class="l">juplo</a></h1>
diff --git a/src/main/webapp/WEB-INF/templates/html-head.jsp b/src/main/webapp/WEB-INF/templates/html-head.jsp
deleted file mode 100644 (file)
index 1bc9738..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-<style type="text/css">
-  @import '${base}css/screen.css' screen;
-  @import '${base}css/print.css' print;
-</style>
-<script src="${base}js/base.js"></script>
-<!--[if IE 8]>
-  <link rel="stylesheet" type="text/css" href="${base}css/ie8.css" />
-  <script src="${base}js/ie8.js"></script>
-<![endif]-->
-<!--[if IE 7]>
-  <script src="${base}js/ie7.js"></script>
-<![endif]-->
-<!--[if lt IE 7]>
-  <script src="${base}js/ie6.js"></script>
-<![endif]-->
diff --git a/src/main/webapp/WEB-INF/templates/html5page.jsp b/src/main/webapp/WEB-INF/templates/html5page.jsp
deleted file mode 100644 (file)
index 5620fb2..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<html>
-  <head>
-    <title>juplo - <t:getAsString name="title"/></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <t:insertAttribute name="htmlhead"/>
-  </head>
-  <body id="top" class="<t:getAsString name="contentclass"/>" onload="prettyPrint()">
-    <div id="page" class="cf">
-      <header id="header">
-        <t:insertAttribute name="header"/>
-        <span id="slogan"><strong>Java</strong> bits from nerds for nerds</span>
-        <hr class="h" />
-      </header>
-      <div id="breadcrumb">
-        <strong class="b title">You are here:</strong>
-        <ol class="b">
-          <t:insertAttribute name="breadcrumb"/>
-        </ol>
-        <a class="hide" href="#nav" title="Show navigation menu">Jump to navigation</a>
-        <hr class="b" />
-      </div>
-      <main class="content cf">
-        <t:insertAttribute name="contentcontainer"/>
-        <div class="marginal">
-          <nav id="nav">
-            <hr class="n"/>
-            <a class="hide" href="#top" title="Show Content">Jump back to the top of the page</a>
-            <t:insertAttribute name="navigation"/>
-            <hr class="n"/>
-          </nav>
-          <t:insertAttribute name="marginalcontent" ignore="true"/>
-        </div>
-      </main>
-      <footer id="footer">
-        <hr class="f" />
-        <ul id="footerlinks">
-          <t:insertAttribute name="footer"/>
-        </ul>
-      </footer>
-    </div>
-  </body>
-</html>
diff --git a/src/main/webapp/WEB-INF/templates/maincontent.jsp b/src/main/webapp/WEB-INF/templates/maincontent.jsp
deleted file mode 100644 (file)
index f2a0fcf..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<article id="content" class="main" tiles:fragment="maincontent">
-  <p>
-    <strong>Lorem ipsum</strong> dolor <a href="${base}projects/typo.html">sit amet</a>, consectetur adipisicing elit, sed do
-    eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-    ad minim veniam, quis nostrud <a href="${base}projects/html-experimente.html">exercitation</a> ullamco laboris nisi ut
-    aliquip ex ea commodo consequat. Duis aute irure dolor in
-    reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-    pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-    culpa qui officia deserunt mollit anim id est laborum.
-  </p>
-  <h2>Duis aute irure dolor</h2>
-  <ul>
-    <li>Operators and other mathematical stuff: <c:out value="-+/*"/></li>
-    <li>Characters offten used in programming languages: <c:out value="{(<>)}@$?%*#;:&/\!^\"'`~"/></li>
-    <li>Special german characters: <c:out value="ÄäÖöÜü"/></li>
-    <li>Other special characters: <c:out value="@€¢§%°"/></li>
-  </ul>
-  <h2>Excepteur sint occaecat cupidatat</h2>
-  <p>
-    Lorem ipsum dolor <em>sit amet</em>, consectetur adipisicing elit, sed do
-    eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-    ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-    aliquip ex ea commodo consequat. Duis aute irure dolor in
-    reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-    pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-    culpa qui officia deserunt mollit anim id est laborum.
-  </p>
-  <p>
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-    eiusmod tempor incididunt ut labore et dolore magna aliqua. <strong>Ut enim
-    ad minim veniam, quis nostrud <em>exercitation ullamco</em> laboris nisi ut
-    aliquip ex ea commodo consequat</strong>. Duis aute irure dolor in
-    reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-    pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-    culpa qui officia deserunt mollit anim id est laborum.
-  </p>
-</article>
diff --git a/src/main/webapp/WEB-INF/templates/marginalcontent.jsp b/src/main/webapp/WEB-INF/templates/marginalcontent.jsp
deleted file mode 100644 (file)
index e8c225c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<aside class="m">
-  <h1>Other nasty but marginal stuff</h1>
-  <p>
-    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-    eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-    ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-    aliquip ex ea commodo consequat. Duis aute irure dolor in
-    reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-    pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-    culpa qui officia deserunt mollit anim id est laborum.
-  </p>
-</aside>
-<aside class="m">
-  <h1>More nasty stuff</h1>
-  <p>
-    This one is really short!
-  </p>
-</aside>
diff --git a/src/main/webapp/WEB-INF/templates/navigation.jsp b/src/main/webapp/WEB-INF/templates/navigation.jsp
deleted file mode 100644 (file)
index 41aa3e5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<h1 class="nav">Navigation</h1>
-<h2 class="nav menu">Section-Menu</h2>
-<ul id="menu" class="cf">
-  <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-  <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-  <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-</ul>
diff --git a/src/main/webapp/WEB-INF/templates/test/breadcrumb.jsp b/src/main/webapp/WEB-INF/templates/test/breadcrumb.jsp
deleted file mode 100644 (file)
index efe3672..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<li class="b"><a class="b" href="${base}index.html">Home</a></li>
-<li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-<li class="b"><a class="b" href="${base}projects/html-experimente.html">HTML-Experimente</a></li>
diff --git a/src/main/webapp/WEB-INF/templates/test/experimente.jsp b/src/main/webapp/WEB-INF/templates/test/experimente.jsp
deleted file mode 100644 (file)
index 752552c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<h2>HTML-Elemente / spezielle Seiten</h2>
-<ul>
-  <li><a href="${base}test/formulare.html">Formulare</a></li>
-  <li><a href="${base}test/symbole.html">Symbol-Font</a></li>
-  <li><a href="${base}test/gibts-ja-gar-nicht.html">404-Fehlerseite</a></li>
-  <li><a href="${base}test/error.html">Fehlerseite für andere Fehler</a></li>
-</ul>
-<h2>Layout-Grenzfälle</h2>
-<ul>
-  <li><a href="${base}test/fast-leer-kein-menü.html">Fast leere Seite ohne Menü</a></li>
-  <li><a href="${base}test/fast-leer-kein-menü-aber-marginalinhalt.html">Fast leere Seite ohne Menü aber mit Marginal-Inhalt</a></li>
-  <li><a href="${base}test/fast-leer-mit-menü.html">Fast leere Seite mit Menü</a></li>
-  <li><a href="${base}test/fast-leer-mit-menü-und-marginalinhalt.html">Fast leere Seite mit Menü und Marginal-Inhalt</a></li>
-  <li><a href="${base}test/breadcrumb.html">Seite mit sehr langem Breadcrumb</a></li>
-</ul>
-<h2>Layout-Variationen</h2>
-<ul>
-  <li><a href="${base}test/kein-layout.html">Alle Stylings deaktiviert</a></li>
-  <li><a href="${base}test/basis-layout.html">Nur das Basis-Layout</a></li>
-  <li><a href="${base}test/druck-layout.html">Die für den Ausdruck angepasste Ansicht</a></li>
-  <li><a href="${base}test/tiny.html">Layout für sehr kleine Bildschirmgrößen</a></li>
-  <li><a href="${base}test/phone.html">Layout für Smartphones</a></li>
-  <li><a href="${base}test/tablet.html">Layout für Tablets</a></li>
-</ul>
-<h2>Testseiten für einzelne Seiten-Bestandteile</h2>
-<ul>
-  <li><a href="${base}test/seitenaufteilung.html">Nur das Basis-Layout und die Seitenaufteilung</a></li>
-  <li><a href="${base}test/seitenkopf.html">Nur das Basis-Layout und der Seitenkopf</a></li>
-</ul>
-<h2>Anderer Krams...</h2>
-<ul>
-  <li><a href="${base}test/testlab.html">Seite mit Breiten-Markierungen für den Tests von Media-Queries (Beispiel)</a></li>
-</ul>
diff --git a/src/main/webapp/WEB-INF/templates/test/navigation.jsp b/src/main/webapp/WEB-INF/templates/test/navigation.jsp
deleted file mode 100644 (file)
index 8188d1c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<h1 class="nav">Navigation</h1>
-<h2 class="nav menu">Section-Menu</h2>
-<ul id="menu" class="cf">
-  <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-  <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-  <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-</ul>
-<h2 class="nav submenu">
-  <span class="s">Submenu for section</span>
-  <a class="s selected" href="${base}projects.html">Projects</a>
-</h2>
-<ul id="submenu" class="s active">
-  <li class="s sub"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-  <li class="s sub"><a href="${base}projects/fix-swf.html" class="s">fix-swf</a></li>
-  <li class="s"><a href="#" class="s">jquery.openx</a></li>
-  <li class="s"><a class="s selected" href="${base}projects/html-experimente.html">HTML-Experimente</a></li>
-  <li class="s sub"><a href="#" class="s">accelerator</a></li>
-  <li class="s"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-</ul>
diff --git a/src/main/webapp/WEB-INF/templates/testlab.jsp b/src/main/webapp/WEB-INF/templates/testlab.jsp
deleted file mode 100644 (file)
index 8f3df40..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<html>
-  <head>
-    <title>juplo - <t:getAsString name="title"/></title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <t:insertAttribute name="htmlhead"/>
-    <style type="text/css">
-
-      body {
-        margin: 0;
-        padding: 0;
-      }
-
-      .testlab
-      {
-        width: 100%;
-        text-indent: 0;
-        margin: 0 0 20px -320px;
-        background-color: #fff;
-      }
-      .testlab:after
-      {
-        content:"";
-        display:table;
-      }
-      .tl970
-      {
-        margin-left: 0px;
-        border-left: 970px solid green;
-        text-indent: -970px;
-        background-color: transparent;
-      }
-      .tl670
-      {
-        margin-left: -970px;
-        border-left: 670px solid yellow;
-        text-indent: -670px;
-        background-color: transparent;
-      }
-      .tl480
-      {
-        margin-left: -670px;
-        border-left: 480px solid orange;
-        text-indent: -480px;
-        background-color: transparent;
-      }
-      .tl320
-      {
-        margin-left: -480px;
-        border-left: 320px solid red;
-        text-indent: -320px;
-        background-color: transparent;
-      }
-    </style>
-  </head>
-  <body>
-    <h1><t:getAsString name="title"/></h1>
-    <div class="testlab tl970">970px
-      <div class="testlab tl670">670px
-        <div class="testlab tl480">480px
-          <div class="testlab tl320">320px
-
-            <t:insertAttribute name="content"/>
-
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/src/main/webapp/WEB-INF/templates/wip.jsp b/src/main/webapp/WEB-INF/templates/wip.jsp
deleted file mode 100644 (file)
index 230a9f6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<div class="wip">
-  <img class="w" src="/img/comming-soon.png" alt="Comming soon..."/>
-  <t:insertTemplate template="/WEB-INF/templates/maincontent.jsp"/>
-</div>
diff --git a/src/main/webapp/WEB-INF/views/about.jsp b/src/main/webapp/WEB-INF/views/about.jsp
deleted file mode 100644 (file)
index a26f217..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="About" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><strong class="b">About</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><strong class="m">About</strong></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><strong class="s">About</strong></h2>
-    <ul id="submenu">
-      <li class="s sub"><a href="${base}expertise.html" class="s">Expertise</a></li>
-      <li class="s sub"><a href="${base}references.html" class="s">References</a></li>
-      <li class="s "><a href="${base}contact.html" class="s">Contact</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      <span class="logo">juplo</span> is the place, where I collect and share
-      my more or less private projects.
-      It is a lab for experiments, that help me to do my job as a freelancer
-      at the desired level of quality.
-      Here, I can play with all the fancy new stuff, that might be a little
-      bit to much bleeding edge, to be used on a production site of a paying
-      client.
-    </p>
-    <p>
-      I decided to share all this stuff, because I am always learning a lot
-      from the internet-community.
-      I wanted to give back a little and try to help and teach others, as I
-      was helped and teached.
-      Also, this is a good oportunity, to show what I am doing and to do a 
-      little self-publicity...
-    </p>
-    <p>
-      <span class="logo">juplo</span> mainly consists of two parts:
-    </p>
-    <ul>
-      <li>
-        In the <a href="${base}blog.html">blog</a>, I summarize, how I solved
-        some every-day problems, other people might stumble across too.
-        I am introducing new projects there and announcing new versions and/or
-        bugfixes to older projects.
-      </li>
-      <li>
-        The other part of the site is the
-        <a href="${base}projects.html">projects-section</a>.
-        This is where I am hosting all projects, that I have made publicy
-        available.
-      </li>
-    </ul>
-    <p>
-      If you want to hire me, you can find out more on the
-      <a href="${base}contact.html">contact-page</a>.
-      If you are not yet sure, if you want to hire me, you might be
-      interessted in
-      <a href="${base}expertise.html">what I can do for you</a>, or 
-      <a href="${base}references.html">what I have already done for others</a>.
-    </p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string" value=""/>
-  <t:putAttribute name="footer" type="string">
-    <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
-    <li class="f"><a class="f" href="${base}impressum.html">Impressum</a></li>
-    <li class="f about"><strong class="f">About</strong></li>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/agb.jsp b/src/main/webapp/WEB-INF/views/agb.jsp
deleted file mode 100644 (file)
index 270c8cf..0000000
+++ /dev/null
@@ -1,183 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Allgemeine Geschäftsbedingungen (AGB)" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a href="${base}impressum.html" class="b">Impressum</a></li>
-    <li class="b"><strong class="b">Urheberrechte</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}impressum.html" class="s selected">Impressum</a></h2>
-    <ul id="submenu">
-      <li class="s"><strong class="s">AGB</strong></li>
-      <li class="s"><a href="${base}haftung-inhalte.html" class="s">Haftung für Inhalte</a></li>
-      <li class="s"><a href="${base}haftung-links.html" class="s">Haftung für Links</a></li>
-      <li class="s"><a href="${base}urheberrechte.html" class="s">Urheberrechte</a></li>
-      <li class="s"><a href="${base}datenschutz.html" class="s">Datenschutz</a></li>
-      <li class="s"><a href="${base}google-analytics.html" class="s">Google Analytics</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p><em>Stand: 01.02.2014</em></p>
-    <h2>Angebote &amp; Abrechnung</h2>
-    <p>
-     Angebote sind freibleibend.
-     Alle Preise verstehen sich in Euro und zzgl. der gesetzl. MwSt.
-     Wenn nicht anders vereinbart erfolgt eine Anzahlung von 10% im Voraus.
-     Sollte sich der Zeitraum über den Leistungen erbracht werden über
-     mehrere Monate erstrecken, behalte ich mir vor, Rechnungen für
-     Leistungsabschnitte zu stellen (jedoch nicht häufiger als ein mal im
-     Monat).
-     Das Zahlungsziel beträgt 8 Tage.
-    </p>
-    <p>
-     Falls nicht anders vereinbart, ist bei Dienstleistungen eine
-     Korrekturschleife enthalten.
-     Darüber hinausgehende Überarbeitungen sowie gewünschte Zusatzleistungen
-     werden nach Aufwand per Stundensatz abgerechnet.
-     Sollte für den Auftrag ein rabattierter Stundensatz vereinbart worden
-     sein, so gilt dieser nicht automatisch für Überarbeitungen und
-     Zusatzleistungen.
-    </p>
-    <h2>Absprachen</h2>
-    <p>
-      Die zentralen Ansprechpartner des Kunden müssen verbindliche
-      Erklärungen abgeben können (z. B. Fristabsprachen, Abnahmen).
-      Bei Ausfall, Urlaub etc. sind Ersatzpersonen zu benennen.
-    </p>
-    <h2>Leistungen &amp; Abnahme</h2>
-    <p>
-      Der Kunde ist in der Pflicht, erbrachte Leitungen direkt nach deren
-      Erstellung und ohne Aufforderung rechtzeitig (z.B. vor
-      Veröffentlichung) zu prüfen und Änderungswünsche oder Korrekturhinweise
-      direkt mitzuteilen.
-      Die Annahme von Leistungen ohne Beanstandung ist als Abnahme zu
-      verstehen.
-    </p>
-    <p>
-      Ich bin zu jeder Zeit berechtigt, die Arbeit in sinnvollen
-      Teilleistungen zu erbringen und zu berechnen.
-      Der Kunde ist verpflichtet, diese Teilleistungen abzunehmen.
-    </p>
-    <p>
-      Im Rahmen der Gestaltungsspielräume des Briefings vom Kunden trägt der
-      Kunde das Risiko des Nichtgefallens.
-    </p>
-    <h2>Eigenleistungen</h2>
-    <p>
-      Sofern der Kunde Eigenleistungen erbringt, ist die termingerechte
-      Lieferung für den Gesamtzeitplan relevant.
-      Bei verspäteter Lieferung bin ich nicht dazu verpflichtet, die
-      Auftragsarbeit unverzüglich fortzusetzen, wenn ich durch andere
-      terminliche Verpflichtungen daran gehindert werde.
-      Verzögerungen auf Kundenseite können zu erheblichen Gesamtverzögerungen
-      führen.
-      Für dadurch entstandenen Schaden und entgangenen Gewinn haftet der Kunde.
-    </p>
-    <p>
-      Der Kunde berücksichtigt bei der Lieferung von Daten und Materialien
-      die von mir im Rahmen des Angebots geforderten Formate.
-    </p>
-    <p>
-      Sofern Angaben, Muster, Inhalte, usw. vom Kunden geliefert werden, bin
-      ich für deren Richtigkeit und rechtliche Unbedenklichkeit nicht
-      verantwortlich.
-      Eine Prüfungspflicht besteht auf meiner Seite nicht.
-    </p>
-    <h2>Fremdleistungen</h2>
-    <p>
-      Angebote beziehen sich in der Regel auf von mir erbrachte Dienstleistung.
-      Die Kosten oder Gebühren Dritter (z.B. Provider, Lizenzen für Bild, Ton,
-      Schrift oder Software, Druckerei usw.) sind nicht enthalten, falls nicht
-      explizit erwähnt.
-    </p>
-    <p>
-      Bei Beauftragung von Fremdleistungen jedweder Art, berechne ich, falls
-      nicht anders vereinbart, eine Abwicklungspauschale in Höhe von 15% des
-      Auftragswerts für Organisation und Abstimmung.
-    </p>
-    <h2>Nutzungsrechte</h2>
-    <p>
-      An Unterlagen, die im Rahmen des Angebots übergeben werden (z.B.
-      Entwürfe, Konzepte), erhält der Kunde keine Nutzungsrechte.
-      Der Kunde erhält die vereinbarten Nutzungsrechte nur bei pünktlicher
-      und vollständiger Zahlung der vereinbarten Vergütung.
-    </p>
-    <p>
-      Eingesetzte Systeme (z.B. Springframework, Tomcat, CentOS usw.)
-      unterliegen ihren eigenen Nutzungsbestimmungen.
-    </p>
-    <h2>Rechtliche Prüfung</h2>
-    <p>
-      Ohne gesonderte Vereinbarung ist die patent-, muster-, urheber- und
-      markenrechtliche Schutz- oder Eintragungsfähigkeit der im Rahmen des
-      Vertrages gelieferten Ideen, Konzeptionen, Entwürfe und sonstiger
-      Leistungen nicht geschuldet.
-    </p>
-    <h2>Höhere Gewalt</h2>
-    <p>
-      Leistungsverzögerungen aufgrund von Umständen im Verantwortungsbereich
-      des Kunden (z.B. verspätete Anlieferung) und höherer Gewalt (z.B. Unfall,
-      Telekommunikationsstörung usw.) habe ich nicht zu vertreten.
-      Sie berechtigen mich das Erbringen der betreffenden Leistungen um die
-      Dauer der Behinderungen zzgl. einer angemessenen Anlaufzeit
-      aufzuschieben.
-    </p>
-    <h2>Archivierung</h2>
-    <p>
-      Ich bin nicht verpflichtet, erstellte Leistungen zu archivieren.
-      Unterlagen des Kunden muss ich nur dann zurückgeben, wenn dies der Kunde
-      vor der Übergabe ausdrücklich verlangt hat.
-    </p>
-    <h2>Betreuung / Support / Wartung</h2>
-    <p>
-      Ich bin nur in der in der Servicevereinbarung besprochenen Weise für die
-      für eine aktive Betreuung, Support oder Wartung (z.B. Sicherheitsupdates,       Aktualitätsprüfungen usw.) verantwortlich.
-    </p>
-    <h2>Referenzen</h2>
-    <p>
-      Innerhalb der erstellten Leistung werde ich in branchenüblicher Form als
-      Leistungserbrinnger genannt (z.B. Impressum).
-    </p>
-    <p>
-      Ich bin berechtigt, den Kunden als Referenz zu benennen und das Projekt
-      öffentlich vorzustellen.
-      Der Kunde kann dagegen jederzeit schriftlich Widerspruch erheben.
-      Widerruft der Kunde seine Zustimmung, so bin ich berechtigt, erstellte
-      Werbe-Materialien weiter zu benutzen, verpflichte mich jedoch, keine
-      weiteren, Werbe-Materialien zu erstellen, die den Kunden nennen.
-    </p>
-    <h2>Geheimhaltung</h2>
-    <p>
-      Die Vertragsparteien vereinbaren Vertraulichkeit über Vertrag und
-      Erkenntnisse der jeweils anderen Partei.
-      Die Vertraulichkeit gilt auch über die Beendigung des
-      Vertragsverhältnisses hinaus.
-    </p>
-    <h2>Schlussbestimmungen</h2>
-    <p>
-      Erfüllungsort und ausschließlicher Gerichtsstand für alle
-      Rechtsstreitigkeiten ist Münster.
-    </p>
-    <p>
-      Sollten aus irgendeinem Grund eine oder mehrere Einzelbestimmungen
-      dieser AGB unwirksam sein, so bleibt die Gültigkeit der restlichen
-      Bestimmungen davon unberührt.
-    </p>
-    <p>
-      Regelungslücken dieser AGB werden durch Auslegung so gefüllt, dass sie
-      dem wirtschaftlichen Zweck des Vertrages Rechnung tragen.
-    </p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/blog.jsp b/src/main/webapp/WEB-INF/views/blog.jsp
deleted file mode 100644 (file)
index a2eb5cc..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Blog" type="string" cascade="true"/>
-    <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><strong class="b">Blog</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><strong class="m">Blog</strong></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <article id="post-140" class="post-140 post type-post status-publish format-standard hentry category-jetty category-less category-maven category-wro4j">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/combining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources/" title="Permalink to Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources" rel="bookmark">Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/combining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources/" title="12:58" rel="bookmark"><time class="entry-date" datetime="2013-12-06T12:58:17+00:00" pubdate>December 6, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/jetty/" title="View all posts in Jetty" rel="category tag">Jetty</a>, <a href="http://juplo.de/category/less/" title="View all posts in less" rel="category tag">less</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>, <a href="http://juplo.de/category/wro4j/" title="View all posts in wro4j" rel="category tag">wro4j</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-140 -->
-    <article id="post-114" class="post-114 post type-post status-publish format-standard hentry category-hibernate category-java category-maven">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/hibernate4-maven-plugin-1-0-3-released/" title="Permalink to hibernate4-maven-plugin 1.0.3 released!" rel="bookmark">hibernate4-maven-plugin 1.0.3 released!</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/hibernate4-maven-plugin-1-0-3-released/" title="02:46" rel="bookmark"><time class="entry-date" datetime="2013-10-18T02:46:23+00:00" pubdate>October 18, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-114 -->
-    <article id="post-97" class="post-97 post type-post status-publish format-standard hentry category-appengine category-java category-maven category-oauth2">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/log-out-from-wrong-account-with-maven-appengine-plugin/" title="Permalink to Log out from wrong Account with maven-appengine-plugin" rel="bookmark">Log out from wrong Account with maven-appengine-plugin</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/log-out-from-wrong-account-with-maven-appengine-plugin/" title="11:33" rel="bookmark"><time class="entry-date" datetime="2013-10-03T11:33:56+00:00" pubdate>October 3, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/appengine/" title="View all posts in appengine" rel="category tag">appengine</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>, <a href="http://juplo.de/category/oauth2/" title="View all posts in oauth2" rel="category tag">oauth2</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-97 -->
-    <article id="post-90" class="post-90 post type-post status-publish format-standard hentry category-hibernate category-java category-jpa">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/bidirectional-association-with-elementcollection/" title="Permalink to Bidirectional Association with @ElementCollection" rel="bookmark">Bidirectional Association with @ElementCollection</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/bidirectional-association-with-elementcollection/" title="11:11" rel="bookmark"><time class="entry-date" datetime="2013-10-03T11:11:36+00:00" pubdate>October 3, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/jpa/" title="View all posts in JPA" rel="category tag">JPA</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-90 -->
-    <article id="post-75" class="post-75 post type-post status-publish format-standard hentry category-hibernate category-java category-maven">
-      <header class="entry-header">
-s        <h2 class="entry-title"><a href="http://juplo.de/hibernate4-maven-plugin-1-0-2-release/" title="Permalink to hibernate4-maven-plugin 1.0.2 released!" rel="bookmark">hibernate4-maven-plugin 1.0.2 released!</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/hibernate4-maven-plugin-1-0-2-release/" title="02:06" rel="bookmark"><time class="entry-date" datetime="2013-08-02T02:06:08+00:00" pubdate>August 2, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-75 -->
-    <article id="post-64" class="post-64 post type-post status-publish format-standard hentry category-hibernate category-java category-maven">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/hibernate4-maven-plugin-1-0-1-released/" title="Permalink to hibernate4-maven-plugin 1.0.1 released!" rel="bookmark">hibernate4-maven-plugin 1.0.1 released!</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/hibernate4-maven-plugin-1-0-1-released/" title="01:10" rel="bookmark"><time class="entry-date" datetime="2013-01-16T01:10:59+00:00" pubdate>January 16, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-64 -->
-    <article id="post-55" class="post-55 post type-post status-publish format-standard hentry category-hibernate category-java category-maven">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/hibernate4-maven-plugin-1-0-released/" title="Permalink to hibernate4-maven-plugin 1.0 released!" rel="bookmark">hibernate4-maven-plugin 1.0 released!</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/hibernate4-maven-plugin-1-0-released/" title="22:04" rel="bookmark"><time class="entry-date" datetime="2012-11-29T22:04:25+00:00" pubdate>November 29, 2012</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-55 -->
-    <article id="post-34" class="post-34 post type-post status-publish format-standard hentry category-hibernate category-java category-maven">
-      <header class="entry-header">
-        <h2 class="entry-title"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/" title="Permalink to hibernate4-maven-plugin" rel="bookmark">hibernate4-maven-plugin</a></h2>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/" title="19:29" rel="bookmark"><time class="entry-date" datetime="2012-11-28T19:29:12+00:00" pubdate>November 28, 2012</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>          
-        </div><!-- .entry-meta -->
-      </header><!-- .entry-header -->
-      <div class="entry-content">
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        <span class="cat-links">
-          Posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>
-        </span>
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-34 -->
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string">
-    <div id="secondary" class="widget-area" role="complementary">
-      <aside id="archives" class="widget">
-        <h1 class="widget-title">Archives</h1>
-        <ul>
-          <li><a href='http://juplo.de/2013/10/' title='October 2013'>October 2013</a></li>
-          <li><a href='http://juplo.de/2013/08/' title='August 2013'>August 2013</a></li>
-          <li><a href='http://juplo.de/2013/01/' title='January 2013'>January 2013</a></li>
-          <li><a href='http://juplo.de/2012/11/' title='November 2012'>November 2012</a></li>
-        </ul>
-      </aside>
-      <aside id="categories" class="widget">
-        <h1 class="widget-title">Most Used Categories</h1>
-        <ul>
-          <li class="cat-item cat-item-4"><a href="http://juplo.de/category/java/" title="View all posts filed under Java">Java</a> (6)</li>
-          <li class="cat-item cat-item-6"><a href="http://juplo.de/category/hibernate/" title="View all posts filed under Hibernate">Hibernate</a> (5)</li>
-          <li class="cat-item cat-item-8"><a href="http://juplo.de/category/maven/" title="View all posts filed under Maven">Maven</a> (5)</li>
-          <li class="cat-item cat-item-9"><a href="http://juplo.de/category/jpa/" title="View all posts filed under JPA">JPA</a> (1)</li>
-          <li class="cat-item cat-item-10"><a href="http://juplo.de/category/appengine/" title="View all posts filed under appengine">appengine</a> (1)</li>
-          <li class="cat-item cat-item-11"><a href="http://juplo.de/category/oauth2/" title="View all posts filed under oauth2">oauth2</a> (1)</li>
-        </ul>
-      </aside>
-      <aside id="search" class="widget widget_search">
-        <h1 class="widget-title">Search</h1>
-        <form role="search" method="get" id="searchform" class="searchform" action="http://juplo.de/">
-          <div>
-            <label class="screen-reader-text" for="s">Search for:</label>
-            <input type="text" value="" name="s" id="s" />
-            <input type="submit" id="searchsubmit" value="Search" />
-          </div>
-        </form>
-      </aside>
-    </div><!-- #secondary .widget-area -->
-    <div id="tertiary" class="widget-area" role="supplementary">
-    </div><!-- #tertiary .widget-area -->
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/blog/article.jsp b/src/main/webapp/WEB-INF/views/blog/article.jsp
deleted file mode 100644 (file)
index 664d9e5..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="" type="string" cascade="true"/>
-    <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><strong class="b">Blog</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><strong class="m">Blog</strong></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <article id="post-140" class="post-140 post type-post status-publish format-standard hentry category-jetty category-less category-maven category-wro4j">
-      <div class="entry-header">
-        <h1 class="entry-title">Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources</h1>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/combining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources/" title="12:58" rel="bookmark"><time class="entry-date" datetime="2013-12-06T12:58:17+00:00" pubdate>December 6, 2013</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </div><!-- .entry-header -->
-      <div class="entry-content">
-        <p>Ever searched for a simple configuration, that lets you use your <a href="http://wiki.eclipse.org/Jetty/Feature/Jetty_Maven_Plugin" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://wiki.eclipse.org']);" title="See the documentation for mor information">jetty-maven-plugin</a> as you are used to, while working with <a href="http://www.lesscss.org/" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://www.lesscss.org']);" title="See LESS CSS documentation for mor informations">LESS</a> to simplify your stylesheets?</p>
-        <p>You cannot do both, use the <a href="http://www.lesscss.org/#usage" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://www.lesscss.org']);" title="More about the client-side usage of LESS">Client-side mode</a> of LESS to ease development and use the <a href="https://github.com/marceloverdijk/lesscss-maven-plugin" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://github.com']);" title="Homepage of the official LESS CSS maven plugin">lesscss-maven-plugin</a> to automatically compile the LESS-sources into CSS for production. That does not work, because your stylesheets must be linked in different ways if you are switching between the client-side mode &#8211; which is best for development &#8211; and the pre-compiled mode &#8211; which is best for production. For the client-side mode you need something like:</p>
-        <pre class="prettyprint linenums">
-<code class="html">
-&lt;link rel="stylesheet/less" type="text/css" href="styles.less" /&gt;
-&lt;script src="less.js" type="text/javascript"&gt;&lt;/script&gt;
-</code>
-        </pre>
-        <p>While, for the pre-compiled mode, you want to link to your stylesheets as usual, with:</p>
-        <pre class="prettyprint linenums">
-<code class="html">
-&lt;link rel="stylesheet" type="text/css" href="styles.css" /&gt;
-</code>
-        </pre>
-        <p>While looking for a solution to this dilemma, I stumbled accross <a href="https://code.google.com/p/wro4j/" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://code.google.com']);" title="See the documentation of ths wounderfull tool">wro4j</a>. Originally intended, to speed up page-delivery by combining and minimizing multiple resources into one through the use of a servlet-filter, this tool also comes with a maven-plugin, that let you do the same offline, while compiling your webapp.</p>
-        <p>The idea is, to use the <a href="http://code.google.com/p/wro4j/wiki/MavenPlugin" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://code.google.com']);" title="See the documentation of hte wro4j-maven-plugin">wro4j-maven-plugin</a> to compile and combine your LESS-sources into CSS for production and to use the <a href="http://code.google.com/p/wro4j/wiki/Installation" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://code.google.com']);" title="See how to configure the filter">wro4j filter</a>, to dynamically deliver the compiled CSS while developing. This way, you do not have to alter your HTML-code, when switching between development and production, because you always link to the CSS-files.</p>
-        <p>So, lets get dirty!</p>
-        <h2>Step 1: Configure wro4j</h2>
-        <p>First, we configure <strong>wro4j</strong>, like as we want to use it to speed up our page. The details are explained and linked on wro4j&#8217;s <a href="http://code.google.com/p/wro4j/wiki/GettingStarted" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://code.google.com']);" title="Visit the Getting-Started-Page">Getting-Started-Page</a>. In short, we just need two files: <strong>wro.xml</strong> and <strong>wro.properties</strong>.</p>
-        <h3>wro.xml</h3>
-        <p>wro.xml tells wro4j, which resources should be combined and how the result should be named. I am using the following configuration to generate all LESS-Sources beneath <code>base/</code> into one CSS-file called <code>base.css</code>:</p>
-        <pre class="prettyprint linenums">
-<code class="xml">
-&lt;groups xmlns="http://www.isdc.ro/wro"&gt;
-  &lt;group name="base"&gt;
-    &lt;css&gt;/less/base/*.less&lt;/css&gt;
-  &lt;/group&gt;
-</code>
-        </pre>
-        <p>wro4j looks for <code>/less/base/*.less</code> inside the root of the web-context, which is equal to <code>src/main/webapp</code> in a normal maven-project. There are <a href="http://code.google.com/p/wro4j/wiki/ResourceTypes" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://code.google.com']);" title="See the resource locator documentation of wro4j for more details">other ways to specifie the resources</a>, which enable you to store them elswhere. But this approach works best for our goal, because the path is understandable for both: the wro4j servlet-filter, we are configuring now for our development-environment, and the wro4j-maven-plugin, that we will configure later for build-time compilation.</p>
-        <h3>wro.properties</h3>
-        <p>wro.properties in short tells wro4j, how or if it should convert the combined sources and how it should behave. I am using the following configuration to tell wro4j, that it should convert <code>*.less</code>-sources into CSS and do that on <em>every request</em>:</p>
-        <pre class="prettyprint linenums">
-<code class="properties">
-preProcessors=less4j
-disableCache=true
-</code>
-        </pre>
-        <p>You can do a lot more here. There are countless <a href="http://code.google.com/p/wro4j/wiki/ConfigurationOptions" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-article', 'http://code.google.com']);" title="See all configuration options">configuration options</a> to fine-tune the behaviour of wro4j. The <code>disableCache=true</code> is crucial, because we would not see the changes take effect when developing with <strong>jetty-maven-plugin</strong> later on. You can also do much more with your resources here, for example <a href="https://code.google.com/p/wro4j/wiki/AvailableProcessors" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-article', 'http://code.google.com']);" title="See all available processors">minimizing</a>. But for our goal, we are now only intrested in the compilation of our LESS-sources.</p>
-        <h2>Step 2: Configure the wro4j servlet-filter</h2>
-        <p>Configuring the filter in the <strong>web.xml</strong> is easy. It is explained in wro4j&#8217;s <a href="https://code.google.com/p/wro4j/wiki/Installation" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-article', 'http://code.google.com']);" title="See the installation instructions for the wro4j servlet-filter">installation-insctuctions</a>. But the trick is, that we do not want to configure that filter for the production-version of our webapp, because we want to compile the resources offline, when the webapp is build. To acchieve this, we can use the <code>&lt;overrideDescriptor&gt;</code>-Parameter of the <a href="http://wiki.eclipse.org/Jetty/Feature/Jetty_Maven_Plugin#Configuring_Your_WebApp" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-article', 'http://wiki.eclipse.org']);" title="Read more about the configuration of the jetty-maven-plugin">jetty-maven-plugin</a>.</p>
-        <h2>&lt;overrideDescriptor&gt;</h2>
-        <p>This parameter lets you specify additional configuration options for the web.xml of your webapp. I am using the following configuration for my jetty-maven-plugin:</p>
-        <pre class="prettyprint linenums">
-<code class="xml">
-&lt;plugin&gt;
-  &lt;groupId&gt;org.eclipse.jetty&lt;/groupId&gt;
-  &lt;artifactId&gt;jetty-maven-plugin&lt;/artifactId&gt;
-  &lt;configuration&gt;
-    &lt;webApp&gt;
-      &lt;overrideDescriptor&gt;${project.basedir}/src/test/resources/jetty-web.xml&lt;/overrideDescriptor&gt;
-    &lt;/webApp&gt;
-  &lt;/configuration&gt;
-  &lt;dependencies&gt;
-    &lt;dependency&gt;
-      &lt;groupId&gt;ro.isdc.wro4j&lt;/groupId&gt;
-      &lt;artifactId&gt;wro4j-core&lt;/artifactId&gt;
-      &lt;version&gt;${wro4j.version}&lt;/version&gt;
-    &lt;/dependency&gt;
-    &lt;dependency&gt;
-      &lt;groupId&gt;ro.isdc.wro4j&lt;/groupId&gt;
-      &lt;artifactId&gt;wro4j-extensions&lt;/artifactId&gt;
-      &lt;version&gt;${wro4j.version}&lt;/version&gt;
-      &lt;exclusions&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;javax.servlet&lt;/groupId&gt;
-            &lt;artifactId&gt;servlet-api&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.apache.commons&lt;/groupId&gt;
-            &lt;artifactId&gt;commons-lang3&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;commons-io&lt;/groupId&gt;
-            &lt;artifactId&gt;commons-io&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;commons-pool&lt;/groupId&gt;
-            &lt;artifactId&gt;commons-pool&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.springframework&lt;/groupId&gt;
-            &lt;artifactId&gt;spring-web&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;com.google.code.gson&lt;/groupId&gt;
-            &lt;artifactId&gt;gson&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;com.google.javascript&lt;/groupId&gt;
-            &lt;artifactId&gt;closure-compiler&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;com.github.lltyk&lt;/groupId&gt;
-            &lt;artifactId&gt;dojo-shrinksafe&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.jruby&lt;/groupId&gt;
-            &lt;artifactId&gt;jruby-core&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-          &lt;groupId&gt;org.jruby&lt;/groupId&gt;
-          &lt;artifactId&gt;jruby-stdlib&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.jruby&lt;/groupId&gt;
-            &lt;artifactId&gt;jruby-stdlib&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;me.n4u.sass&lt;/groupId&gt;
-            &lt;artifactId&gt;sass-gems&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;nz.co.edmi&lt;/groupId&gt;
-            &lt;artifactId&gt;bourbon-gem-jar&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.codehaus.gmaven.runtime&lt;/groupId&gt;
-            &lt;artifactId&gt;gmaven-runtime-1.7&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;jshint&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;less&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;emberjs&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;handlebars&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;coffee-script&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;jslint&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;json2&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-        &lt;exclusion&gt;
-            &lt;groupId&gt;org.webjars&lt;/groupId&gt;
-            &lt;artifactId&gt;jquery&lt;/artifactId&gt;
-        &lt;/exclusion&gt;
-      &lt;/exclusions&gt;
-    &lt;/dependency&gt;
-  &lt;/dependencies&gt;
-&lt;/plugin&gt;
-</code>
-        </pre>
-        <p>The dependencies to <strong>wro4j-core</strong> and <strong>wro4j-extensions</strong> are needed by jetty, to be able to enable the filter defined below. Unfortunatly, one of the transitive dependencies of <code>wro4j-extensions</code> triggers an uggly error when running the jetty-maven-plugin. Therefore, all unneeded dependencies of <code>wro4j-extensions</code> are excluded, as a workaround for this error/bug.</p>
-        <h2>jetty-web.xml</h2>
-        <p>And my jetty-web.xml looks like this:</p>
-        <pre class="prettyprint linenums">
-<code class="xml">
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;web-app xmlns="http://java.sun.com/xml/ns/javaee"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-  version="2.5"&gt;
-  &lt;filter&gt;
-    &lt;filter-name&gt;wro&lt;/filter-name&gt;
-    &lt;filter-class&gt;ro.isdc.wro.http.WroFilter&lt;/filter-class&gt;
-  &lt;/filter&gt;
-  &lt;filter-mapping&gt;
-    &lt;filter-name&gt;wro&lt;/filter-name&gt;
-    &lt;url-pattern&gt;*.css&lt;/url-pattern&gt;
-  &lt;/filter-mapping&gt;
-&lt;/web-app&gt;
-</code>
-        </pre>
-        <p>The filter processes any URI&#8217;s that end with <code>.css</code>. This way, the wro4j servlet-filter makes <code>base.css</code> available under any path, because for exampl <code>/base.css</code>, <code>/css/base.css</code> and <code>/foo/bar/base.css</code> all end with <code>.css</code>.</p>
-        <p>This is all, that is needed to develop with dynamically reloadable compiled LESS-resources. Just fire up your browser and browse to <code>/what/you/like/base.css</code>. (But do not forget to put some LESS-files in <code>src/main/webapp/less/base/</code> first!)</p>
-        <h2>Step 3: Install wro4j-maven-plugin</h2>
-        <p>All that is left over to configure now, is the build-process. If you would build and deploy your webapp now, the CSS-file <code>base.css</code> would not be generated and the link to your stylesheet, that already works in our jetty-maven-plugin environment would point to a 404. Hence, we need to set up the <strong>wro4j-maven-plugin</strong>. I am using this configuration:</p>
-        <pre class="prettyprint linenums">
-<code class="xml">
-&lt;plugin&gt;
-  &lt;groupId&gt;ro.isdc.wro4j&lt;/groupId&gt;
-  &lt;artifactId&gt;wro4j-maven-plugin&lt;/artifactId&gt;
-  &lt;version&gt;${wro4j.version}&lt;/version&gt;
-  &lt;configuration&gt;
-    &lt;wroManagerFactory&gt;ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory&lt;/wroManagerFactory&gt;
-    &lt;cssDestinationFolder&gt;${project.build.directory}/${project.build.finalName}/css/&lt;/cssDestinationFolder&gt;
-  &lt;/configuration&gt;
-  &lt;executions&gt;
-    &lt;execution&gt;
-      &lt;phase&gt;package&lt;/phase&gt;
-      &lt;goals&gt;
-        &lt;goal&gt;run&lt;/goal&gt;
-      &lt;/goals&gt;
-    &lt;/execution&gt;
-  &lt;/executions&gt;
-&lt;/plugin&gt;
-</code>
-        </pre>
-        <p>I connected the <code>run</code>-goal with the <code>package</code>-phase, because the statically compiled CSS-file is needed only in the final war. The <code>ConfigurableWroManagerFactory</code> tells wro4j, that it should look up further configuration options in our <code>wro.properties</code>-file, where we tell wro4j, that it should compile our LESS-resources. The <code>&lt;cssDestinationFolder&gt;</code>-tag tells wro4j, where it should put the generated CSS-file. You can adjust that to suite your needs.</p>
-        <p>That&#8217;s it: now the same CSS-file, which is created on the fly by the wro4j servlet-filter when using <code>mvn jetty:run</code> and, thus, enables dynamic reloading of our LESS-resources, is generated during the build-process by the wro4j-maven-plugin.</p>
-        <h2>Cleanup and further considerations</h2>
-        <h3>lesscss-maven-plugin</h3>
-        <p>If you already compile your LESS-resources with the lesscss-maven-plugin, you can stick with it and skip step 3. But I strongly recommend giving wro4j-maven-plugin a try, because it is a much more powerfull tool, that can speed up your final webapp even more.</p>
-        <h3>Clean up your mess </h3>
-        <p>With a configuration like the above one, your LESS-resources and wro4j-configuration-files will be packed into your production-war. That might be confusing later, because neither wro4j nor LESS is used in the final war. You can add the following to your <code>pom.xml</code> to exclude these files from your war for the sake of clarity:</p>
-        <pre class="prettyprint linenums">
-<code class="xml">
-&lt;plugin&gt;
-  &lt;artifactId&gt;maven-war-plugin&lt;/artifactId&gt;
-  &lt;configuration&gt;
-    &lt;warSourceExcludes&gt;
-      WEB-INF/wro.*,
-      less/**
-    &lt;/warSourceExcludes&gt;
-  &lt;/configuration&gt;
-&lt;/plugin&gt;
-</code>
-        </pre>
-        <h3>What&#8217;s next?</h3>
-        <p>We only scrached the surface, of what can be done with wro4j. Based on this configuration, you can easily enable additional features to fine-tune your final build for maximum speed. You really should take a look at the <a href="https://code.google.com/p/wro4j/wiki/AvailableProcessors" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-article', 'http://code.google.com']);" title="Available Processors">list of available Processors</a>!</p>
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        This entry was posted in <a href="http://juplo.de/category/jetty/" title="View all posts in Jetty" rel="category tag">Jetty</a>, <a href="http://juplo.de/category/less/" title="View all posts in less" rel="category tag">less</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>, <a href="http://juplo.de/category/wro4j/" title="View all posts in wro4j" rel="category tag">wro4j</a>. Bookmark the <a href="http://juplo.de/combining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources/" title="Permalink to Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources" rel="bookmark">permalink</a>. 
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-140 -->
-    <!-- You can start editing here. -->
-    <!-- If comments are open, but there are no comments. -->
-    <div id="respond">
-      <h3>Leave a Reply</h3>
-      <div id="cancel-comment-reply">
-        <small><a rel="nofollow" id="cancel-comment-reply-link" href="/combining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources/#respond" style="display:none;">Click here to cancel reply.</a></small>
-      </div>
-      <form action="http://juplo.de/wp-comments-post.php" method="post" id="commentform">
-        <p>Logged in as <a href="http://juplo.de/wp-admin/profile.php">Kai Moritz</a>. <a href="http://juplo.de/wp-login.php?action=logout&amp;redirect_to=http%3A%2F%2Fjuplo.de%2Fcombining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources%2F&amp;_wpnonce=09e5cb501d" title="Log out of this account">Log out &raquo;</a></p>
-        <!--<p><small><strong>XHTML:</strong> You can use these tags: <code>&lt;a href=&quot;&quot; title=&quot;&quot;&gt; &lt;abbr title=&quot;&quot;&gt; &lt;acronym title=&quot;&quot;&gt; &lt;b&gt; &lt;blockquote cite=&quot;&quot;&gt; &lt;cite&gt; &lt;code&gt; &lt;del datetime=&quot;&quot;&gt; &lt;em&gt; &lt;i&gt; &lt;q cite=&quot;&quot;&gt; &lt;strike&gt; &lt;strong&gt; </code></small></p>-->
-        <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
-        <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-          <input type='hidden' name='comment_post_ID' value='140' id='comment_post_ID' />
-          <input type='hidden' name='comment_parent' id='comment_parent' value='0' />
-        </p>
-        <input type="hidden" id="_wp_unfiltered_html_comment_disabled" name="_wp_unfiltered_html_comment_disabled" value="2096655c89" /><script>(function() {
-    if (window === window.parent) {
-      document.getElementById('_wp_unfiltered_html_comment_disabled').name = '_wp_unfiltered_html_comment';
-    }
-  })();</script>
-        <p style="display: none;"><input type="hidden" id="akismet_comment_nonce" name="akismet_comment_nonce" value="f31e001227" /></p>
-      </form>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string">
-    <div id="secondary" class="widget-area" role="complementary">
-      <aside id="archives" class="widget">
-        <h1 class="widget-title">Archives</h1>
-        <ul>
-          <li><a href='http://juplo.de/2013/10/' title='October 2013'>October 2013</a></li>
-          <li><a href='http://juplo.de/2013/08/' title='August 2013'>August 2013</a></li>
-          <li><a href='http://juplo.de/2013/01/' title='January 2013'>January 2013</a></li>
-          <li><a href='http://juplo.de/2012/11/' title='November 2012'>November 2012</a></li>
-        </ul>
-      </aside>
-      <aside id="categories" class="widget">
-        <h1 class="widget-title">Most Used Categories</h1>
-        <ul>
-          <li class="cat-item cat-item-4"><a href="http://juplo.de/category/java/" title="View all posts filed under Java">Java</a> (6)</li>
-          <li class="cat-item cat-item-6"><a href="http://juplo.de/category/hibernate/" title="View all posts filed under Hibernate">Hibernate</a> (5)</li>
-          <li class="cat-item cat-item-8"><a href="http://juplo.de/category/maven/" title="View all posts filed under Maven">Maven</a> (5)</li>
-          <li class="cat-item cat-item-9"><a href="http://juplo.de/category/jpa/" title="View all posts filed under JPA">JPA</a> (1)</li>
-          <li class="cat-item cat-item-10"><a href="http://juplo.de/category/appengine/" title="View all posts filed under appengine">appengine</a> (1)</li>
-          <li class="cat-item cat-item-11"><a href="http://juplo.de/category/oauth2/" title="View all posts filed under oauth2">oauth2</a> (1)</li>
-        </ul>
-      </aside>
-      <aside id="search" class="widget widget_search">
-        <h1 class="widget-title">Search</h1>
-        <form role="search" method="get" id="searchform" class="searchform" action="http://juplo.de/">
-          <div>
-            <label class="screen-reader-text" for="s">Search for:</label>
-            <input type="text" value="" name="s" id="s" />
-            <input type="submit" id="searchsubmit" value="Search" />
-          </div>
-        </form>
-      </aside>
-    </div><!-- #secondary .widget-area -->
-    <div id="tertiary" class="widget-area" role="supplementary">
-    </div><!-- #tertiary .widget-area -->
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/blog/comments.jsp b/src/main/webapp/WEB-INF/views/blog/comments.jsp
deleted file mode 100644 (file)
index 67060e6..0000000
+++ /dev/null
@@ -1,489 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="" type="string" cascade="true"/>
-    <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><strong class="b">Blog</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><strong class="m">Blog</strong></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <article id="post-34" class="post-34 post type-post status-publish format-standard hentry category-hibernate category-java category-maven">
-      <div class="entry-header">
-        <h1 class="entry-title">hibernate4-maven-plugin</h1>
-        <div class="entry-meta">
-          Posted on <a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/" title="19:29" rel="bookmark"><time class="entry-date" datetime="2012-11-28T19:29:12+00:00" pubdate>November 28, 2012</time></a><span class="byline"> by <span class="author vcard"><a class="url fn n" href="http://juplo.de/author/kai/" title="View all posts by Kai Moritz" rel="author">Kai Moritz</a></span></span>
-        </div><!-- .entry-meta -->
-      </div><!-- .entry-header -->
-      <div class="entry-content">
-        <h2>A simple Plugin for generating a Database-Schema from Hibernate 4 Mapping-Annotations</h2>
-        <p>
-          Hibernate comes with the buildin functionality, to automatically create or update the database schema. This functionality is configured in the session-configuraton via the parameter <code>hbm2ddl.auto</code> (see <a href="http://docs.jboss.org/hibernate/orm/4.1/manual/en-US/html_single/#configuration-optional" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://docs.jboss.org']);">Hibernate Reference Documentation &#8211; Chapter 3.4. Optional configuration properties</a>). But doing so <a href="http://stackoverflow.com/questions/221379/hibernate-hbm2ddl-auto-update-in-production" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://stackoverflow.com']);">is not very wise</a>, because you can easily corrupt or erase your production database, if this configuration parameter slips through to your production environment.
-        </p>
-        <p>
-          Alternatively, you can <a href="http://stackoverflow.com/questions/835961/how-to-creata-database-schema-using-hibernate" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://stackoverflow.com']);">run the tools <strong>SchemaExport</strong> or <strong>SchemaUpdate</strong> by hand</a>. But that is not very comfortable and being used to maven you will quickly long for a plugin, that does that job automatically for you, when you fire up your test cases.
-        </p>
-        <p>In the good old times, there was the <a href="http://mojo.codehaus.org/maven-hibernate3/hibernate3-maven-plugin/" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://mojo.codehaus.org']);">Maven Hibernate3 Plugin</a>, that does this for you. But unfortunatly, this plugin is not compatible with Hibernate 4.x. Since there does not seem to be any successor for the Maven Hibernate3 Plugin and <a href="http://www.google.de/search?q=hibernate4+maven+plugin" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://www.google.de']);">googeling</a> does not help, I decided to write up this simple plugin (inspired by these two articles I found: <a href="http://www.tikalk.com/alm/blog/schema-export-hibernate-4-and-maven" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://www.tikalk.com']);">Schema Export with Hibernate 4 and Maven</a> and <a href="http://doingenterprise.blogspot.de/2012/05/schema-generation-with-hibernate-4-jpa.html" onclick="javascript:_gaq.push(['_trackEvent','outbound-article','http://doingenterprise.blogspot.de']);">Schema generation with Hibernate 4, JPA and Maven</a>).
-        </p>
-        <p>
-          I hope, the resulting simple to use buletproof <a href="/hibernate4-maven-plugin/">hibernate4-maven-plugin</a> is usefull!
-        </p>
-        <p>
-          <strong><a href="/hibernate4-maven-plugin/">Try it out now!</a></strong></p>
-      </div><!-- .entry-content -->
-      <footer class="entry-meta">
-        This entry was posted in <a href="http://juplo.de/category/hibernate/" title="View all posts in Hibernate" rel="category tag">Hibernate</a>, <a href="http://juplo.de/category/java/" title="View all posts in Java" rel="category tag">Java</a>, <a href="http://juplo.de/category/maven/" title="View all posts in Maven" rel="category tag">Maven</a>. Bookmark the <a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/" title="Permalink to hibernate4-maven-plugin" rel="bookmark">permalink</a>. 
-      </footer><!-- .entry-meta -->
-    </article><!-- #post-34 -->
-    <!-- You can start editing here. -->
-    <h3 id="comments">15 Responses to &#8220;hibernate4-maven-plugin&#8221;</h3>
-    <div class="navigation">
-      <div class="alignleft"></div>
-      <div class="alignright"></div>
-    </div>
-    <ol class="commentlist">
-      <li class="comment even thread-even depth-1 parent" id="comment-556">
-        <div id="div-comment-556" class="comment-body">
-          <div class="comment-author vcard">
-            <cite class="fn">Jukes</cite> <span class="says">says:</span>
-          </div>
-          <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-556">
-              November 7, 2013 at 23:18</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=556" title="Edit comment">(Edit)</a>
-          </div>
-          <p>
-            Hi thanks a lot for making this plugin available, great work!!<br />
-            I have a problem generating postgres schema. Looks like the plugin ignores the data type when adding default values and that yields a syntax error from Postgres. Or maybe I&#8217;m doing something wrong. I&#8217;m using version 1.0.3.</p>
-          <p>For example I have in java:</p>
-          <p>
-            @Column(name = &#8220;financialEnabled&#8221;, nullable = false, columnDefinition = &#8220;default TRUE&#8221;)<br />
-            private boolean financialEnabled;
-          </p>
-          <p>
-            Generated SQL is:<br />
-            financialEnabled default TRUE not null,
-          </p>
-          <p>As you can see the data type boolean is not translated to the SQL script. Thanks a lot for your help.</p>
-          <div class="reply">
-            <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=556#respond' onclick='return addComment.moveForm("div-comment-556", "556", "respond", "34")'>Reply</a>
-          </div>
-        </div>
-        <ul class="children">
-          <li class="comment byuser comment-author-kai bypostauthor odd alt depth-2" id="comment-567">
-            <div id="div-comment-567" class="comment-body">
-              <div class="comment-author vcard">
-                <cite class="fn"><a href="http://juplo.de"   rel='external nofollow' class='url'>Kai Moritz</a></cite> <span class="says">says:</span>
-              </div>
-              <div class="comment-meta commentmetadata">
-                <a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-567">
-                  November 11, 2013 at 13:09</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=567" title="Edit comment">(Edit)
-                </a>
-              </div>
-              <p>
-                This plugin is only a tool to automate the generation of the SQL in your development-environment.<br />
-                Questions on how to anotate your code correctly are better asked in a user-forum from hibernate or such.</p>
-              <p>
-                Nevertheless, I think I can give you a usefull hint:<br />
-                You are overwriting the automatically generated column-definition with &#8220;default TRUE&#8221;.<br />
-                Try it with</p>
-              <p>
-                @Column(name = “financialEnabled”, nullable = false)<br />
-                private boolean financialEnabled;</p>
-              <div class="reply">
-                <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=567#respond' onclick='return addComment.moveForm("div-comment-567", "567", "respond", "34")'>Reply</a>
-              </div>
-            </div>
-          </li><!-- #comment-## -->
-        </ul><!-- .children -->
-      </li><!-- #comment-## -->
-      <li class="comment even thread-odd thread-alt depth-1 parent" id="comment-390">
-        <div id="div-comment-390" class="comment-body">
-          <div class="comment-author vcard">
-            <cite class="fn">Milios</cite> <span class="says">says:</span>
-          </div>
-          <div class="comment-meta commentmetadata">
-            <a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-390">
-              October 10, 2013 at 15:02
-            </a>
-            &nbsp;&nbsp;
-            <a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=390" title="Edit comment">(Edit)</a>
-          </div>
-          <p>Hi,</p>
-          <p>
-            looks like a very nice plugin. Unfortunately, part of our entities are in other modules/dependencies.<br />
-            Do you plan to add the possibility to scan also for dependencies of the project or at least of the plugin?</p>
-          <p>Also, when I only want to generate the SQL and use the following configuration, I got nothing.</p>
-          <p>Config:</p>
-          <p>
-            de.juplo<br />
-            hibernate4-maven-plugin<br />
-            1.0.2</p>
-          <p>
-            true<br />
-            SCRIPT<br />
-            NONE<br />
-            com.deutscheboerse.hibernate.PostgreSQLDialect<br />
-            ${project.build.directory}/hibernate4/cmm-schema.sql</p>
-          <p>
-            com.deutscheboerse.energy<br />
-            energy-commons-hibernate<br />
-            ${commons.hibernate.version}</p>
-          <p>
-            org.springframework.security<br />
-            spring-security-core<br />
-            ${spring.security.version}</p>
-          <p>
-            org.slf4j<br />
-            slf4j-log4j12<br />
-            ${slf4j.version}</p>
-          <p>
-            Output:<br />
-            mvn hibernate4:export -e<br />
-            [INFO] Error stacktraces are turned on.<br />
-            [INFO] Scanning for projects&#8230;<br />
-            [INFO]<br />
-            [INFO] &#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;<br />
-            [INFO] Building CMM WAR 1.0.0-RC5-SNAPSHOT<br />
-            [INFO] &#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;<br />
-            [INFO]<br />
-            [INFO] &#8212; hibernate4-maven-plugin:1.0.2:export (default-cli) @ cmm-war &#8212;<br />
-            [INFO] Scanning directory D:\_dev\work\ii\src\cmm\trunk\cmm-war\target\classes f<br />
-            [INFO] No hibernate-properties-file found! (Checked path: D:\_dev\work\ii\src\cm<br />
-            [INFO] Gathered hibernate-configuration (turn on debugging for details):<br />
-            [INFO]   hibernate.dialect = com.deutscheboerse.hibernate.PostgreSQLDialect<br />
-            [INFO] HHH000400: Using dialect: com.deutscheboerse.hibernate.PostgreSQLDialect<br />
-            [INFO] &#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;<br />
-            [INFO] BUILD SUCCESS<br />
-            [INFO] &#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;<br />
-            [INFO] Total time: 10.932s<br />
-            [INFO] Finished at: Thu Oct 10 12:51:05 UTC 2013<br />
-            [INFO] Final Memory: 9M/23M<br />
-            [INFO] &#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;&#8212;</p>
-          <p>
-            Thanks for any help,<br />
-            Milos.
-          </p>
-          <div class="reply">
-            <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=390#respond' onclick='return addComment.moveForm("div-comment-390", "390", "respond", "34")'>Reply</a>
-          </div>
-        </div>
-        <ul class="children">
-          <li class="comment byuser comment-author-kai bypostauthor odd alt depth-2 parent" id="comment-391">
-            <div id="div-comment-391" class="comment-body">
-              <div class="comment-author vcard">
-                <cite class="fn"><a href="http://juplo.de"   rel='external nofollow' class='url'>Kai Moritz</a></cite> <span class="says">says:</span>
-              </div>
-              <div class="comment-meta commentmetadata">
-                <a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-391">
-                  October 10, 2013 at 22:19
-                </a>
-                &nbsp;&nbsp;
-                <a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=391" title="Edit comment">(Edit)</a>          </div>
-              <p>
-                Yes, I am working on the possibility, to scan for annotations in dependencies.<br />
-                Unfortunatly, I have no example-project for this use-case by hand.<br />
-                It would help a lot, if you could provide a sample-project on github or such.
-              </p>
-              <p>Greetings kai</p>
-              <div class="reply">
-                <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=391#respond' onclick='return addComment.moveForm("div-comment-391", "391", "respond", "34")'>Reply</a>
-              </div>
-            </div>
-            <ul class="children">
-              <li class="comment byuser comment-author-kai bypostauthor even depth-3" id="comment-568">
-                <div id="div-comment-568" class="comment-body">
-                  <div class="comment-author vcard">
-                    <cite class="fn"><a href="http://juplo.de"   rel='external nofollow' class='url'>Kai Moritz</a></cite> <span class="says">says:</span>
-                  </div>
-                  <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-568">
-                      November 11, 2013 at 13:11</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=568" title="Edit comment">(Edit)</a>          </div>
-
-                  <p>Version 1.0.3 of the plugin can now scan for annotations in the dependencies, too.</p>
-
-                  <div class="reply">
-                    <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=568#respond' onclick='return addComment.moveForm("div-comment-568", "568", "respond", "34")'>Reply</a>              </div>
-                </div>
-              </li><!-- #comment-## -->
-            </ul><!-- .children -->
-          </li><!-- #comment-## -->
-        </ul><!-- .children -->
-      </li><!-- #comment-## -->
-      <li class="comment odd alt thread-even depth-1" id="comment-286">
-        <div id="div-comment-286" class="comment-body">
-          <div class="comment-author vcard">
-            <cite class="fn">Pedro</cite> <span class="says">says:</span>              </div>
-
-          <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-286">
-              August 7, 2013 at 18:54</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=286" title="Edit comment">(Edit)</a>             </div>
-
-          <p>Following my previous question, here is the debug info</p>
-          <p>[DEBUG] Dependency: /Users/pmarques/.m2/repository/org/springframework/security/spring-security-acl/3.1.4.RELEASE/spring-security-acl-3.1.4.RELEASE.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/atomikos-util/3.6.5/atomikos-util-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-api/3.6.5/transactions-api-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/javax/transaction/transaction-api/1.1/transaction-api-1.1.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-jdbc-deprecated/3.6.5/transactions-jdbc-deprecated-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-jdbc/3.6.5/transactions-jdbc-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-jta/3.6.5/transactions-jta-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions/3.6.5/transactions-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/geronimo-jta_1.0.1B_spec-1.0.1.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-jms-deprecated/3.6.5/transactions-jms-deprecated-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-jms/3.6.5/transactions-jms-3.6.5.jar<br />
-            [DEBUG] Dependency: /Users/pmarques/.m2/repository/com/atomikos/transactions-hibernate3/3.6.5/transactions-hibernate3-3.6.5.jar<br />
-            [INFO] Scanning directory /target/classes for annotated classes&#8230;</p>
-
-          <div class="reply">
-            <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=286#respond' onclick='return addComment.moveForm("div-comment-286", "286", "respond", "34")'>Reply</a>              </div>
-        </div>
-      </li><!-- #comment-## -->
-      <li class="comment even thread-odd thread-alt depth-1 parent" id="comment-285">
-        <div id="div-comment-285" class="comment-body">
-          <div class="comment-author vcard">
-            <cite class="fn">Pedro</cite> <span class="says">says:</span>              </div>
-
-          <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-285">
-              August 7, 2013 at 18:49</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=285" title="Edit comment">(Edit)</a>             </div>
-
-          <p>Hi,</p>
-          <p>I have the following problem.<br />
-            The project that I use to test (and use the plugin) has the annotated classes as a dependency.<br />
-            I am getting the error:<br />
-            No annotated classes found in directory /target/classes</p>
-          <p>Shouldn&#8217;t the plugin scan all the dependencies also?</p>
-          <p>Thanks,<br />
-            Pedro.</p>
-
-          <div class="reply">
-            <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=285#respond' onclick='return addComment.moveForm("div-comment-285", "285", "respond", "34")'>Reply</a>              </div>
-        </div>
-        <ul class="children">
-          <li class="comment byuser comment-author-kai bypostauthor odd alt depth-2 parent" id="comment-287">
-            <div id="div-comment-287" class="comment-body">
-              <div class="comment-author vcard">
-                <cite class="fn"><a href="http://juplo.de"   rel='external nofollow' class='url'>Kai Moritz</a></cite> <span class="says">says:</span>         </div>
-
-              <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-287">
-                  August 7, 2013 at 19:12</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=287" title="Edit comment">(Edit)</a>         </div>
-
-              <p>Hi Pedro,</p>
-              <p>I think, that your observation is right.<br />
-                But otherwise, dependencies should only be scanned if requested, because automatic scanning of the dependencies might lead to errors in other situations.</p>
-              <p>If you can make your project available to me (for example via github, or simply by mailing zipped version), I would add a configuration-parameter to enable/disable dependency-scanning and upload the refined plugin to central.</p>
-              <p>Regards,</p>
-              <p>Kai Moritz</p>
-
-              <div class="reply">
-                <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=287#respond' onclick='return addComment.moveForm("div-comment-287", "287", "respond", "34")'>Reply</a>          </div>
-            </div>
-            <ul class="children">
-              <li class="comment byuser comment-author-kai bypostauthor even depth-3" id="comment-426">
-                <div id="div-comment-426" class="comment-body">
-                  <div class="comment-author vcard">
-                    <cite class="fn"><a href="http://juplo.de"   rel='external nofollow' class='url'>Kai Moritz</a></cite> <span class="says">says:</span>             </div>
-
-                  <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-426">
-                      October 18, 2013 at 02:52</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=426" title="Edit comment">(Edit)</a>           </div>
-
-                  <p>The <a href="/hibernate4-maven-plugin-1-0-3-released/" title="Open the release-notes" rel="nofollow">new version 1.0.3</a> of the plugin adds support for annotated classes in dependencies!</p>
-
-                  <div class="reply">
-                    <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=426#respond' onclick='return addComment.moveForm("div-comment-426", "426", "respond", "34")'>Reply</a>              </div>
-                </div>
-              </li><!-- #comment-## -->
-            </ul><!-- .children -->
-          </li><!-- #comment-## -->
-        </ul><!-- .children -->
-      </li><!-- #comment-## -->
-      <li class="comment odd alt thread-even depth-1 parent" id="comment-276">
-        <div id="div-comment-276" class="comment-body">
-          <div class="comment-author vcard">
-            <cite class="fn"><a href="http://bidlogix.com" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-commentauthor', 'http://bidlogix.com']);"  rel='external nofollow' class='url'>mike</a></cite> <span class="says">says:</span>              </div>
-
-          <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-276">
-              July 30, 2013 at 12:57</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=276" title="Edit comment">(Edit)</a>              </div>
-
-          <p>Hello,</p>
-          <p>I&#8217;m upgrading from hibernate3 to to hibernate4 and have moved from the hibernate3-maven-plugin to this version. I haven&#8217;t undertaken (and don&#8217;t want to just yet) the big job of changing my hbm mapping files to annotations.</p>
-          <p>As far as I can see this is a show stopper for using your nice plugin. Can you please confirm if this is the case and whether you are planning to add support for scanning for hbm files?</p>
-          <p>Many thanks,</p>
-          <p>Mike Cohen.</p>
-
-          <div class="reply">
-            <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=276#respond' onclick='return addComment.moveForm("div-comment-276", "276", "respond", "34")'>Reply</a>              </div>
-        </div>
-        <ul class="children">
-          <li class="comment byuser comment-author-tortenheber even depth-2" id="comment-277">
-            <div id="div-comment-277" class="comment-body">
-              <div class="comment-author vcard">
-                <cite class="fn">tortenheber</cite> <span class="says">says:</span>            </div>
-
-              <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-277">
-                  July 31, 2013 at 23:18</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=277" title="Edit comment">(Edit)</a>          </div>
-
-              <p>Hello Mike,</p>
-              <p>I added the requested feature in the SNAPSHOT-version.<br />
-                It would be nice, if you could test, if the new feature works, because I have no example project by hand, that still uses hibernate-mapping via XML.</p>
-              <p>You can download an actual build here:</p>
-              <p><a href="https://oss.sonatype.org/content/repositories/snapshots//de/juplo/hibernate4-maven-plugin/1.0.2-SNAPSHOT/" onclick="javascript:_gaq.push(['_trackEvent', 'outbound-comment', 'http://oss.sonatype.org']);" rel="nofollow">https://oss.sonatype.org/content/repositories/snapshots//de/juplo/hibernate4-maven-plugin/1.0.2-SNAPSHOT/</a></p>
-              <p>or build it by yourself from the sources.<br />
-                The feature is documented here:</p>
-              <p><a href="http://juplo.de/hibernate4-maven-plugin-1.0.2-SNAPSHOT/export-mojo.html"  rel="nofollow">http://juplo.de/hibernate4-maven-plugin-1.0.2-SNAPSHOT/export-mojo.html</a></p>
-              <p>Best regards</p>
-              <p>kai</p>
-
-              <div class="reply">
-                <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=277#respond' onclick='return addComment.moveForm("div-comment-277", "277", "respond", "34")'>Reply</a>          </div>
-            </div>
-          </li><!-- #comment-## -->
-        </ul><!-- .children -->
-      </li><!-- #comment-## -->
-      <li class="comment odd alt thread-odd thread-alt depth-1 parent" id="comment-50">
-        <div id="div-comment-50" class="comment-body">
-          <div class="comment-author vcard">
-            <cite class="fn">Victor</cite> <span class="says">says:</span>             </div>
-
-          <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-50">
-              February 22, 2013 at 15:28</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=50" title="Edit comment">(Edit)</a>           </div>
-
-          <p>Hey I have modified your code to support envers and generate auditing tables, if you want I can send you a patch. Thanks!</p>
-
-          <div class="reply">
-            <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=50#respond' onclick='return addComment.moveForm("div-comment-50", "50", "respond", "34")'>Reply</a>         </div>
-        </div>
-        <ul class="children">
-          <li class="comment even depth-2 parent" id="comment-51">
-            <div id="div-comment-51" class="comment-body">
-              <div class="comment-author vcard">
-                <cite class="fn">admin</cite> <span class="says">says:</span>          </div>
-
-              <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-51">
-                  February 22, 2013 at 19:54</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=51" title="Edit comment">(Edit)</a>               </div>
-
-              <p>Your welcom.<br />
-                Send it!</p>
-
-              <div class="reply">
-                <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=51#respond' onclick='return addComment.moveForm("div-comment-51", "51", "respond", "34")'>Reply</a>             </div>
-            </div>
-            <ul class="children">
-              <li class="comment odd alt depth-3 parent" id="comment-54">
-                <div id="div-comment-54" class="comment-body">
-                  <div class="comment-author vcard">
-                    <cite class="fn">Victor</cite> <span class="says">says:</span>             </div>
-
-                  <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-54">
-                      February 25, 2013 at 15:28</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=54" title="Edit comment">(Edit)</a>           </div>
-
-                  <p>Where to? Is there a github repo?</p>
-
-                  <div class="reply">
-                    <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=54#respond' onclick='return addComment.moveForm("div-comment-54", "54", "respond", "34")'>Reply</a>         </div>
-                </div>
-                <ul class="children">
-                  <li class="comment even depth-4" id="comment-55">
-                    <div id="div-comment-55" class="comment-body">
-                      <div class="comment-author vcard">
-                        <cite class="fn">admin</cite> <span class="says">says:</span>          </div>
-
-                      <div class="comment-meta commentmetadata"><a href="http://juplo.de/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#comment-55">
-                          February 25, 2013 at 20:05</a>&nbsp;&nbsp;<a class="comment-edit-link" href="http://juplo.de/wp-admin/comment.php?action=editcomment&amp;c=55" title="Edit comment">(Edit)</a>               </div>
-
-                      <p>There is a private git-Repository.<br />
-                        <a href="http://juplo.de/hibernate4-maven-plugin/source-repository.html"  rel="nofollow">Check the project-documentation!</a></p>
-                      <p>You can <a href="http://juplo.de/hibernate4-maven-plugin/team-list.html"  rel="nofollow">send me</a> a patch or a pull-request to <a href="mailto:kai@juplo.de">kai@juplo.de</a></p>
-
-                      <div class="reply">
-                        <a class='comment-reply-link' href='/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/?replytocom=55#respond' onclick='return addComment.moveForm("div-comment-55", "55", "respond", "34")'>Reply</a>             </div>
-                    </div>
-                  </li><!-- #comment-## -->
-                </ul><!-- .children -->
-              </li><!-- #comment-## -->
-            </ul><!-- .children -->
-          </li><!-- #comment-## -->
-        </ul><!-- .children -->
-      </li><!-- #comment-## -->
-    </ol>
-
-    <div class="navigation">
-      <div class="alignleft"></div>
-      <div class="alignright"></div>
-    </div>
-
-
-    <div id="respond">
-
-      <h3>Leave a Reply</h3>
-
-      <div id="cancel-comment-reply">
-        <small><a rel="nofollow" id="cancel-comment-reply-link" href="/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/#respond" style="display:none;">Click here to cancel reply.</a></small>
-      </div>
-
-
-      <form action="http://juplo.de/wp-comments-post.php" method="post" id="commentform">
-
-
-        <p>Logged in as <a href="http://juplo.de/wp-admin/profile.php">Kai Moritz</a>. <a href="http://juplo.de/wp-login.php?action=logout&amp;redirect_to=http%3A%2F%2Fjuplo.de%2Fhibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations%2F&amp;_wpnonce=09e5cb501d" title="Log out of this account">Log out &raquo;</a></p>
-
-
-        <!--<p><small><strong>XHTML:</strong> You can use these tags: <code>&lt;a href=&quot;&quot; title=&quot;&quot;&gt; &lt;abbr title=&quot;&quot;&gt; &lt;acronym title=&quot;&quot;&gt; &lt;b&gt; &lt;blockquote cite=&quot;&quot;&gt; &lt;cite&gt; &lt;code&gt; &lt;del datetime=&quot;&quot;&gt; &lt;em&gt; &lt;i&gt; &lt;q cite=&quot;&quot;&gt; &lt;strike&gt; &lt;strong&gt; </code></small></p>-->
-
-        <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
-
-        <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
-          <input type='hidden' name='comment_post_ID' value='34' id='comment_post_ID' />
-          <input type='hidden' name='comment_parent' id='comment_parent' value='0' />
-        </p>
-        <input type="hidden" id="_wp_unfiltered_html_comment_disabled" name="_wp_unfiltered_html_comment_disabled" value="2cfe5768bb" /><script>(function() {
-    if (window === window.parent) {
-      document.getElementById('_wp_unfiltered_html_comment_disabled').name = '_wp_unfiltered_html_comment';
-    }
-  })();</script>
-        <p style="display: none;"><input type="hidden" id="akismet_comment_nonce" name="akismet_comment_nonce" value="18eb674233" /></p>
-      </form>
-
-    </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string">
-    <div id="secondary" class="widget-area" role="complementary">
-      <aside id="archives" class="widget">
-        <h1 class="widget-title">Archives</h1>
-        <ul>
-          <li><a href='http://juplo.de/2013/10/' title='October 2013'>October 2013</a></li>
-          <li><a href='http://juplo.de/2013/08/' title='August 2013'>August 2013</a></li>
-          <li><a href='http://juplo.de/2013/01/' title='January 2013'>January 2013</a></li>
-          <li><a href='http://juplo.de/2012/11/' title='November 2012'>November 2012</a></li>
-        </ul>
-      </aside>
-      <aside id="categories" class="widget">
-        <h1 class="widget-title">Most Used Categories</h1>
-        <ul>
-          <li class="cat-item cat-item-4"><a href="http://juplo.de/category/java/" title="View all posts filed under Java">Java</a> (6)</li>
-          <li class="cat-item cat-item-6"><a href="http://juplo.de/category/hibernate/" title="View all posts filed under Hibernate">Hibernate</a> (5)</li>
-          <li class="cat-item cat-item-8"><a href="http://juplo.de/category/maven/" title="View all posts filed under Maven">Maven</a> (5)</li>
-          <li class="cat-item cat-item-9"><a href="http://juplo.de/category/jpa/" title="View all posts filed under JPA">JPA</a> (1)</li>
-          <li class="cat-item cat-item-10"><a href="http://juplo.de/category/appengine/" title="View all posts filed under appengine">appengine</a> (1)</li>
-          <li class="cat-item cat-item-11"><a href="http://juplo.de/category/oauth2/" title="View all posts filed under oauth2">oauth2</a> (1)</li>
-        </ul>
-      </aside>
-      <aside id="search" class="widget widget_search">
-        <h1 class="widget-title">Search</h1>
-        <form role="search" method="get" id="searchform" class="searchform" action="http://juplo.de/">
-          <div>
-            <label class="screen-reader-text" for="s">Search for:</label>
-            <input type="text" value="" name="s" id="s" />
-            <input type="submit" id="searchsubmit" value="Search" />
-          </div>
-        </form>
-      </aside>
-    </div><!-- #secondary .widget-area -->
-    <div id="tertiary" class="widget-area" role="supplementary">
-    </div><!-- #tertiary .widget-area -->
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/contact.jsp b/src/main/webapp/WEB-INF/views/contact.jsp
deleted file mode 100644 (file)
index 3f8675f..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Contact" type="string"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}about.html">About</a></li>
-    <li class="b"><strong class="b">Contact</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}about.html" class="s">About</a></h2>
-    <ul id="submenu">
-      <li class="s sub"><a href="${base}expertise.html" class="s">Expertise</a></li>
-      <li class="s sub"><a href="${base}references.html" class="s">References</a></li>
-      <li class="s"><strong class="s">Contact</strong></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="contentcontainer" type="string">
-    <div id="content" class="main pack cf">
-      <div class="p left">
-        <img class="p" src="${base}img/kai-moritz.jpg" alt="Portrait"/>
-      </div>
-      <article class="p right">
-        <header><h1><t:getAsString name="title"/></h1></header>
-        <h2>Address</h2>
-        <p>
-          Kai Moritz<br />
-          Zumsandestr. 29a<br />
-          48145 Münster
-        </p>
-        <h2>Email</h2>
-        <p><a href="mailto:kai@juplo.de">kai@juplo.de</a></p>
-        <h2>Phone</h2>
-        <p>+49 (0) 176 20 50 47 47</p>
-        <h2>Networking</h2>
-        <ul>
-          <li><a href="https://www.google.com/+KaiMoritz" title="Google+">www.google.com/+KaiMoritz</a></li>
-          <li><a href="https://www.xing.com/profile/Kai_Moritz" title="Xing">www.xing.com/profile/Kai_Moritz</a></li>
-        </ul>
-        <!--
-        <h2>About Me</h2>
-        <h2><em>Übersetzung?!?</em> Jobportale</h2>
-        -->
-      </article>
-    </div>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string" value=""/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/datenschutz.jsp b/src/main/webapp/WEB-INF/views/datenschutz.jsp
deleted file mode 100644 (file)
index 2e8a5d2..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Datenschutz" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a href="${base}impressum.html" class="b">Impressum</a></li>
-    <li class="b"><strong class="b">Datenschutz</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}impressum.html" class="s selected">Impressum</a></h2>
-    <ul id="submenu">
-      <li class="s"><a href="${base}agb.html" class="s">AGB</a></li>
-      <li class="s"><a href="${base}haftung-inhalte.html" class="s">Haftung für Inhalte</a></li>
-      <li class="s"><a href="${base}haftung-links.html" class="s">Haftung für Links</a></li>
-      <li class="s"><a href="${base}urheberrechte.html" class="s">Urheberrechte</a></li>
-      <li class="s"><strong class="s">Datenschutz</strong></li>
-      <li class="s"><a href="${base}google-analytics.html" class="s">Google Analytics</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Die Nutzung unserer Webseite ist in der Regel ohne Angabe personenbezogener Daten möglich. Soweit auf unseren Seiten personenbezogene Daten (beispielsweise Name, Anschrift oder eMail-Adressen) erhoben werden, erfolgt dies, soweit möglich, stets auf freiwilliger Basis. Diese Daten werden ohne Ihre ausdrückliche Zustimmung nicht an Dritte weitergegeben.</p>
-    <p>Wir weisen darauf hin, dass die Datenübertragung im Internet (z.B. bei der Kommunikation per E-Mail) Sicherheitslücken aufweisen kann. Ein lückenloser Schutz der Daten vor dem Zugriff durch Dritte ist nicht möglich.</p>
-    <p>Der Nutzung von im Rahmen der Impressumspflicht veröffentlichten Kontaktdaten durch Dritte zur Übersendung von nicht ausdrücklich angeforderter Werbung und Informationsmaterialien wird hiermit ausdrücklich widersprochen. Die Betreiber der Seiten behalten sich ausdrücklich rechtliche Schritte im Falle der unverlangten Zusendung von Werbeinformationen, etwa durch Spam-Mails, vor.</p>
-    <!-- http://www.e-recht24.de/impressum-generator.html -->
-    <p>Bitte beachten Sie auch die gesonderte <a href="${base}google-analytics.html">Datenschutzerklärung zur Nutzung von Google-Analytics</a>.</p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/expertise.jsp b/src/main/webapp/WEB-INF/views/expertise.jsp
deleted file mode 100644 (file)
index 1683c05..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Expertise" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}about.html">About</a></li>
-    <li class="b"><strong class="b">Expertise</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}about.html" class="s">About</a></h2>
-    <ul id="submenu">
-      <li class="s sub">
-        <strong class="s">Expertise</strong>
-        <ul class="s active">
-          <li class="s"><span href="${base}web-engineering.html" class="s">Web-Engineering</span></li>
-          <li class="s"><span href="${base}spring-framework.html" class="s">Spring Framework</span></li>
-          <li class="s"><span href="${base}.html" class="s"></span></li>
-          <li class="s"><span href="${base}responsive-web-design.html" class="s">Responsive Webdesign</span></li>
-          <li class="s"><span href="${base}web-ui-esign.html" class="s">WEB-UI-Design</span></li>
-          <li class="s"><span href="${base}seo.html" class="s">SEO</span></li>
-        </ul>
-      </li>
-      <li class="s sub off"><a href="${base}references.html" class="s">References</a></li>
-      <li class="s off"><a href="${base}contact.html" class="s">Contact</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" value="/WEB-INF/templates/wip.jsp" type="template" cascade="true"/>
-  <t:putAttribute name="marginalcontent" type="string" value=""/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/google-analytics.jsp b/src/main/webapp/WEB-INF/views/google-analytics.jsp
deleted file mode 100644 (file)
index 610a119..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Google Analytics" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a href="${base}impressum.html" class="b">Impressum</a></li>
-    <li class="b"><strong class="b">Google Analytics</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}impressum.html" class="s selected">Impressum</a></h2>
-    <ul id="submenu">
-      <li class="s"><a href="${base}agb.html" class="s">AGB</a></li>
-      <li class="s"><a href="${base}haftung-inhalte.html" class="s">Haftung für Inhalte</a></li>
-      <li class="s"><a href="${base}haftung-links.html" class="s">Haftung für Links</a></li>
-      <li class="s"><a href="${base}urheberrechte.html" class="s">Urheberrechte</a></li>
-      <li class="s"><a href="${base}datenschutz.html" class="s">Datenschutz</a></li>
-      <li class="s"><strong class="s">Google Analytics</strong></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Diese Website benutzt Google Analytics, einen Webanalysedienst der Google Inc. ("Google"). Google Analytics verwendet sog. "Cookies", Textdateien, die auf Ihrem Computer gespeichert werden und die eine Analyse der Benutzung der Website durch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre Benutzung dieser Website werden in der Regel an einen Server von Google in den USA übertragen und dort gespeichert. Im Falle der Aktivierung der IP-Anonymisierung auf dieser Webseite wird Ihre IP-Adresse von Google jedoch innerhalb von Mitgliedstaaten der Europäischen Union oder in anderen Vertragsstaaten des Abkommens über den Europäischen Wirtschaftsraum zuvor gekürzt.</p>
-    <p>Nur in Ausnahmefällen wird die volle IP-Adresse an einen Server von Google in den USA übertragen und dort gekürzt. Im Auftrag des Betreibers dieser Website wird Google diese Informationen benutzen, um Ihre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten zusammenzustellen und um weitere mit der Websitenutzung und der Internetnutzung verbundene Dienstleistungen gegenüber dem Websitebetreiber zu erbringen. Die im Rahmen von Google Analytics von Ihrem Browser übermittelte IP-Adresse wird nicht mit anderen Daten von Google zusammengeführt.</p>
-    <p>Sie können die Speicherung der Cookies durch eine entsprechende Einstellung Ihrer Browser-Software verhindern; wir weisen Sie jedoch darauf hin, dass Sie in diesem Fall gegebenenfalls nicht sämtliche Funktionen dieser Website vollumfänglich werden nutzen können. Sie können darüber hinaus die Erfassung der durch das Cookie erzeugten und auf Ihre Nutzung der Website bezogenen Daten (inkl. Ihrer IP-Adresse) an Google sowie die Verarbeitung dieser Daten durch Google verhindern, indem sie das unter dem folgenden Link verfügbare Browser-Plugin herunterladen und installieren:</p>
-    <p><a href="http://tools.google.com/dlpage/gaoptout?hl=de" title="Das Plugin jetzt herunterladen...">http://tools.google.com/dlpage/gaoptout?hl=de</a>.</p>
-    <!-- http://www.e-recht24.de/impressum-generator.html -->
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/haftung-inhalte.jsp b/src/main/webapp/WEB-INF/views/haftung-inhalte.jsp
deleted file mode 100644 (file)
index 9d83448..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Haftung für Inhalte" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a href="${base}impressum.html" class="b">Impressum</a></li>
-    <li class="b"><strong class="b">Haftung für Inhalte</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}impressum.html" class="s selected">Impressum</a></h2>
-    <ul id="submenu">
-      <li class="s"><a href="${base}agb.html" class="s">AGB</a></li>
-      <li class="s"><strong class="s">Haftung für Inhalte</strong></li>
-      <li class="s"><a href="${base}haftung-links.html" class="s">Haftung für Links</a></li>
-      <li class="s"><a href="${base}urheberrechte.html" class="s">Urheberrechte</a></li>
-      <li class="s"><a href="${base}datenschutz.html" class="s">Datenschutz</a></li>
-      <li class="s"><a href="${base}google-analytics.html" class="s">Google Analytics</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Sämtliche Inhalte unserer Internetseiten sind mit größtmöglicher Sorgfalt erstellt worden. Dennoch ist es uns nicht möglich, eine Gewähr dafür zu übernehmen, dass diese Inhalte richtig, vollständig und aktuell sind. Wir sind gemäß § 7 Abs. 1 TMG für die eigenen Inhalte auf unseren Internetseiten verantwortlich. Gemäß den §§ 8, 9 und 10 TMG besteht für uns allerdings keine Verpflichtung, dass wir Informationen von Dritten, die übermittelt oder gespeichert wurden, überwachen oder Umstände ausforschen müssten, die Hinweise auf nicht rechtmäßige Tätigkeiten ergeben. Davon nicht berührt, ist unsere Verpflichtung zur Sperrung oder Entfernung von Informationen, welche uns von den allgemeinen Gesetzen auferlegt wird. Wir haften allerdings insoweit erst in dem Moment, in dem wir von einer konkreten Verletzung von Rechten Kenntnis erlangen. Wenn wir von einer solchen Verletzung von Rechten Kenntnis erlangen, wird eine unverzügliche Entfernung der entsprechenden Inhalte erfolgen.</p>
-    <p><em>Quelle: <a href="http://www.flegl-rechtsanwaelte.de/rechtstipps/muster-impressum-gewerbliche-homepage">www.flegl-rechtsanwaelte.de</a></em></p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/haftung-links.jsp b/src/main/webapp/WEB-INF/views/haftung-links.jsp
deleted file mode 100644 (file)
index a02b164..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Haftung für Links" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a href="${base}impressum.html" class="b">Impressum</a></li>
-    <li class="b"><strong class="b">Haftung für Links</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}impressum.html" class="s selected">Impressum</a></h2>
-    <ul id="submenu">
-      <li class="s"><a href="${base}agb.html" class="s">AGB</a></li>
-      <li class="s"><a href="${base}haftung-inhalte.html" class="s">Haftung für Inhalte</a></li>
-      <li class="s"><strong class="s">Haftung für Links</strong></li>
-      <li class="s"><a href="${base}urheberrechte.html" class="s">Urheberrechte</a></li>
-      <li class="s"><a href="${base}datenschutz.html" class="s">Datenschutz</a></li>
-      <li class="s"><a href="${base}google-analytics.html" class="s">Google Analytics</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Unsere Internetseiten enthalten Links, die zu externen Internetseiten von Dritten führen. Auf die Inhalte dieser externen Seiten haben wir keine Einflussmöglichkeiten. Es ist uns daher nicht möglich, eine Gewähr für diese Inhalte zu übernehmen. Die Verantwortung dafür hat immer der jeweilige Anbieter/Betreiber der entsprechenden Internetseiten. Wir überprüfen die von uns verlinkten Internetseiten zum Zeitpunkt der Verlinkung auf einen möglichen Rechtsverstoß. Die Verlinkung kommt nur dann zustande, wenn ein rechtswidriger Inhalt zu diesem Zeitpunkt nicht erkennbar ist. Es kann uns jedoch, ohne einen konkreten Anhaltspunkt, nicht zugemutet werden, ständig die verlinkten Internetseiten inhaltlich zu kontrollieren. Wenn wir jedoch von einer Rechtsverletzung Kenntnis erlangen, werden wir den entsprechenden Link unverzüglich entfernen.</p>
-    <p><em>Quelle: <a href="http://www.flegl-rechtsanwaelte.de/rechtstipps/muster-impressum-gewerbliche-homepage">www.flegl-rechtsanwaelte.de</a></em></p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/impressum.jsp b/src/main/webapp/WEB-INF/views/impressum.jsp
deleted file mode 100644 (file)
index 0c7cdc1..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Impressum" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><strong class="b">Impressum</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><strong class="s">Impressum</strong></h2>
-    <ul id="submenu">
-      <li class="s"><a href="${base}agb.html" class="s">AGB</a></li>
-      <li class="s"><a href="${base}haftung-inhalte.html" class="s">Haftung für Inhalte</a></li>
-      <li class="s"><a href="${base}haftung-links.html" class="s">Haftung für Links</a></li>
-      <li class="s"><a href="${base}urheberrechte.html" class="s">Urheberrechte</a></li>
-      <li class="s"><a href="${base}datenschutz.html" class="s">Datenschutz</a></li>
-      <li class="s"><a href="${base}google-analytics.html" class="s">Google Analytics</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p><em>Angaben gemäß § 5 TMG:</em></p>
-    <p>
-      Kai Moritz<br />
-      juplo.de<br />
-      Zumsandestr. 29a<br />
-      48145 Münster
-    </p>
-    <p>Telefon: +49 (0) 176 20 50 47 47</p>
-    <p>E-Mail: <a href="mailto:kai@juplo.de">kai@juplo.de</a></p>
-    <p>Umsatzsteuer-Identifikationsnummer gemäß §27 a Umsatzsteuergesetz: DE 23 500 84 56</p>
-    <p>Aufsichtsbehörde: Stadt Münster</p>
-    <!-- http://www.e-recht24.de/impressum-generator.html -->
-    <h1>Contact</h1>
-    <p>
-      More contact-information (Facebook, Google+, ...) can be found on the
-      <a href="${base}contact.html" title="Show all contact-informations">contact-page</a>.
-    </p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-  <t:putAttribute name="footer" type="string">
-    <li class="f" id="copyright">© <strong>mo</strong> 2013</li>
-    <li class="f"><strong class="f">Impressum</strong></li>
-    <li class="f about"><a class="f" href="${base}about.html">About</a></li>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
deleted file mode 100644 (file)
index 6e84c61..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="NOMENU">
-  <t:putAttribute name="title" value="Branding" type="string" cascade="true"/>
-  <t:putAttribute name="header">
-    <h1 id="logo"><strong class="l">juplo</strong></h1>
-  </t:putAttribute>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><strong class="b">Home</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="contentcontainer" type="string">
-    <div id="content" class="main">
-      <div class="pack bg cf">
-        <div class="p left">
-          <h2>hibernate4-maven-plugin</h2>
-          <p><strong>Lorem ipsum</strong> dolor <a href="${base}projects/typo.html">sit amet</a>, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud <a href="${base}projects/html-experimente.html">exercitation</a> ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
-        </div>
-        <div class="p right">
-          <h2>fix-swf</h2>
-          <p>
-            Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-            eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-            ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-            aliquip ex ea commodo consequat.
-          </p>
-        </div>
-      </div>
-      <div class="single">
-        <h2>accelerator</h2>
-        <p>
-          Duis aute irure dolor in
-          reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-          pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-          culpa qui officia deserunt mollit anim id est laborum.
-        </p>
-      </div>
-      <div class="pack bg cf">
-        <div class="p right">
-          <h2>jquery.openx</h2>
-          <p>
-            Duis aute irure dolor in
-            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-            culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-        </div>
-        <div class="p left">
-          <h2>Regex-Lab</h2>
-          <p>
-            Excepteur sint occaecat cupidatat non proident, sunt in
-            culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-        </div>
-      </div>
-      <div class="pack cf">
-        <div class="p left">
-          <h2>jquery.openx</h2>
-          <p>
-            Duis aute irure dolor in
-            reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-            pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-            culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-        </div>
-        <div class="p right">
-          <h2>Regex-Lab</h2>
-          <p>
-            Excepteur sint occaecat cupidatat non proident, sunt in
-            culpa qui officia deserunt mollit anim id est laborum.
-          </p>
-        </div>
-      </div>
-    </div>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="string">
-    <aside class="m">
-      <div class="widget widget_recent_entries">
-        <h2 class="widgettitle">Recent Posts</h2>
-        <ul>
-          <li>
-            <a href="http://localhost/combining-jetty-maven-plugin-and-wro4j-maven-plugin-for-dynamic-reloading-of-less-resources/" title="Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources">Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources</a>
-          </li>
-          <li>
-            <a href="http://localhost/hibernate4-maven-plugin-1-0-3-released/" title="hibernate4-maven-plugin 1.0.3 released!">hibernate4-maven-plugin 1.0.3 released!</a>
-          </li>
-          <li>
-            <a href="http://localhost/log-out-from-wrong-account-with-maven-appengine-plugin/" title="Log out from wrong Account with maven-appengine-plugin">Log out from wrong Account with maven-appengine-plugin</a>
-          </li>
-          <li>
-            <a href="http://localhost/bidirectional-association-with-elementcollection/" title="Bidirectional Association with @ElementCollection">Bidirectional Association with @ElementCollection</a>
-          </li>
-          <li>
-            <a href="http://localhost/hibernate4-maven-plugin-1-0-2-release/" title="hibernate4-maven-plugin 1.0.2 released!">hibernate4-maven-plugin 1.0.2 released!</a>
-          </li>
-          <li>
-            <a href="http://localhost/hibernate4-maven-plugin-1-0-1-released/" title="hibernate4-maven-plugin 1.0.1 released!">hibernate4-maven-plugin 1.0.1 released!</a>
-          </li>
-          <li>
-            <a href="http://localhost/hibernate4-maven-plugin-1-0-released/" title="hibernate4-maven-plugin 1.0 released!">hibernate4-maven-plugin 1.0 released!</a>
-          </li>
-          <li>
-            <a href="http://localhost/hibernate4-maven-plugin-a-simple-plugin-for-generating-a-database-schema-from-hibernate-4-mapping-annotations/" title="hibernate4-maven-plugin">hibernate4-maven-plugin</a>
-          </li>
-        </ul>
-      </div>
-    </aside>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/projects.jsp b/src/main/webapp/WEB-INF/views/projects.jsp
deleted file mode 100644 (file)
index 42108a0..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Projects" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><strong class="b">Projects</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><strong class="m">Projects</strong></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><strong class="s">Projects</strong></h2>
-    <ul id="submenu">
-      <li class="s sub"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub"><a href="${base}projects/fix-swf.html" class="s">fix-swf</a></li>
-      <li class="s"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
-      <li class="s sub"><a href="#" class="s">accelerator</a></li>
-      <li class="s"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-    </ul>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf.jsp
deleted file mode 100644 (file)
index 66084a7..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Fix SWF" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-    <li class="b"><strong class="b">Fix SWF</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu">
-      <span class="s">Submenu for section</span>
-      <a class="s selected" href="${base}projects.html">Projects</a>
-    </h2>
-    <ul id="submenu" class="s">
-      <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub">
-        <strong class="s">fix-swf</strong>
-        <ul class="s active">
-          <li class="s"><a href="${base}projects/fix-swf/overview.html" class="s">Overview</a></li>
-          <li class="s"><a href="${base}projects/fix-swf/getting-started.html" class="s">Getting Started</a></li>
-          <li class="s"><a href="#" class="s">FAQ</a></li>
-          <li class="s"><a href="#" class="s">Documentation</a></li>
-        </ul>
-      </li>
-      <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s off"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
-      <li class="s sub off"><a href="#" class="s">accelerator</a></li>
-      <li class="s off"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" value="Nearly empty" type="string" cascade="true"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/getting-started.jsp
deleted file mode 100644 (file)
index 687acf2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Fix SWF - Getting Started" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-    <li class="b"><a class="b" href="${base}projects/fix-swf.html">Fix SWF</a></li>
-    <li class="b"><strong class="b">Getting Started</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu">
-      <span class="s">Submenu for section</span>
-      <a class="s selected" href="${base}projects.html">Projects</a>
-    </h2>
-    <ul id="submenu" class="s">
-      <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub">
-        <a href="${base}projects/fix-swf.html" class="s selected">fix-swf</a>
-        <ul class="s active">
-          <li class="s"><a href="${base}projects/fix-swf/overview.html" class="s">Overview</a></li>
-          <li class="s"><strong class="s">Getting Started</strong></li>
-          <li class="s"><a href="#" class="s">FAQ</a></li>
-          <li class="s"><a href="#" class="s">Documentation</a></li>
-        </ul>
-      </li>
-      <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s off"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
-      <li class="s sub off"><a href="#" class="s">accelerator</a></li>
-      <li class="s off"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-    </ul>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp b/src/main/webapp/WEB-INF/views/projects/fix-swf/overview.jsp
deleted file mode 100644 (file)
index 4608efb..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Fix SWF - Overview" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-    <li class="b"><a class="b" href="${base}projects/fix-swf.html">Fix SWF</a></li>
-    <li class="b"><strong class="b">Overview</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu">
-      <span class="s">Submenu for section</span>
-      <a class="s selected" href="${base}projects.html">Projects</a>
-    </h2>
-    <ul id="submenu" class="s">
-      <li class="s sub off"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub">
-        <a href="${base}projects/fix-swf.html" class="s selected">fix-swf</a>
-        <ul class="s active">
-          <li class="s"><strong class="s">Overview</strong></li>
-          <li class="s"><a href="${base}projects/fix-swf/getting-started.html" class="s">Getting Started</a></li>
-          <li class="s"><a href="#" class="s">FAQ</a></li>
-          <li class="s"><a href="#" class="s">Documentation</a></li>
-        </ul>
-      </li>
-      <li class="s off"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s off"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
-      <li class="s sub off"><a href="#" class="s">accelerator</a></li>
-      <li class="s off"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-    </ul>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp b/src/main/webapp/WEB-INF/views/projects/html-experimente.jsp
deleted file mode 100644 (file)
index 0ef6f2b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="HTML-Experimente" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-    <li class="b"><strong class="b">HTML-Experimente</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu">
-      <span class="s">Submenu for section</span>
-      <a class="s selected" href="${base}projects.html">Projects</a>
-    </h2>
-    <ul id="submenu" class="s active">
-      <li class="s sub"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub"><a href="${base}projects/fix-swf.html" class="s">fix-swf</a></li>
-      <li class="s"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s"><strong class="s">HTML-Experimente</strong></li>
-      <li class="s sub"><a href="#" class="s">accelerator</a></li>
-      <li class="s"><a href="${base}projects/typo.html" class="s">Typography</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" value="/WEB-INF/templates/test/experimente.jsp" type="template" cascade="true"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/projects/typo.jsp b/src/main/webapp/WEB-INF/views/projects/typo.jsp
deleted file mode 100644 (file)
index a551cef..0000000
+++ /dev/null
@@ -1,129 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Typo" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}projects.html">Projects</a></li>
-    <li class="b"><strong class="b">Typography</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m selected">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu">
-      <span class="s">Submenu for section</span>
-      <a class="s selected" href="${base}projects.html">Projects</a>
-    </h2>
-    <ul id="submenu" class="s active">
-      <li class="s sub"><a href="#" class="s">hibernate4-maven-plugin</a></li>
-      <li class="s sub"><a href="${base}projects/fix-swf.html" class="s">fix-swf</a></li>
-      <li class="s"><a href="#" class="s">jquery.openx</a></li>
-      <li class="s"><a href="${base}projects/html-experimente.html" class="s">HTML-Experimente</a></li>
-      <li class="s sub"><a href="#" class="s">accelerator</a></li>
-      <li class="s"><strong class="s">Typography</strong></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      Lorem ipsum dolor <a href="#da">sit amet</a>, consectetur adipisicing elit,
-      sed do eiusmod <strong>tempor incididunt</strong> ut labore et dolore
-      magna aliqua. Ut enim ad minim veniam, quis nostrud
-      <a href="#dort">exercitation</a> ullamco laboris nisi ut aliquip
-      <em>ex ea</em> commodo consequat. Duis aute irure dolor in reprehenderit
-      in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
-      <strong>Excepteur sint <em>occaecat</em> cupidatat non proident</strong>,
-      sunt in culpa qui officia deserunt mollit anim id est laborum.
-    </p>
-    <h2>Ein Link <a href="#link">im Titel</a></h2>
-    <p>Ein Link <a href="#link">im Text</a>.</p>
-    <h2>Normal / Italic / Bold / Bold+Italic</h2>
-    <ul>
-      <li>normal</li>
-      <li><em>italic</em></li>
-      <li><strong>bold</strong></li>
-      <li><strong><em>bold italic</em></strong></li>
-    </ul>
-    <p>
-      ÄäÖöÜüß@€¢
-      <strong>ÄäÖöÜüß@€¢</strong>
-      <em>ÄäÖöÜüß@€¢</em>
-      <strong><em>ÄäÖöÜüß@€¢</em></strong>
-    </p>
-    <h1>H1: Heading</h1>
-    <h2>H2: Heading</h2>
-    <h3>H3: Heading</h3>
-    <h4>H4: Heading</h4>
-    <h1>H1: Heading</h1>
-    <p>
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-      eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-      ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-      aliquip ex ea commodo consequat. Duis aute irure dolor in
-      reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-      pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-      culpa qui officia deserunt mollit anim id est laborum.
-    </p>
-    <h2>H2: Heading</h2>
-    <p>
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-      eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-      ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-      aliquip ex ea commodo consequat. Duis aute irure dolor in
-      reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-      pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-      culpa qui officia deserunt mollit anim id est laborum.
-    </p>
-    <h3>H3: Heading</h3>
-    <p>
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-      eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-      ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-      aliquip ex ea commodo consequat. Duis aute irure dolor in
-      reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-      pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-      culpa qui officia deserunt mollit anim id est laborum.
-    </p>
-    <h4>H4: Heading</h4>
-    <p>
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-      eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim
-      ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-      aliquip ex ea commodo consequat. Duis aute irure dolor in
-      reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-      pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-      culpa qui officia deserunt mollit anim id est laborum.
-    </p>
-    <h1>Preformatted code</h1>
-    <p>
-      <em>Juplo Branding</em> uses
-      <a href="http://google-code-prettify.googlecode.com/svn/trunk/README.html" title="Visit prettify's README">google-code-prettify</a> for automatic
-      syntax highlighting.
-    </p>
-    <pre class="prettyprint linenums"><code class="language-xml">
-&lt;plugin&gt;
-  &lt;groupId&gt;ro.isdc.wro4j&lt;/groupId&gt;
-  &lt;artifactId&gt;wro4j-maven-plugin&lt;/artifactId&gt;
-  &lt;version&gt;${wro4j.version}&lt;/version&gt;
-  &lt;configuration&gt;
-    &lt;wroManagerFactory&gt;ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory&lt;/wroManagerFactory&gt;
-    &lt;cssDestinationFolder&gt;${project.build.directory}/${project.build.finalName}/css/&lt;/cssDestinationFolder&gt;
-  &lt;/configuration&gt;
-  &lt;executions&gt;
-    &lt;execution&gt;
-      &lt;phase&gt;package&lt;/phase&gt;
-      &lt;goals&gt;
-        &lt;goal&gt;run&lt;/goal&gt;
-      &lt;/goals&gt;
-    &lt;/execution&gt;
-  &lt;/executions&gt;
-&lt;/plugin&gt;
-</code></pre>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/references.jsp b/src/main/webapp/WEB-INF/views/references.jsp
deleted file mode 100644 (file)
index 33e2074..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="References" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}about.html">About</a></li>
-    <li class="b"><strong class="b">References</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}about.html" class="s">About</a></h2>
-    <ul id="submenu">
-      <li class="s sub off"><a href="${base}expertise.html" class="s">Expertise</a></li>
-      <li class="s sub">
-        <strong class="s">References</strong>
-        <ul class="s active">
-          <li class="s sub"><span href="${base}references/coolibri.html" class="s">coolibri.de</span></li>
-          <li class="s"><span href="${base}references/hibernate4-maven-plugin.html" class="s">hibernate4-maven-plugin</span></li>
-          <li class="s sub"><span href="${base}.html" class="s"></span></li>
-          <li class="s sub"><span href="${base}.html" class="s"></span></li>
-        </ul>
-      </li>
-      <li class="s off"><a href="${base}contact.html" class="s">Contact</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" value="/WEB-INF/templates/wip.jsp" type="template" cascade="true"/>
-  <t:putAttribute name="marginalcontent" type="string" value=""/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/basis-layout.jsp b/src/main/webapp/WEB-INF/views/test/basis-layout.jsp
deleted file mode 100644 (file)
index fdccc39..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Nur das Basis-Layout" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      In diese Seite ist nur das Basis-Layout eingebunden
-      (<code>/css/base.css</code>).
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/breadcrumb.jsp b/src/main/webapp/WEB-INF/views/test/breadcrumb.jsp
deleted file mode 100644 (file)
index 786c773..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Seite mit sehr langem Breadcrumb" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb" type="string">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a class="b" href="${base}blog.html">Blog</a></li>
-    <li class="b"><strong class="b">Combining jetty-maven-plugin and wro4j-maven-plugin for Dynamic Reloading of LESS-Resources</strong></li>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/druck-layout.jsp b/src/main/webapp/WEB-INF/views/test/druck-layout.jsp
deleted file mode 100644 (file)
index 822333d..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Die für den Ausdruck angepasste Ansicht" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="${base}css/print.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      In diese Seite ist nur das Basis-Layout eingebunden
-      (<code>/css/base.css</code>).
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-    <t:insertTemplate template="/WEB-INF/templates/maincontent.jsp"/>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/error.jsp b/src/main/webapp/WEB-INF/views/test/error.jsp
deleted file mode 100644 (file)
index 4bc0ebb..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Diese Seite erzeugt einen Fehler!" type="string" cascade="true"/>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <% Integer.parseInt("foo"); //throws an exception %>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü-aber-marginalinhalt.jsp b/src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü-aber-marginalinhalt.jsp
deleted file mode 100644 (file)
index 462f207..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Fast leere Seite ohne Menü, aber mit Marginalinhalt" type="string" cascade="true"/>
-  <t:putAttribute name="contentclass" value="nomenu" type="string"/>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Diese Seite ist fast leer...</p>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü.jsp b/src/main/webapp/WEB-INF/views/test/fast-leer-kein-menü.jsp
deleted file mode 100644 (file)
index 28a10a5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Fast leere Seite ohne Menü" type="string" cascade="true"/>
-  <t:putAttribute name="contentclass" value="nomenu" type="string"/>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Diese Seite ist fast leer...</p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" value="" type="string"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/fast-leer-mit-menü-und-marginalinhalt.jsp b/src/main/webapp/WEB-INF/views/test/fast-leer-mit-menü-und-marginalinhalt.jsp
deleted file mode 100644 (file)
index 742b17b..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Fast leere Seite mit Menü und Marginalinhalt" type="string" cascade="true"/>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Diese Seite ist fast leer...</p>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/fast-leer-mit-menü.jsp b/src/main/webapp/WEB-INF/views/test/fast-leer-mit-menü.jsp
deleted file mode 100644 (file)
index 9bfae15..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Fast leere Seite mit Menü" type="string" cascade="true"/>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Diese Seite ist fast leer...</p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" value="" type="string"/>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/formulare.jsp b/src/main/webapp/WEB-INF/views/test/formulare.jsp
deleted file mode 100644 (file)
index 12f487e..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Formulare" type="string" cascade="true"/>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <form class="form" action="#" method="get">
-      <h2 class="f">Anzeigetext</h2>
-      <div class="f textarea">
-        <label class="f info" for="textarea_01">Geben Sie hier Ihren Anzeigentext ein.</label>
-        <textarea class="f error" id="textarea_01" cols="50" rows="10">Eingegebener Text</textarea>
-        <span class="f error"><span class="e">&lt; </span><strong class="e">Fehler:</strong> Es wurde kein Text für die Anzeige eingegeben!</span>
-      </div>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Textformatierung</h2>
-      <fieldset class="f radiobutton cf">
-        <legend class="f info">
-          Die zusätzlichen Gestaltungsoptionen sind nur für das Magazin wählbar.<br />
-          Online erscheint die Anzeige als normaler Fließtext.
-        </legend>
-        <hr class="f" />
-        <div class="col2">
-          <div class="f">
-            <input class="f" id="radio_tbox_01" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_01">normaler Fließtext</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_02" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_02">Text zentriert</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_03" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_03">Text fett, Negativdruck</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_04" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_04">Text fett</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_05" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_05">Text fett und rot</label>
-          </div>
-        </div>
-        <div class="col2">
-          <div class="f">
-            <input class="f" id="radio_tbox_06" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_06">Text fett, Anzeige blau hinterlegt</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_07" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_07">Text fett, Anzeige gelb hinterlegt</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_08" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_08">Anzeige schwarz eingerahmt</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_09" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_09">Anzeige rot eingerahmt</label>
-          </div>
-        </div>
-      </fieldset>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Einspaltige Radiobuttons...</h2>
-      <fieldset class="f radiobutton">
-        <div class="f">
-          <input class="f" id="radio_tbox_b01" type="radio" name="radio_tbox" />
-          <label class="f" for="radio_tbox_b01">Dies ist eine etwas länglichere Beschreibung der auswählbaren Option</label>
-        </div>
-        <div class="f">
-          <input class="f" id="radio_tbox_b02" type="radio" name="radio_tbox" />
-          <label class="f" for="radio_tbox_b02">Option X</label>
-        </div>
-        <div class="f">
-          <input class="f" id="radio_tbox_b03" type="radio" name="radio_tbox" />
-          <label class="f" for="radio_tbox_b03">Dies ist eine sehr, sehr lange Beschreibung der auswählbaren Option - so lang, dass sie am Ende hoffentlich umbricht...</label>
-        </div>
-      </fieldset>
-      <hr class="f" />
-      <div class="f submit">
-        <input class="f" type="submit" value="&gt; zur Übersicht" />
-        <input class="f left" type="submit" value="&lt; zurück" />
-        <input class="f" type="submit" value="&gt; weiter" />
-      </div>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Bild</h2>
-      <fieldset class="f checkbox">
-        <legend class="f">
-          Du kannst Deiner Anzeige ein Bild hinzufügen.
-          Das Bild erscheint nur online.
-          Im Magazin erscheint die Kleinanzeige mit Hinweis auf das Onlinebild.
-        </legend>
-        <hr class="f" />
-        <div class="f">
-          <input class="f" id="checkbox_tbox_01" type="checkbox" name="checkbox_tbox" />
-          <label class="f" for="checkbox_tbox_01">Ich möchte ein Bild zu dieser Anzeige hinzufügen</label>
-        </div>
-        <div class="f">
-          <input class="f" id="checkbox_tbox_02" type="checkbox" name="checkbox_tbox" />
-          <label class="f" for="checkbox_tbox_02">Ich habe die AGB für das Hochladen von Bildern gelesen und akzeptiere diese</label>
-        </div>
-      </fieldset>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Alleinstehende Checkbox</h2>
-      <div class="f checkbox">
-        <input class="f" id="checkbox_tbox_03" type="checkbox" name="checkbox_tbox" />
-        <label class="f" for="checkbox_tbox_03">Ich möchte ein Bild zu dieser Anzeige hinzufügen</label>
-      </div>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Kundendaten</h2>
-      <p class="f required">
-        <strong class="r">Pflichtfelder</strong> sind mit einem
-        <strong class="r symbol">*</strong> markiert.
-      </p>
-      <div class="f text required">
-        <label for="text_tbox_01" class="f"><span class="required">* </span>Nachname</label>
-        <input class="f" id="text_tbox_01" type="text" value="Mustermann" />
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_02" class="f">Vorname</label>
-        <input class="f" id="text_tbox_02" type="text" value="Max" />
-      </div>
-      <div class="f select required">
-        <label for="text_tbox_03" class="f"><span class="required">* </span>Ort</label>
-        <select class="f" id="text_tbox_03">
-          <option>Dortmund</option>
-          <option>Bochum</option>
-          <option>Essen</option>
-          <option>Mönchengladbach</option>
-          <option>Oberhausen</option>
-          <option>Castrop-Rauxel</option>
-          <option>Düsseldorf</option>
-        </select>
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_04" class="f"><span class="required">* </span>Straße/Hausnr.</label>
-        <input class="f error" id="text_tbox_04" type="text" value="" />
-        <span class="f error"><span class="e">&lt; </span><strong class="e">Fehler:</strong> Dies ist ein Pflichtfeld!</span>
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_05" class="f"><span class="required">* </span>Postleitzahl</label>
-        <input class="f" id="text_tbox_05" type="text" value="" />
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_06" class="f">Telefon</label>
-        <input class="f" id="text_tbox_06" type="text" value="" />
-      </div>
-      <hr class="f" />
-      <div class="f submit">
-        <input class="f" type="submit" value="&gt; weiter" />
-      </div>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Anzeige regionalisieren</h2>
-      <p class="f">
-        Indem Du Deine Kleinanzeige einer Stadt zuordnest, können Interessenten
-        diese online leichter finden, wenn sie nur nach Kleinanzeigen aus
-        bestimmten Städten suchen.
-        Du kannst auch keine Stadt zuordnen, dann wird die Kleinanzeige von
-        diesen Interessenten aber auch nicht gefunden.
-      </p>
-      <hr class="f" />
-      <div class="f text">
-        <label class="f" for="city">Stadt</label>
-        <input id="city" type="text" class="f" />
-        <p class="f info">
-          Das Feld leer lassen, wenn die Anzeige nicht regionalisiert werden soll.
-        </p>
-      </div>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Ein Passwort-Eingabe-Feld</h2>
-      <div class="f text required">
-        <label for="text_tbox_05" class="f"><span class="required">* </span>Passwort</label>
-        <input class="f" id="text_tbox_05" type="password" value="t" />
-      </div>
-    </form>
-    <form class="form" action="#" method="get">
-      <h2 class="f">Lade das Bild hoch</h2>
-      <p class="f info">
-        Du kannst ein Bild im JPEG- oder PNG-Format hochladen.
-        Das Bild darf nicht größer als 8 MByte sein.
-      </p>
-      <div class="f file required">
-        <label for="file_tbox_01" class="f"><span class="required">* </span>Bild</label>
-        <input class="f" id="file_tbox_01" type="file" />
-      </div>
-      <hr class="f" />
-      <div class="f submit">
-        <input class="f" type="submit" value="&gt; Doch kein Bild" />
-        <input class="f" type="submit" value="&gt; Bild hochladen" />
-      </div>
-    </form>
-    <div class="form">
-      <h2 class="f">Antworten</h2>
-      <p class="f required">
-        <strong class="r">Pflichtfelder</strong> sind mit einem
-        <strong class="r symbol">*</strong> markiert.
-      </p>
-      <div class="f text required">
-        <label class="f" for="replyTo"><span class="required">*</span> Antwort-Adresse</label>
-        <input id="replyTo" name="replyTo" class="f" tabindex="1" type="text" value=""/>
-      </div>
-      <div class="f text required">
-        <label class="f" for="replyTo"><span class="required">*</span> Adresse wiederholen</label>
-        <input id="replyToRepeated" name="replyToRepeated" class="f" tabindex="2" type="text" value=""/>
-      </div>
-      <div class="f text required">
-        <label class="f" for="subject"><span class="required">*</span> Betreff</label>
-        <input id="subject" name="subject" class="f" tabindex="3" type="text" value=""/>
-      </div>
-      <div class="f textarea required">
-        <label class="f" for="text"><span class="required">*</span> Nachricht</label>
-        <textarea id="text" name="text" class="f" tabindex="4" rows="15" cols="20"></textarea>
-      </div>
-      <div class="f checkbox">
-        <input id="attachment1" name="attachment" class="f" tabindex="4" type="checkbox" value="true" checked="checked"/><input type="hidden" name="_attachment" value="on"/>
-        <label class="f" for="attachment">Ich möchte eine Datei an die E-Mail anhängen.</label>
-      </div>
-      <div class="f checkbox">
-        <input id="copy1" name="copy" class="f" tabindex="5" type="checkbox" value="true" checked="checked"/><input type="hidden" name="_copy" value="on"/>
-        <label class="f" for="copy">Ich möchte eine Kopie der Nachricht zugesendet bekommen.</label>
-      </div>
-    </div>
-    <div class="form cf">
-      <div class="col2 left">
-        <h2 class="f">Weiter mit Anmeldung</h2>
-        <div class="f text">
-          <label class="f" for="username">Benutzername</label>
-          <input class="f" name="username" id="username" type="text" tabindex="6" />
-        </div>
-        <div class="f text">
-          <label class="f" for="password">Passwort</label>
-          <input class="f" name="password" id="password" type="password" tabindex="7" />
-        </div>
-      </div>
-      <div class="col2 right">
-        <h2 class="f">Weiter ohne Anmeldung</h2>
-        <!-- <a href="/kleinanzeigen/37431/lust+.html" title="Zu schwer? Hier klicken um das Bild zu wechseln!"><img src="/img/captcha.jpg" alt="Captcha" width="120" height="60" /></a> -->
-        <div class="f captcha cf">
-          <span class="f">Was steht da?</span>
-          <img class="f" src="/img/captcha.jpg" alt="Captcha" width="120" height="60" />
-        </div>
-        <div class="f text">
-          <label class="f" for="captcha">Lösung</label>
-          <input class="f" name="captcha" id="captcha" type="text" tabindex="8" />
-        </div>
-      </div>
-    </div>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/kein-layout.jsp b/src/main/webapp/WEB-INF/views/test/kein-layout.jsp
deleted file mode 100644 (file)
index dca3c26..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Nur das Basis-Layout" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string" value=""/>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      In diese Seite ist nur das Basis-Layout eingebunden
-      (<code>/css/base.css</code>).
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/phone.jsp b/src/main/webapp/WEB-INF/views/test/phone.jsp
deleted file mode 100644 (file)
index 436a727..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Layout für Smartphones" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="${base}css/phone.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      Diese Seite bindet alle Styles ein, die für Smartphones eingebunden
-      werden (<code>/css/base.css</code> und <code>/css/phone.css</code>).
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/seitenaufteilung.jsp b/src/main/webapp/WEB-INF/views/test/seitenaufteilung.jsp
deleted file mode 100644 (file)
index 7ee9a51..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Nur das Basis-Layout und die Seitenaufteilung" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="/css/seitenaufteilung.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      In diese Seite sind nur das Basis-Layout (<code>/css/base.css</code>)
-      und die Seitenaufteilung (<code>/less/screen/layout.less</code>)
-      eingebunden.
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/seitenkopf.jsp b/src/main/webapp/WEB-INF/views/test/seitenkopf.jsp
deleted file mode 100644 (file)
index ec76d75..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Nur das Basis-Layout und der Seitenkopf" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="/css/seitenkopf.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      In diese Seite sind nur das Basis-Layout (<code>/css/base.css</code>)
-      und der Seitenkopf (<code>/less/screen/head.less</code>)
-      eingebunden.
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/symbole.jsp b/src/main/webapp/WEB-INF/views/test/symbole.jsp
deleted file mode 100644 (file)
index 3dd1571..0000000
+++ /dev/null
@@ -1,404 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Symbol-Font" type="string" cascade="true"/>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <h2>100%</h2>
-    <div class="symbols">
-      <span class="e600">&#xe600;</span>
-      <span class="e601">&#xe601;</span>
-      <span class="e602">&#xe602;</span>
-      <span class="e603">&#xe603;</span>
-      <span class="e604">&#xe604;</span>
-      <span class="e605">&#xe605;</span>
-      <span class="e606">&#xe606;</span>
-      <span class="e607">&#xe607;</span>
-      <span class="e608">&#xe608;</span>
-      <span class="e609">&#xe609;</span>
-      <span class="e60a">&#xe60a;</span>
-      <span class="e60b">&#xe60b;</span>
-      <span class="e60c">&#xe60c;</span>
-      <span class="e60d">&#xe60d;</span>
-      <span class="e60e">&#xe60e;</span>
-      <span class="e60f">&#xe60f;</span>
-      <span class="e610">&#xe610;</span>
-      <span class="e611">&#xe611;</span>
-      <span class="e612">&#xe612;</span>
-      <span class="e613">&#xe613;</span>
-      <span class="e614">&#xe614;</span>
-      <span class="e615">&#xe615;</span>
-      <span class="e616">&#xe616;</span>
-      <span class="e617">&#xe617;</span>
-      <span class="e618">&#xe618;</span>
-      <span class="e619">&#xe619;</span>
-      <span class="e61a">&#xe61a;</span>
-      <span class="e61b">&#xe61b;</span>
-      <span class="e61c">&#xe61c;</span>
-      <span class="e61d">&#xe61d;</span>
-      <span class="e61e">&#xe61e;</span>
-      <span class="e61f">&#xe61f;</span>
-      <span class="e620">&#xe620;</span>
-      <span class="e621">&#xe621;</span>
-      <span class="e622">&#xe622;</span>
-      <span class="e623">&#xe623;</span>
-      <span class="e624">&#xe624;</span>
-      <span class="e625">&#xe625;</span>
-      <span class="e626">&#xe626;</span>
-      <span class="e627">&#xe627;</span>
-      <span class="e628">&#xe628;</span>
-      <span class="e629">&#xe629;</span>
-      <span class="e62a">&#xe62a;</span>
-      <span class="e62b">&#xe62b;</span>
-      <span class="e62c">&#xe62c;</span>
-      <span class="e62d">&#xe62d;</span>
-      <span class="e62e">&#xe62e;</span>
-      <span class="e62f">&#xe62f;</span>
-      <span class="e630">&#xe630;</span>
-      <span class="e631">&#xe631;</span>
-      <span class="e632">&#xe632;</span>
-      <span class="e633">&#xe633;</span>
-      <span class="e634">&#xe634;</span>
-      <span class="e635">&#xe635;</span>
-      <span class="e636">&#xe636;</span>
-      <span class="e637">&#xe637;</span>
-      <span class="e638">&#xe638;</span>
-      <span class="e639">&#xe639;</span>
-      <span class="e63a">&#xe63a;</span>
-      <span class="e63b">&#xe63b;</span>
-      <span class="e63c">&#xe63c;</span>
-      <span class="e63d">&#xe63d;</span>
-      <span class="e63e">&#xe63e;</span>
-      <span class="e63f">&#xe63f;</span>
-      <span class="e640">&#xe640;</span>
-      <span class="e641">&#xe641;</span>
-      <span class="e642">&#xe642;</span>
-      <span class="e643">&#xe643;</span>
-      <span class="e644">&#xe644;</span>
-      <span class="e645">&#xe645;</span>
-      <span class="e646">&#xe646;</span>
-      <span class="e647">&#xe647;</span>
-      <span class="e648">&#xe648;</span>
-      <span class="e649">&#xe649;</span>
-      <span class="e64a">&#xe64a;</span>
-      <span class="e64b">&#xe64b;</span>
-    </div>
-    <h2>200%</h2>
-    <div class="symbols" style="font-size: 200%; line-height: 1.5em">
-      <span class="e600">&#xe600;</span>
-      <span class="e601">&#xe601;</span>
-      <span class="e602">&#xe602;</span>
-      <span class="e603">&#xe603;</span>
-      <span class="e604">&#xe604;</span>
-      <span class="e605">&#xe605;</span>
-      <span class="e606">&#xe606;</span>
-      <span class="e607">&#xe607;</span>
-      <span class="e608">&#xe608;</span>
-      <span class="e609">&#xe609;</span>
-      <span class="e60a">&#xe60a;</span>
-      <span class="e60b">&#xe60b;</span>
-      <span class="e60c">&#xe60c;</span>
-      <span class="e60d">&#xe60d;</span>
-      <span class="e60e">&#xe60e;</span>
-      <span class="e60f">&#xe60f;</span>
-      <span class="e610">&#xe610;</span>
-      <span class="e611">&#xe611;</span>
-      <span class="e612">&#xe612;</span>
-      <span class="e613">&#xe613;</span>
-      <span class="e614">&#xe614;</span>
-      <span class="e615">&#xe615;</span>
-      <span class="e616">&#xe616;</span>
-      <span class="e617">&#xe617;</span>
-      <span class="e618">&#xe618;</span>
-      <span class="e619">&#xe619;</span>
-      <span class="e61a">&#xe61a;</span>
-      <span class="e61b">&#xe61b;</span>
-      <span class="e61c">&#xe61c;</span>
-      <span class="e61d">&#xe61d;</span>
-      <span class="e61e">&#xe61e;</span>
-      <span class="e61f">&#xe61f;</span>
-      <span class="e620">&#xe620;</span>
-      <span class="e621">&#xe621;</span>
-      <span class="e622">&#xe622;</span>
-      <span class="e623">&#xe623;</span>
-      <span class="e624">&#xe624;</span>
-      <span class="e625">&#xe625;</span>
-      <span class="e626">&#xe626;</span>
-      <span class="e627">&#xe627;</span>
-      <span class="e628">&#xe628;</span>
-      <span class="e629">&#xe629;</span>
-      <span class="e62a">&#xe62a;</span>
-      <span class="e62b">&#xe62b;</span>
-      <span class="e62c">&#xe62c;</span>
-      <span class="e62d">&#xe62d;</span>
-      <span class="e62e">&#xe62e;</span>
-      <span class="e62f">&#xe62f;</span>
-      <span class="e630">&#xe630;</span>
-      <span class="e631">&#xe631;</span>
-      <span class="e632">&#xe632;</span>
-      <span class="e633">&#xe633;</span>
-      <span class="e634">&#xe634;</span>
-      <span class="e635">&#xe635;</span>
-      <span class="e636">&#xe636;</span>
-      <span class="e637">&#xe637;</span>
-      <span class="e638">&#xe638;</span>
-      <span class="e639">&#xe639;</span>
-      <span class="e63a">&#xe63a;</span>
-      <span class="e63b">&#xe63b;</span>
-      <span class="e63c">&#xe63c;</span>
-      <span class="e63d">&#xe63d;</span>
-      <span class="e63e">&#xe63e;</span>
-      <span class="e63f">&#xe63f;</span>
-      <span class="e640">&#xe640;</span>
-      <span class="e641">&#xe641;</span>
-      <span class="e642">&#xe642;</span>
-      <span class="e643">&#xe643;</span>
-      <span class="e644">&#xe644;</span>
-      <span class="e645">&#xe645;</span>
-      <span class="e646">&#xe646;</span>
-      <span class="e647">&#xe647;</span>
-      <span class="e648">&#xe648;</span>
-      <span class="e649">&#xe649;</span>
-      <span class="e64a">&#xe64a;</span>
-      <span class="e64b">&#xe64b;</span>
-    </div>
-    <h2>300%</h2>
-    <div class="symbols" style="font-size: 300%; line-height: 1.5em">
-      <span class="e600">&#xe600;</span>
-      <span class="e601">&#xe601;</span>
-      <span class="e602">&#xe602;</span>
-      <span class="e603">&#xe603;</span>
-      <span class="e604">&#xe604;</span>
-      <span class="e605">&#xe605;</span>
-      <span class="e606">&#xe606;</span>
-      <span class="e607">&#xe607;</span>
-      <span class="e608">&#xe608;</span>
-      <span class="e609">&#xe609;</span>
-      <span class="e60a">&#xe60a;</span>
-      <span class="e60b">&#xe60b;</span>
-      <span class="e60c">&#xe60c;</span>
-      <span class="e60d">&#xe60d;</span>
-      <span class="e60e">&#xe60e;</span>
-      <span class="e60f">&#xe60f;</span>
-      <span class="e610">&#xe610;</span>
-      <span class="e611">&#xe611;</span>
-      <span class="e612">&#xe612;</span>
-      <span class="e613">&#xe613;</span>
-      <span class="e614">&#xe614;</span>
-      <span class="e615">&#xe615;</span>
-      <span class="e616">&#xe616;</span>
-      <span class="e617">&#xe617;</span>
-      <span class="e618">&#xe618;</span>
-      <span class="e619">&#xe619;</span>
-      <span class="e61a">&#xe61a;</span>
-      <span class="e61b">&#xe61b;</span>
-      <span class="e61c">&#xe61c;</span>
-      <span class="e61d">&#xe61d;</span>
-      <span class="e61e">&#xe61e;</span>
-      <span class="e61f">&#xe61f;</span>
-      <span class="e620">&#xe620;</span>
-      <span class="e621">&#xe621;</span>
-      <span class="e622">&#xe622;</span>
-      <span class="e623">&#xe623;</span>
-      <span class="e624">&#xe624;</span>
-      <span class="e625">&#xe625;</span>
-      <span class="e626">&#xe626;</span>
-      <span class="e627">&#xe627;</span>
-      <span class="e628">&#xe628;</span>
-      <span class="e629">&#xe629;</span>
-      <span class="e62a">&#xe62a;</span>
-      <span class="e62b">&#xe62b;</span>
-      <span class="e62c">&#xe62c;</span>
-      <span class="e62d">&#xe62d;</span>
-      <span class="e62e">&#xe62e;</span>
-      <span class="e62f">&#xe62f;</span>
-      <span class="e630">&#xe630;</span>
-      <span class="e631">&#xe631;</span>
-      <span class="e632">&#xe632;</span>
-      <span class="e633">&#xe633;</span>
-      <span class="e634">&#xe634;</span>
-      <span class="e635">&#xe635;</span>
-      <span class="e636">&#xe636;</span>
-      <span class="e637">&#xe637;</span>
-      <span class="e638">&#xe638;</span>
-      <span class="e639">&#xe639;</span>
-      <span class="e63a">&#xe63a;</span>
-      <span class="e63b">&#xe63b;</span>
-      <span class="e63c">&#xe63c;</span>
-      <span class="e63d">&#xe63d;</span>
-      <span class="e63e">&#xe63e;</span>
-      <span class="e63f">&#xe63f;</span>
-      <span class="e640">&#xe640;</span>
-      <span class="e641">&#xe641;</span>
-      <span class="e642">&#xe642;</span>
-      <span class="e643">&#xe643;</span>
-      <span class="e644">&#xe644;</span>
-      <span class="e645">&#xe645;</span>
-      <span class="e646">&#xe646;</span>
-      <span class="e647">&#xe647;</span>
-      <span class="e648">&#xe648;</span>
-      <span class="e649">&#xe649;</span>
-      <span class="e64a">&#xe64a;</span>
-      <span class="e64b">&#xe64b;</span>
-    </div>
-    <h2>400%</h2>
-    <div class="symbols" style="font-size: 400%; line-height: 1.5em">
-      <span class="e600">&#xe600;</span>
-      <span class="e601">&#xe601;</span>
-      <span class="e602">&#xe602;</span>
-      <span class="e603">&#xe603;</span>
-      <span class="e604">&#xe604;</span>
-      <span class="e605">&#xe605;</span>
-      <span class="e606">&#xe606;</span>
-      <span class="e607">&#xe607;</span>
-      <span class="e608">&#xe608;</span>
-      <span class="e609">&#xe609;</span>
-      <span class="e60a">&#xe60a;</span>
-      <span class="e60b">&#xe60b;</span>
-      <span class="e60c">&#xe60c;</span>
-      <span class="e60d">&#xe60d;</span>
-      <span class="e60e">&#xe60e;</span>
-      <span class="e60f">&#xe60f;</span>
-      <span class="e610">&#xe610;</span>
-      <span class="e611">&#xe611;</span>
-      <span class="e612">&#xe612;</span>
-      <span class="e613">&#xe613;</span>
-      <span class="e614">&#xe614;</span>
-      <span class="e615">&#xe615;</span>
-      <span class="e616">&#xe616;</span>
-      <span class="e617">&#xe617;</span>
-      <span class="e618">&#xe618;</span>
-      <span class="e619">&#xe619;</span>
-      <span class="e61a">&#xe61a;</span>
-      <span class="e61b">&#xe61b;</span>
-      <span class="e61c">&#xe61c;</span>
-      <span class="e61d">&#xe61d;</span>
-      <span class="e61e">&#xe61e;</span>
-      <span class="e61f">&#xe61f;</span>
-      <span class="e620">&#xe620;</span>
-      <span class="e621">&#xe621;</span>
-      <span class="e622">&#xe622;</span>
-      <span class="e623">&#xe623;</span>
-      <span class="e624">&#xe624;</span>
-      <span class="e625">&#xe625;</span>
-      <span class="e626">&#xe626;</span>
-      <span class="e627">&#xe627;</span>
-      <span class="e628">&#xe628;</span>
-      <span class="e629">&#xe629;</span>
-      <span class="e62a">&#xe62a;</span>
-      <span class="e62b">&#xe62b;</span>
-      <span class="e62c">&#xe62c;</span>
-      <span class="e62d">&#xe62d;</span>
-      <span class="e62e">&#xe62e;</span>
-      <span class="e62f">&#xe62f;</span>
-      <span class="e630">&#xe630;</span>
-      <span class="e631">&#xe631;</span>
-      <span class="e632">&#xe632;</span>
-      <span class="e633">&#xe633;</span>
-      <span class="e634">&#xe634;</span>
-      <span class="e635">&#xe635;</span>
-      <span class="e636">&#xe636;</span>
-      <span class="e637">&#xe637;</span>
-      <span class="e638">&#xe638;</span>
-      <span class="e639">&#xe639;</span>
-      <span class="e63a">&#xe63a;</span>
-      <span class="e63b">&#xe63b;</span>
-      <span class="e63c">&#xe63c;</span>
-      <span class="e63d">&#xe63d;</span>
-      <span class="e63e">&#xe63e;</span>
-      <span class="e63f">&#xe63f;</span>
-      <span class="e640">&#xe640;</span>
-      <span class="e641">&#xe641;</span>
-      <span class="e642">&#xe642;</span>
-      <span class="e643">&#xe643;</span>
-      <span class="e644">&#xe644;</span>
-      <span class="e645">&#xe645;</span>
-      <span class="e646">&#xe646;</span>
-      <span class="e647">&#xe647;</span>
-      <span class="e648">&#xe648;</span>
-      <span class="e649">&#xe649;</span>
-      <span class="e64a">&#xe64a;</span>
-      <span class="e64b">&#xe64b;</span>
-    </div>
-    <h2>500%</h2>
-    <div class="symbols" style="font-size: 500%; line-height: 1.5em">
-      <span class="e600">&#xe600;</span>
-      <span class="e601">&#xe601;</span>
-      <span class="e602">&#xe602;</span>
-      <span class="e603">&#xe603;</span>
-      <span class="e604">&#xe604;</span>
-      <span class="e605">&#xe605;</span>
-      <span class="e606">&#xe606;</span>
-      <span class="e607">&#xe607;</span>
-      <span class="e608">&#xe608;</span>
-      <span class="e609">&#xe609;</span>
-      <span class="e60a">&#xe60a;</span>
-      <span class="e60b">&#xe60b;</span>
-      <span class="e60c">&#xe60c;</span>
-      <span class="e60d">&#xe60d;</span>
-      <span class="e60e">&#xe60e;</span>
-      <span class="e60f">&#xe60f;</span>
-      <span class="e610">&#xe610;</span>
-      <span class="e611">&#xe611;</span>
-      <span class="e612">&#xe612;</span>
-      <span class="e613">&#xe613;</span>
-      <span class="e614">&#xe614;</span>
-      <span class="e615">&#xe615;</span>
-      <span class="e616">&#xe616;</span>
-      <span class="e617">&#xe617;</span>
-      <span class="e618">&#xe618;</span>
-      <span class="e619">&#xe619;</span>
-      <span class="e61a">&#xe61a;</span>
-      <span class="e61b">&#xe61b;</span>
-      <span class="e61c">&#xe61c;</span>
-      <span class="e61d">&#xe61d;</span>
-      <span class="e61e">&#xe61e;</span>
-      <span class="e61f">&#xe61f;</span>
-      <span class="e620">&#xe620;</span>
-      <span class="e621">&#xe621;</span>
-      <span class="e622">&#xe622;</span>
-      <span class="e623">&#xe623;</span>
-      <span class="e624">&#xe624;</span>
-      <span class="e625">&#xe625;</span>
-      <span class="e626">&#xe626;</span>
-      <span class="e627">&#xe627;</span>
-      <span class="e628">&#xe628;</span>
-      <span class="e629">&#xe629;</span>
-      <span class="e62a">&#xe62a;</span>
-      <span class="e62b">&#xe62b;</span>
-      <span class="e62c">&#xe62c;</span>
-      <span class="e62d">&#xe62d;</span>
-      <span class="e62e">&#xe62e;</span>
-      <span class="e62f">&#xe62f;</span>
-      <span class="e630">&#xe630;</span>
-      <span class="e631">&#xe631;</span>
-      <span class="e632">&#xe632;</span>
-      <span class="e633">&#xe633;</span>
-      <span class="e634">&#xe634;</span>
-      <span class="e635">&#xe635;</span>
-      <span class="e636">&#xe636;</span>
-      <span class="e637">&#xe637;</span>
-      <span class="e638">&#xe638;</span>
-      <span class="e639">&#xe639;</span>
-      <span class="e63a">&#xe63a;</span>
-      <span class="e63b">&#xe63b;</span>
-      <span class="e63c">&#xe63c;</span>
-      <span class="e63d">&#xe63d;</span>
-      <span class="e63e">&#xe63e;</span>
-      <span class="e63f">&#xe63f;</span>
-      <span class="e640">&#xe640;</span>
-      <span class="e641">&#xe641;</span>
-      <span class="e642">&#xe642;</span>
-      <span class="e643">&#xe643;</span>
-      <span class="e644">&#xe644;</span>
-      <span class="e645">&#xe645;</span>
-      <span class="e646">&#xe646;</span>
-      <span class="e647">&#xe647;</span>
-      <span class="e648">&#xe648;</span>
-      <span class="e649">&#xe649;</span>
-      <span class="e64a">&#xe64a;</span>
-      <span class="e64b">&#xe64b;</span>
-    </div>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/tablet.jsp b/src/main/webapp/WEB-INF/views/test/tablet.jsp
deleted file mode 100644 (file)
index 901cb4b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Layout für Tablets" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="${base}css/tablet.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      Diese Seite bindet alle Styles ein, die für Tablets eingebunden
-      werden (<code>/css/base.css</code> und <code>/css/tablet.css</code>).
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/testlab.jsp b/src/main/webapp/WEB-INF/views/test/testlab.jsp
deleted file mode 100644 (file)
index 252f259..0000000
+++ /dev/null
@@ -1,257 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="TESTLAB">
-  <t:putAttribute name="title" value="Formulare" type="string" cascade="true"/>
-  <t:putAttribute name="content">
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Anzeigetext</h2>
-      <div class="f textarea">
-        <label class="f info" for="textarea_01">Geben Sie hier Ihren Anzeigentext ein.</label>
-        <textarea class="f error" id="textarea_01" cols="50" rows="10">Eingegebener Text</textarea>
-        <span class="f error"><span class="e">&lt; </span><strong class="e">Fehler:</strong> Es wurde kein Text für die Anzeige eingegeben!</span>
-      </div>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Textformatierung</h2>
-      <fieldset class="f radiobutton cf">
-        <legend class="f info">
-          Die zusätzlichen Gestaltungsoptionen sind nur für das Magazin wählbar.<br />
-          Online erscheint die Anzeige als normaler Fließtext.
-        </legend>
-        <hr class="f" />
-        <div class="col2">
-          <div class="f">
-            <input class="f" id="radio_tbox_01" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_01">normaler Fließtext</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_02" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_02">Text zentriert</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_03" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_03">Text fett, Negativdruck</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_04" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_04">Text fett</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_05" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_05">Text fett und rot</label>
-          </div>
-        </div>
-        <div class="col2">
-          <div class="f">
-            <input class="f" id="radio_tbox_06" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_06">Text fett, Anzeige blau hinterlegt</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_07" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_07">Text fett, Anzeige gelb hinterlegt</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_08" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_08">Anzeige schwarz eingerahmt</label>
-          </div>
-          <div class="f">
-            <input class="f" id="radio_tbox_09" type="radio" name="radio_tbox" />
-            <label class="f" for="radio_tbox_09">Anzeige rot eingerahmt</label>
-          </div>
-        </div>
-      </fieldset>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Einspaltige Radiobuttons...</h2>
-      <fieldset class="f radiobutton">
-        <div class="f">
-          <input class="f" id="radio_tbox_b01" type="radio" name="radio_tbox" />
-          <label class="f" for="radio_tbox_b01">Dies ist eine etwas länglichere Beschreibung der auswählbaren Option</label>
-        </div>
-        <div class="f">
-          <input class="f" id="radio_tbox_b02" type="radio" name="radio_tbox" />
-          <label class="f" for="radio_tbox_b02">Option X</label>
-        </div>
-        <div class="f">
-          <input class="f" id="radio_tbox_b03" type="radio" name="radio_tbox" />
-          <label class="f" for="radio_tbox_b03">Dies ist eine sehr, sehr lange Beschreibung der auswählbaren Option - so lang, dass sie am Ende hoffentlich umbricht...</label>
-        </div>
-      </fieldset>
-      <hr class="f" />
-      <div class="f submit">
-        <input class="f" type="submit" value="&gt; zur Übersicht" />
-        <input class="f left" type="submit" value="&lt; zurück" />
-        <input class="f" type="submit" value="&gt; weiter" />
-      </div>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Bild</h2>
-      <fieldset class="f checkbox">
-        <legend class="f">
-          Du kannst Deiner Anzeige ein Bild hinzufügen.
-          Das Bild erscheint nur online.
-          Im Magazin erscheint die Kleinanzeige mit Hinweis auf das Onlinebild.
-        </legend>
-        <hr class="f" />
-        <div class="f">
-          <input class="f" id="checkbox_tbox_01" type="checkbox" name="checkbox_tbox" />
-          <label class="f" for="checkbox_tbox_01">Ich möchte ein Bild zu dieser Anzeige hinzufügen</label>
-        </div>
-        <div class="f">
-          <input class="f" id="checkbox_tbox_02" type="checkbox" name="checkbox_tbox" />
-          <label class="f" for="checkbox_tbox_02">Ich habe die AGB für das Hochladen von Bildern gelesen und akzeptiere diese</label>
-        </div>
-      </fieldset>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Alleinstehende Checkbox</h2>
-      <div class="f checkbox">
-        <input class="f" id="checkbox_tbox_03" type="checkbox" name="checkbox_tbox" />
-        <label class="f" for="checkbox_tbox_03">Ich möchte ein Bild zu dieser Anzeige hinzufügen</label>
-      </div>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Kundendaten</h2>
-      <p class="f required">
-        <strong class="r">Pflichtfelder</strong> sind mit einem
-        <strong class="r symbol">*</strong> markiert.
-      </p>
-      <div class="f text required">
-        <label for="text_tbox_01" class="f"><span class="required">* </span>Nachname</label>
-        <input class="f" id="text_tbox_01" type="text" value="Mustermann" />
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_02" class="f">Vorname</label>
-        <input class="f" id="text_tbox_02" type="text" value="Max" />
-      </div>
-      <div class="f select required">
-        <label for="text_tbox_03" class="f"><span class="required">* </span>Ort</label>
-        <select class="f" id="text_tbox_03">
-          <option>Dortmund</option>
-          <option>Bochum</option>
-          <option>Essen</option>
-          <option>Mönchengladbach</option>
-          <option>Oberhausen</option>
-          <option>Castrop-Rauxel</option>
-          <option>Düsseldorf</option>
-        </select>
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_04" class="f"><span class="required">* </span>Straße/Hausnr.</label>
-        <input class="f error" id="text_tbox_04" type="text" value="" />
-        <span class="f error"><span class="e">&lt; </span><strong class="e">Fehler:</strong> Dies ist ein Pflichtfeld!</span>
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_05" class="f"><span class="required">* </span>Postleitzahl</label>
-        <input class="f" id="text_tbox_05" type="text" value="" />
-      </div>
-      <div class="f text required">
-        <label for="text_tbox_06" class="f">Telefon</label>
-        <input class="f" id="text_tbox_06" type="text" value="" />
-      </div>
-      <hr class="f" />
-      <div class="f submit">
-        <input class="f" type="submit" value="&gt; weiter" />
-      </div>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Anzeige regionalisieren</h2>
-      <p class="f">
-        Indem Du Deine Kleinanzeige einer Stadt zuordnest, können Interessenten
-        diese online leichter finden, wenn sie nur nach Kleinanzeigen aus
-        bestimmten Städten suchen.
-        Du kannst auch keine Stadt zuordnen, dann wird die Kleinanzeige von
-        diesen Interessenten aber auch nicht gefunden.
-      </p>
-      <hr class="f" />
-      <div class="f text">
-        <label class="f" for="city">Stadt</label>
-        <input id="city" type="text" class="f" />
-        <p class="f info">
-          Das Feld leer lassen, wenn die Anzeige nicht regionalisiert werden soll.
-        </p>
-      </div>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Ein Passwort-Eingabe-Feld</h2>
-      <div class="f text required">
-        <label for="text_tbox_05" class="f"><span class="required">* </span>Passwort</label>
-        <input class="f" id="text_tbox_05" type="password" value="t" />
-      </div>
-    </form>
-    <form class="testlab form" action="#" method="get">
-      <h2 class="f">Lade das Bild hoch</h2>
-      <p class="f info">
-        Du kannst ein Bild im JPEG- oder PNG-Format hochladen.
-        Das Bild darf nicht größer als 8 MByte sein.
-      </p>
-      <div class="f file required">
-        <label for="file_tbox_01" class="f"><span class="required">* </span>Bild</label>
-        <input class="f" id="file_tbox_01" type="file" />
-      </div>
-      <hr class="f" />
-      <div class="f submit">
-        <input class="f" type="submit" value="&gt; Doch kein Bild" />
-        <input class="f" type="submit" value="&gt; Bild hochladen" />
-      </div>
-    </form>
-    <div class="testlab form">
-      <h2 class="f">Antworten</h2>
-      <p class="f required">
-        <strong class="r">Pflichtfelder</strong> sind mit einem
-        <strong class="r symbol">*</strong> markiert.
-      </p>
-      <div class="f text required">
-        <label class="f" for="replyTo"><span class="required">*</span> Antwort-Adresse</label>
-        <input id="replyTo" name="replyTo" class="f" tabindex="1" type="text" value=""/>
-      </div>
-      <div class="f text required">
-        <label class="f" for="replyTo"><span class="required">*</span> Adresse wiederholen</label>
-        <input id="replyToRepeated" name="replyToRepeated" class="f" tabindex="2" type="text" value=""/>
-      </div>
-      <div class="f text required">
-        <label class="f" for="subject"><span class="required">*</span> Betreff</label>
-        <input id="subject" name="subject" class="f" tabindex="3" type="text" value=""/>
-      </div>
-      <div class="f textarea required">
-        <label class="f" for="text"><span class="required">*</span> Nachricht</label>
-        <textarea id="text" name="text" class="f" tabindex="4" rows="15" cols="20"></textarea>
-      </div>
-      <div class="f checkbox">
-        <input id="attachment1" name="attachment" class="f" tabindex="4" type="checkbox" value="true" checked="checked"/><input type="hidden" name="_attachment" value="on"/>
-        <label class="f" for="attachment">Ich möchte eine Datei an die E-Mail anhängen.</label>
-      </div>
-      <div class="f checkbox">
-        <input id="copy1" name="copy" class="f" tabindex="5" type="checkbox" value="true" checked="checked"/><input type="hidden" name="_copy" value="on"/>
-        <label class="f" for="copy">Ich möchte eine Kopie der Nachricht zugesendet bekommen.</label>
-      </div>
-    </div>
-    <div class="testlab form cf">
-      <div class="col2 left">
-        <h2 class="f">Weiter mit Anmeldung</h2>
-        <div class="f text">
-          <label class="f" for="username">Benutzername</label>
-          <input class="f" name="username" id="username" type="text" tabindex="6" />
-        </div>
-        <div class="f text">
-          <label class="f" for="password">Passwort</label>
-          <input class="f" name="password" id="password" type="password" tabindex="7" />
-        </div>
-      </div>
-      <div class="col2 right">
-        <h2 class="f">Weiter ohne Anmeldung</h2>
-        <!-- <a href="/kleinanzeigen/37431/lust+.html" title="Zu schwer? Hier klicken um das Bild zu wechseln!"><img src="/img/captcha.jpg" alt="Captcha" width="120" height="60" /></a> -->
-        <div class="f captcha cf">
-          <span class="f">Was steht da?</span>
-          <img class="f" src="/img/captcha.jpg" alt="Captcha" width="120" height="60" />
-        </div>
-        <div class="f text">
-          <label class="f" for="captcha">Lösung</label>
-          <input class="f" name="captcha" id="captcha" type="text" tabindex="8" />
-        </div>
-      </div>
-    </div>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/test/tiny.jsp b/src/main/webapp/WEB-INF/views/test/tiny.jsp
deleted file mode 100644 (file)
index 0d21cdd..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="test">
-  <t:putAttribute name="title" value="Layout für sehr kleine Bildschirmgrößen" type="string" cascade="true"/>
-  <t:putAttribute name="htmlhead" type="string">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" type="text/css" href="${base}css/base.css" />
-    <link rel="stylesheet" type="text/css" href="${base}css/tiny.css" />
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>
-      In diese Seite bindet alle Styles ein, die für sehr kleine
-      Bildschirmgrößen eingebunden werden (<code>/css/base.css</code> und
-      <code>/css/tiny.css</code>).
-    </p>
-    <section>
-      <h1>Weitere Experimente</h1>
-      <t:insertTemplate template="/WEB-INF/templates/test/experimente.jsp"/>
-    </section>
-  </t:putAttribute>
-</t:insertDefinition>
diff --git a/src/main/webapp/WEB-INF/views/tiles.jsp b/src/main/webapp/WEB-INF/views/tiles.jsp
deleted file mode 100644 (file)
index cee460f..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@page contentType="text/html" pageEncoding="UTF-8" session="false"%>
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<c:forEach begin="1" end="10">
-Hello World!<br/>
-</c:forEach>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/urheberrechte.jsp b/src/main/webapp/WEB-INF/views/urheberrechte.jsp
deleted file mode 100644 (file)
index ac50b65..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-<%@page contentType="text/html;charset=UTF-8"%>
-<%@page pageEncoding="UTF-8"%>
-<%@page session="false" %>
-<%@taglib uri="http://tiles.apache.org/tags-tiles" prefix="t" %>
-<t:insertDefinition name="BASEPAGE">
-  <t:putAttribute name="title" value="Urheberrechte" type="string" cascade="true"/>
-  <t:putAttribute name="breadcrumb">
-    <li class="b"><a class="b" href="${base}index.html">Home</a></li>
-    <li class="b"><a href="${base}impressum.html" class="b">Impressum</a></li>
-    <li class="b"><strong class="b">Urheberrechte</strong></li>
-  </t:putAttribute>
-  <t:putAttribute name="navigation" type="string">
-    <h1 class="nav">Navigation</h1>
-    <h2 class="nav menu">Section-Menu</h2>
-    <ul id="menu" class="s active cf">
-      <li class="m blog"><a href="${base}blog.html" class="m">Blog</a></li>
-      <li class="m projects"><a href="${base}projects.html" class="m">Projects</a></li>
-      <li class="m about"><a href="${base}about.html" class="m">About</a></li>
-    </ul>
-    <h2 class="nav submenu"><span class="s">Submenu for section </span><a href="${base}impressum.html" class="s selected">Impressum</a></h2>
-    <ul id="submenu">
-      <li class="s"><a href="${base}agb.html" class="s">AGB</a></li>
-      <li class="s"><a href="${base}haftung-inhalte.html" class="s">Haftung für Inhalte</a></li>
-      <li class="s"><a href="${base}haftung-links.html" class="s">Haftung für Links</a></li>
-      <li class="s"><strong class="s">Urheberrechte</strong></li>
-      <li class="s"><a href="${base}datenschutz.html" class="s">Datenschutz</a></li>
-      <li class="s"><a href="${base}google-analytics.html" class="s">Google Analytics</a></li>
-    </ul>
-  </t:putAttribute>
-  <t:putAttribute name="maincontent" type="string" cascade="true">
-    <p>Die auf unseren Internetseiten enthaltenen Werke und Inhalte unterstehen dem Urheberrecht. Ohne schriftliche Genehmigung des jeweiligen Erstellers oder Autors dürfen die Werke bzw. Inhalte nicht vervielfältigt, bearbeitet, verbreitet und verwertet werden. Das Herunterladen und Kopieren unserer Internetseite ist für den privaten Gebrauch erlaubt, nicht jedoch für den kommerziellen. Wir weisen darauf hin, dass hinsichtlich der Inhalte auf unserer Internetseite, soweit sie nicht von uns erstellt worden sind, das Urheberrecht von Dritten beachtet wurde. Inhalte von Dritten erhalten als solche eine Kennzeichnung von uns. Wir wären Ihnen dankbar, wenn Sie uns einen Hinweis erteilen würden, falls Sie trotzdem auf eine Urheberrechtsverletzung gestoßen sind. Wenn wir von einer solchen Urheberrechtsverletzung Kenntnis erlangen, werden wir den entsprechenden Inhalt unverzüglich entfernen.</p>
-    <p><em>Quelle: <a href="http://www.flegl-rechtsanwaelte.de/rechtstipps/muster-impressum-gewerbliche-homepage">www.flegl-rechtsanwaelte.de</a></em></p>
-  </t:putAttribute>
-  <t:putAttribute name="marginalcontent" type="template" value="/WEB-INF/templates/about.jsp"/>
-</t:insertDefinition>
index 289983b..a204d6b 100644 (file)
   </filter-mapping>
 
 
-  <!-- Fix a logic-bug in the colaboration of Thymeleaf and Tiles -->
-
-  <filter>
-    <filter-name>forceIncludeFilter</filter-name>
-    <filter-class>de.juplo.branding.web.ForceIncludeFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>forceIncludeFilter</filter-name>
-    <url-pattern>*.html</url-pattern>
-  </filter-mapping>
-
-
   <!-- Handles all requests into the application -->
 
   <servlet>
diff --git a/src/main/webapp/js/less-1.5.1.js b/src/main/webapp/js/less-1.5.1.js
deleted file mode 100644 (file)
index dfff28a..0000000
+++ /dev/null
@@ -1,6941 +0,0 @@
-/*! 
- * LESS - Leaner CSS v1.5.1 
- * http://lesscss.org 
- * 
- * Copyright (c) 2009-2013, Alexis Sellier <self@cloudhead.net> 
- * Licensed under the Apache v2 License. 
- * 
- * @licence 
- */ 
-
-
-
-(function (window, undefined) {//
-// Stub out `require` in the browser
-//
-function require(arg) {
-    return window.less[arg.split('/')[1]];
-};
-
-
-if (typeof(window.less) === 'undefined' || typeof(window.less.nodeType) !== 'undefined') { window.less = {}; }
-less = window.less;
-tree = window.less.tree = {};
-less.mode = 'browser';
-
-var less, tree;
-
-// Node.js does not have a header file added which defines less
-if (less === undefined) {
-    less = exports;
-    tree = require('./tree');
-    less.mode = 'node';
-}
-//
-// less.js - parser
-//
-//    A relatively straight-forward predictive parser.
-//    There is no tokenization/lexing stage, the input is parsed
-//    in one sweep.
-//
-//    To make the parser fast enough to run in the browser, several
-//    optimization had to be made:
-//
-//    - Matching and slicing on a huge input is often cause of slowdowns.
-//      The solution is to chunkify the input into smaller strings.
-//      The chunks are stored in the `chunks` var,
-//      `j` holds the current chunk index, and `current` holds
-//      the index of the current chunk in relation to `input`.
-//      This gives us an almost 4x speed-up.
-//
-//    - In many cases, we don't need to match individual tokens;
-//      for example, if a value doesn't hold any variables, operations
-//      or dynamic references, the parser can effectively 'skip' it,
-//      treating it as a literal.
-//      An example would be '1px solid #000' - which evaluates to itself,
-//      we don't need to know what the individual components are.
-//      The drawback, of course is that you don't get the benefits of
-//      syntax-checking on the CSS. This gives us a 50% speed-up in the parser,
-//      and a smaller speed-up in the code-gen.
-//
-//
-//    Token matching is done with the `$` function, which either takes
-//    a terminal string or regexp, or a non-terminal function to call.
-//    It also takes care of moving all the indices forwards.
-//
-//
-less.Parser = function Parser(env) {
-    var input,       // LeSS input string
-        i,           // current index in `input`
-        j,           // current chunk
-        temp,        // temporarily holds a chunk's state, for backtracking
-        memo,        // temporarily holds `i`, when backtracking
-        furthest,    // furthest index the parser has gone to
-        chunks,      // chunkified input
-        current,     // index of current chunk, in `input`
-        parser,
-        rootFilename = env && env.filename;
-
-    // Top parser on an import tree must be sure there is one "env"
-    // which will then be passed around by reference.
-    if (!(env instanceof tree.parseEnv)) {
-        env = new tree.parseEnv(env);
-    }
-
-    var imports = this.imports = {
-        paths: env.paths || [],  // Search paths, when importing
-        queue: [],               // Files which haven't been imported yet
-        files: env.files,        // Holds the imported parse trees
-        contents: env.contents,  // Holds the imported file contents
-        mime:  env.mime,         // MIME type of .less files
-        error: null,             // Error in parsing/evaluating an import
-        push: function (path, currentFileInfo, importOptions, callback) {
-            var parserImports = this;
-            this.queue.push(path);
-
-            var fileParsedFunc = function (e, root, fullPath) {
-                parserImports.queue.splice(parserImports.queue.indexOf(path), 1); // Remove the path from the queue
-
-                var importedPreviously = fullPath in parserImports.files || fullPath === rootFilename;
-
-                parserImports.files[fullPath] = root;                        // Store the root
-
-                if (e && !parserImports.error) { parserImports.error = e; }
-
-                callback(e, root, importedPreviously, fullPath);
-            };
-
-            if (less.Parser.importer) {
-                less.Parser.importer(path, currentFileInfo, fileParsedFunc, env);
-            } else {
-                less.Parser.fileLoader(path, currentFileInfo, function(e, contents, fullPath, newFileInfo) {
-                    if (e) {fileParsedFunc(e); return;}
-
-                    var newEnv = new tree.parseEnv(env);
-
-                    newEnv.currentFileInfo = newFileInfo;
-                    newEnv.processImports = false;
-                    newEnv.contents[fullPath] = contents;
-
-                    if (currentFileInfo.reference || importOptions.reference) {
-                        newFileInfo.reference = true;
-                    }
-
-                    if (importOptions.inline) {
-                        fileParsedFunc(null, contents, fullPath);
-                    } else {
-                        new(less.Parser)(newEnv).parse(contents, function (e, root) {
-                            fileParsedFunc(e, root, fullPath);
-                        });
-                    }
-                }, env);
-            }
-        }
-    };
-
-    function save()    { temp = chunks[j], memo = i, current = i; }
-    function restore() { chunks[j] = temp, i = memo, current = i; }
-
-    function sync() {
-        if (i > current) {
-            chunks[j] = chunks[j].slice(i - current);
-            current = i;
-        }
-    }
-    function isWhitespace(c) {
-        // Could change to \s?
-        var code = c.charCodeAt(0);
-        return code === 32 || code === 10 || code === 9;
-    }
-    //
-    // Parse from a token, regexp or string, and move forward if match
-    //
-    function $(tok) {
-        var match, length;
-
-        //
-        // Non-terminal
-        //
-        if (tok instanceof Function) {
-            return tok.call(parser.parsers);
-        //
-        // Terminal
-        //
-        //     Either match a single character in the input,
-        //     or match a regexp in the current chunk (chunk[j]).
-        //
-        } else if (typeof(tok) === 'string') {
-            match = input.charAt(i) === tok ? tok : null;
-            length = 1;
-            sync ();
-        } else {
-            sync ();
-
-            if (match = tok.exec(chunks[j])) {
-                length = match[0].length;
-            } else {
-                return null;
-            }
-        }
-
-        // The match is confirmed, add the match length to `i`,
-        // and consume any extra white-space characters (' ' || '\n')
-        // which come after that. The reason for this is that LeSS's
-        // grammar is mostly white-space insensitive.
-        //
-        if (match) {
-            skipWhitespace(length);
-
-            if(typeof(match) === 'string') {
-                return match;
-            } else {
-                return match.length === 1 ? match[0] : match;
-            }
-        }
-    }
-
-    function skipWhitespace(length) {
-        var oldi = i, oldj = j,
-            endIndex = i + chunks[j].length,
-            mem = i += length;
-
-        while (i < endIndex) {
-            if (! isWhitespace(input.charAt(i))) { break; }
-            i++;
-        }
-        chunks[j] = chunks[j].slice(length + (i - mem));
-        current = i;
-
-        if (chunks[j].length === 0 && j < chunks.length - 1) { j++; }
-
-        return oldi !== i || oldj !== j;
-    }
-
-    function expect(arg, msg) {
-        var result = $(arg);
-        if (! result) {
-            error(msg || (typeof(arg) === 'string' ? "expected '" + arg + "' got '" + input.charAt(i) + "'"
-                                                   : "unexpected token"));
-        } else {
-            return result;
-        }
-    }
-
-    function error(msg, type) {
-        var e = new Error(msg);
-        e.index = i;
-        e.type = type || 'Syntax';
-        throw e;
-    }
-
-    // Same as $(), but don't change the state of the parser,
-    // just return the match.
-    function peek(tok) {
-        if (typeof(tok) === 'string') {
-            return input.charAt(i) === tok;
-        } else {
-            return tok.test(chunks[j]);
-        }
-    }
-
-    function getInput(e, env) {
-        if (e.filename && env.currentFileInfo.filename && (e.filename !== env.currentFileInfo.filename)) {
-            return parser.imports.contents[e.filename];
-        } else {
-            return input;
-        }
-    }
-
-    function getLocation(index, inputStream) {
-        var n = index + 1,
-            line = null,
-            column = -1;
-
-        while (--n >= 0 && inputStream.charAt(n) !== '\n') {
-            column++;
-        }
-
-        if (typeof index === 'number') {
-            line = (inputStream.slice(0, index).match(/\n/g) || "").length;
-        }
-
-        return {
-            line: line,
-            column: column
-        };
-    }
-
-    function getDebugInfo(index, inputStream, env) {
-        var filename = env.currentFileInfo.filename;
-        if(less.mode !== 'browser' && less.mode !== 'rhino') {
-            filename = require('path').resolve(filename);
-        }
-
-        return {
-            lineNumber: getLocation(index, inputStream).line + 1,
-            fileName: filename
-        };
-    }
-
-    function LessError(e, env) {
-        var input = getInput(e, env),
-            loc = getLocation(e.index, input),
-            line = loc.line,
-            col  = loc.column,
-            callLine = e.call && getLocation(e.call, input).line,
-            lines = input.split('\n');
-
-        this.type = e.type || 'Syntax';
-        this.message = e.message;
-        this.filename = e.filename || env.currentFileInfo.filename;
-        this.index = e.index;
-        this.line = typeof(line) === 'number' ? line + 1 : null;
-        this.callLine = callLine + 1;
-        this.callExtract = lines[callLine];
-        this.stack = e.stack;
-        this.column = col;
-        this.extract = [
-            lines[line - 1],
-            lines[line],
-            lines[line + 1]
-        ];
-    }
-
-    LessError.prototype = new Error();
-    LessError.prototype.constructor = LessError;
-
-    this.env = env = env || {};
-
-    // The optimization level dictates the thoroughness of the parser,
-    // the lower the number, the less nodes it will create in the tree.
-    // This could matter for debugging, or if you want to access
-    // the individual nodes in the tree.
-    this.optimization = ('optimization' in this.env) ? this.env.optimization : 1;
-
-    //
-    // The Parser
-    //
-    return parser = {
-
-        imports: imports,
-        //
-        // Parse an input string into an abstract syntax tree,
-        // call `callback` when done.
-        //
-        parse: function (str, callback) {
-            var root, line, lines, error = null;
-
-            i = j = current = furthest = 0;
-            input = str.replace(/\r\n/g, '\n');
-
-            // Remove potential UTF Byte Order Mark
-            input = input.replace(/^\uFEFF/, '');
-
-            parser.imports.contents[env.currentFileInfo.filename] = input;
-
-            // Split the input into chunks.
-            chunks = (function (chunks) {
-                var j = 0,
-                    skip = /(?:@\{[\w-]+\}|[^"'`\{\}\/\(\)\\])+/g,
-                    comment = /\/\*(?:[^*]|\*+[^\/*])*\*+\/|\/\/.*/g,
-                    string = /"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'|`((?:[^`]|\\.)*)`/g,
-                    level = 0,
-                    match,
-                    chunk = chunks[0],
-                    inParam;
-
-                for (var i = 0, c, cc; i < input.length;) {
-                    skip.lastIndex = i;
-                    if (match = skip.exec(input)) {
-                        if (match.index === i) {
-                            i += match[0].length;
-                            chunk.push(match[0]);
-                        }
-                    }
-                    c = input.charAt(i);
-                    comment.lastIndex = string.lastIndex = i;
-
-                    if (match = string.exec(input)) {
-                        if (match.index === i) {
-                            i += match[0].length;
-                            chunk.push(match[0]);
-                            continue;
-                        }
-                    }
-
-                    if (!inParam && c === '/') {
-                        cc = input.charAt(i + 1);
-                        if (cc === '/' || cc === '*') {
-                            if (match = comment.exec(input)) {
-                                if (match.index === i) {
-                                    i += match[0].length;
-                                    chunk.push(match[0]);
-                                    continue;
-                                }
-                            }
-                        }
-                    }
-                    
-                    switch (c) {
-                        case '{':
-                            if (!inParam) {
-                                level++;
-                                chunk.push(c);
-                                break;
-                            }
-                            /* falls through */
-                        case '}':
-                            if (!inParam) {
-                                level--;
-                                chunk.push(c);
-                                chunks[++j] = chunk = [];
-                                break;
-                            }
-                            /* falls through */
-                        case '(':
-                            if (!inParam) {
-                                inParam = true;
-                                chunk.push(c);
-                                break;
-                            }
-                            /* falls through */
-                        case ')':
-                            if (inParam) {
-                                inParam = false;
-                                chunk.push(c);
-                                break;
-                            }
-                            /* falls through */
-                        default:
-                            chunk.push(c);
-                    }
-                    
-                    i++;
-                }
-                if (level !== 0) {
-                    error = new(LessError)({
-                        index: i-1,
-                        type: 'Parse',
-                        message: (level > 0) ? "missing closing `}`" : "missing opening `{`",
-                        filename: env.currentFileInfo.filename
-                    }, env);
-                }
-
-                return chunks.map(function (c) { return c.join(''); });
-            })([[]]);
-
-            if (error) {
-                return callback(new(LessError)(error, env));
-            }
-
-            // Start with the primary rule.
-            // The whole syntax tree is held under a Ruleset node,
-            // with the `root` property set to true, so no `{}` are
-            // output. The callback is called when the input is parsed.
-            try {
-                root = new(tree.Ruleset)([], $(this.parsers.primary));
-                root.root = true;
-                root.firstRoot = true;
-            } catch (e) {
-                return callback(new(LessError)(e, env));
-            }
-
-            root.toCSS = (function (evaluate) {
-                return function (options, variables) {
-                    options = options || {};
-                    var evaldRoot,
-                        css,
-                        evalEnv = new tree.evalEnv(options);
-                        
-                    //
-                    // Allows setting variables with a hash, so:
-                    //
-                    //   `{ color: new(tree.Color)('#f01') }` will become:
-                    //
-                    //   new(tree.Rule)('@color',
-                    //     new(tree.Value)([
-                    //       new(tree.Expression)([
-                    //         new(tree.Color)('#f01')
-                    //       ])
-                    //     ])
-                    //   )
-                    //
-                    if (typeof(variables) === 'object' && !Array.isArray(variables)) {
-                        variables = Object.keys(variables).map(function (k) {
-                            var value = variables[k];
-
-                            if (! (value instanceof tree.Value)) {
-                                if (! (value instanceof tree.Expression)) {
-                                    value = new(tree.Expression)([value]);
-                                }
-                                value = new(tree.Value)([value]);
-                            }
-                            return new(tree.Rule)('@' + k, value, false, null, 0);
-                        });
-                        evalEnv.frames = [new(tree.Ruleset)(null, variables)];
-                    }
-
-                    try {
-                        evaldRoot = evaluate.call(this, evalEnv);
-
-                        new(tree.joinSelectorVisitor)()
-                            .run(evaldRoot);
-
-                        new(tree.processExtendsVisitor)()
-                            .run(evaldRoot);
-
-                        new(tree.toCSSVisitor)({compress: Boolean(options.compress)})
-                            .run(evaldRoot);
-
-                        if (options.sourceMap) {
-                            evaldRoot = new tree.sourceMapOutput(
-                                {
-                                    writeSourceMap: options.writeSourceMap,
-                                    rootNode: evaldRoot,
-                                    contentsMap: parser.imports.contents,
-                                    sourceMapFilename: options.sourceMapFilename,
-                                    sourceMapURL: options.sourceMapURL,
-                                    outputFilename: options.sourceMapOutputFilename,
-                                    sourceMapBasepath: options.sourceMapBasepath,
-                                    sourceMapRootpath: options.sourceMapRootpath,
-                                    outputSourceFiles: options.outputSourceFiles,
-                                    sourceMapGenerator: options.sourceMapGenerator
-                                });
-                        }
-
-                        css = evaldRoot.toCSS({
-                                compress: Boolean(options.compress),
-                                dumpLineNumbers: env.dumpLineNumbers,
-                                strictUnits: Boolean(options.strictUnits)});
-                    } catch (e) {
-                        throw new(LessError)(e, env);
-                    }
-
-                    if (options.cleancss && less.mode === 'node') {
-                        var CleanCSS = require('clean-css');
-                        //TODO would be nice for no advanced to be an option
-                        return new CleanCSS({keepSpecialComments: '*', processImport: false, noRebase: true, noAdvanced: true}).minify(css);
-                    } else if (options.compress) {
-                        return css.replace(/(^(\s)+)|((\s)+$)/g, "");
-                    } else {
-                        return css;
-                    }
-                };
-            })(root.eval);
-
-            // If `i` is smaller than the `input.length - 1`,
-            // it means the parser wasn't able to parse the whole
-            // string, so we've got a parsing error.
-            //
-            // We try to extract a \n delimited string,
-            // showing the line where the parse error occured.
-            // We split it up into two parts (the part which parsed,
-            // and the part which didn't), so we can color them differently.
-            if (i < input.length - 1) {
-                i = furthest;
-                var loc = getLocation(i, input);
-                lines = input.split('\n');
-                line = loc.line + 1;
-
-                error = {
-                    type: "Parse",
-                    message: "Unrecognised input",
-                    index: i,
-                    filename: env.currentFileInfo.filename,
-                    line: line,
-                    column: loc.column,
-                    extract: [
-                        lines[line - 2],
-                        lines[line - 1],
-                        lines[line]
-                    ]
-                };
-            }
-
-            var finish = function (e) {
-                e = error || e || parser.imports.error;
-
-                if (e) {
-                    if (!(e instanceof LessError)) {
-                        e = new(LessError)(e, env);
-                    }
-
-                    return callback(e);
-                }
-                else {
-                    return callback(null, root);
-                }
-            };
-
-            if (env.processImports !== false) {
-                new tree.importVisitor(this.imports, finish)
-                    .run(root);
-            } else {
-                return finish();
-            }
-        },
-
-        //
-        // Here in, the parsing rules/functions
-        //
-        // The basic structure of the syntax tree generated is as follows:
-        //
-        //   Ruleset ->  Rule -> Value -> Expression -> Entity
-        //
-        // Here's some LESS code:
-        //
-        //    .class {
-        //      color: #fff;
-        //      border: 1px solid #000;
-        //      width: @w + 4px;
-        //      > .child {...}
-        //    }
-        //
-        // And here's what the parse tree might look like:
-        //
-        //     Ruleset (Selector '.class', [
-        //         Rule ("color",  Value ([Expression [Color #fff]]))
-        //         Rule ("border", Value ([Expression [Dimension 1px][Keyword "solid"][Color #000]]))
-        //         Rule ("width",  Value ([Expression [Operation "+" [Variable "@w"][Dimension 4px]]]))
-        //         Ruleset (Selector [Element '>', '.child'], [...])
-        //     ])
-        //
-        //  In general, most rules will try to parse a token with the `$()` function, and if the return
-        //  value is truly, will return a new node, of the relevant type. Sometimes, we need to check
-        //  first, before parsing, that's when we use `peek()`.
-        //
-        parsers: {
-            //
-            // The `primary` rule is the *entry* and *exit* point of the parser.
-            // The rules here can appear at any level of the parse tree.
-            //
-            // The recursive nature of the grammar is an interplay between the `block`
-            // rule, which represents `{ ... }`, the `ruleset` rule, and this `primary` rule,
-            // as represented by this simplified grammar:
-            //
-            //     primary  →  (ruleset | rule)+
-            //     ruleset  →  selector+ block
-            //     block    →  '{' primary '}'
-            //
-            // Only at one point is the primary rule not called from the
-            // block rule: at the root level.
-            //
-            primary: function () {
-                var node, root = [];
-
-                while ((node = $(this.extendRule) || $(this.mixin.definition) || $(this.rule)    ||  $(this.ruleset) ||
-                               $(this.mixin.call)       || $(this.comment) ||  $(this.directive))
-                               || $(/^[\s\n]+/) || $(/^;+/)) {
-                    node && root.push(node);
-                }
-                return root;
-            },
-
-            // We create a Comment node for CSS comments `/* */`,
-            // but keep the LeSS comments `//` silent, by just skipping
-            // over them.
-            comment: function () {
-                var comment;
-
-                if (input.charAt(i) !== '/') { return; }
-
-                if (input.charAt(i + 1) === '/') {
-                    return new(tree.Comment)($(/^\/\/.*/), true, i, env.currentFileInfo);
-                } else if (comment = $(/^\/\*(?:[^*]|\*+[^\/*])*\*+\/\n?/)) {
-                    return new(tree.Comment)(comment, false, i, env.currentFileInfo);
-                }
-            },
-
-            comments: function () {
-                var comment, comments = [];
-
-                while(comment = $(this.comment)) {
-                    comments.push(comment);
-                }
-
-                return comments;
-            },
-
-            //
-            // Entities are tokens which can be found inside an Expression
-            //
-            entities: {
-                //
-                // A string, which supports escaping " and '
-                //
-                //     "milky way" 'he\'s the one!'
-                //
-                quoted: function () {
-                    var str, j = i, e, index = i;
-
-                    if (input.charAt(j) === '~') { j++, e = true; } // Escaped strings
-                    if (input.charAt(j) !== '"' && input.charAt(j) !== "'") { return; }
-
-                    e && $('~');
-
-                    if (str = $(/^"((?:[^"\\\r\n]|\\.)*)"|'((?:[^'\\\r\n]|\\.)*)'/)) {
-                        return new(tree.Quoted)(str[0], str[1] || str[2], e, index, env.currentFileInfo);
-                    }
-                },
-
-                //
-                // A catch-all word, such as:
-                //
-                //     black border-collapse
-                //
-                keyword: function () {
-                    var k;
-
-                    if (k = $(/^[_A-Za-z-][_A-Za-z0-9-]*/)) {
-                        var color = tree.Color.fromKeyword(k);
-                        if (color) {
-                            return color;
-                        }
-                        return new(tree.Keyword)(k);
-                    }
-                },
-
-                //
-                // A function call
-                //
-                //     rgb(255, 0, 255)
-                //
-                // We also try to catch IE's `alpha()`, but let the `alpha` parser
-                // deal with the details.
-                //
-                // The arguments are parsed with the `entities.arguments` parser.
-                //
-                call: function () {
-                    var name, nameLC, args, alpha_ret, index = i;
-
-                    if (! (name = /^([\w-]+|%|progid:[\w\.]+)\(/.exec(chunks[j]))) { return; }
-
-                    name = name[1];
-                    nameLC = name.toLowerCase();
-
-                    if (nameLC === 'url') { return null; }
-                    else                  { i += name.length; }
-
-                    if (nameLC === 'alpha') {
-                        alpha_ret = $(this.alpha);
-                        if(typeof alpha_ret !== 'undefined') {
-                            return alpha_ret;
-                        }
-                    }
-
-                    $('('); // Parse the '(' and consume whitespace.
-
-                    args = $(this.entities.arguments);
-
-                    if (! $(')')) {
-                        return;
-                    }
-
-                    if (name) { return new(tree.Call)(name, args, index, env.currentFileInfo); }
-                },
-                arguments: function () {
-                    var args = [], arg;
-
-                    while (arg = $(this.entities.assignment) || $(this.expression)) {
-                        args.push(arg);
-                        if (! $(',')) {
-                            break;
-                        }
-                    }
-                    return args;
-                },
-                literal: function () {
-                    return $(this.entities.dimension) ||
-                           $(this.entities.color) ||
-                           $(this.entities.quoted) ||
-                           $(this.entities.unicodeDescriptor);
-                },
-
-                // Assignments are argument entities for calls.
-                // They are present in ie filter properties as shown below.
-                //
-                //     filter: progid:DXImageTransform.Microsoft.Alpha( *opacity=50* )
-                //
-
-                assignment: function () {
-                    var key, value;
-                    if ((key = $(/^\w+(?=\s?=)/i)) && $('=') && (value = $(this.entity))) {
-                        return new(tree.Assignment)(key, value);
-                    }
-                },
-
-                //
-                // Parse url() tokens
-                //
-                // We use a specific rule for urls, because they don't really behave like
-                // standard function calls. The difference is that the argument doesn't have
-                // to be enclosed within a string, so it can't be parsed as an Expression.
-                //
-                url: function () {
-                    var value;
-
-                    if (input.charAt(i) !== 'u' || !$(/^url\(/)) {
-                        return;
-                    }
-
-                    value = $(this.entities.quoted)  || $(this.entities.variable) ||
-                            $(/^(?:(?:\\[\(\)'"])|[^\(\)'"])+/) || "";
-
-                    expect(')');
-
-                    /*jshint eqnull:true */
-                    return new(tree.URL)((value.value != null || value instanceof tree.Variable)
-                                        ? value : new(tree.Anonymous)(value), env.currentFileInfo);
-                },
-
-                //
-                // A Variable entity, such as `@fink`, in
-                //
-                //     width: @fink + 2px
-                //
-                // We use a different parser for variable definitions,
-                // see `parsers.variable`.
-                //
-                variable: function () {
-                    var name, index = i;
-
-                    if (input.charAt(i) === '@' && (name = $(/^@@?[\w-]+/))) {
-                        return new(tree.Variable)(name, index, env.currentFileInfo);
-                    }
-                },
-
-                // A variable entity useing the protective {} e.g. @{var}
-                variableCurly: function () {
-                    var curly, index = i;
-
-                    if (input.charAt(i) === '@' && (curly = $(/^@\{([\w-]+)\}/))) {
-                        return new(tree.Variable)("@" + curly[1], index, env.currentFileInfo);
-                    }
-                },
-
-                //
-                // A Hexadecimal color
-                //
-                //     #4F3C2F
-                //
-                // `rgb` and `hsl` colors are parsed through the `entities.call` parser.
-                //
-                color: function () {
-                    var rgb;
-
-                    if (input.charAt(i) === '#' && (rgb = $(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/))) {
-                        return new(tree.Color)(rgb[1]);
-                    }
-                },
-
-                //
-                // A Dimension, that is, a number and a unit
-                //
-                //     0.5em 95%
-                //
-                dimension: function () {
-                    var value, c = input.charCodeAt(i);
-                    //Is the first char of the dimension 0-9, '.', '+' or '-'
-                    if ((c > 57 || c < 43) || c === 47 || c == 44) {
-                        return;
-                    }
-
-                    if (value = $(/^([+-]?\d*\.?\d+)(%|[a-z]+)?/)) {
-                        return new(tree.Dimension)(value[1], value[2]);
-                    }
-                },
-
-                //
-                // A unicode descriptor, as is used in unicode-range
-                //
-                // U+0??  or U+00A1-00A9
-                //
-                unicodeDescriptor: function () {
-                    var ud;
-                    
-                    if (ud = $(/^U\+[0-9a-fA-F?]+(\-[0-9a-fA-F?]+)?/)) {
-                        return new(tree.UnicodeDescriptor)(ud[0]);
-                    }
-                },
-
-                //
-                // JavaScript code to be evaluated
-                //
-                //     `window.location.href`
-                //
-                javascript: function () {
-                    var str, j = i, e;
-
-                    if (input.charAt(j) === '~') { j++; e = true; } // Escaped strings
-                    if (input.charAt(j) !== '`') { return; }
-                    if (env.javascriptEnabled !== undefined && !env.javascriptEnabled) {
-                        error("You are using JavaScript, which has been disabled.");
-                    }
-
-                    if (e) { $('~'); }
-
-                    if (str = $(/^`([^`]*)`/)) {
-                        return new(tree.JavaScript)(str[1], i, e);
-                    }
-                }
-            },
-
-            //
-            // The variable part of a variable definition. Used in the `rule` parser
-            //
-            //     @fink:
-            //
-            variable: function () {
-                var name;
-
-                if (input.charAt(i) === '@' && (name = $(/^(@[\w-]+)\s*:/))) { return name[1]; }
-            },
-
-            //
-            // extend syntax - used to extend selectors
-            //
-            extend: function(isRule) {
-                var elements, e, index = i, option, extendList = [];
-
-                if (!$(isRule ? /^&:extend\(/ : /^:extend\(/)) { return; }
-
-                do {
-                    option = null;
-                    elements = [];
-                    while (true) {
-                        option = $(/^(all)(?=\s*(\)|,))/);
-                        if (option) { break; }
-                        e = $(this.element);
-                        if (!e) { break; }
-                        elements.push(e);
-                    }
-
-                    option = option && option[1];
-
-                    extendList.push(new(tree.Extend)(new(tree.Selector)(elements), option, index));
-
-                } while($(","));
-                
-                expect(/^\)/);
-
-                if (isRule) {
-                    expect(/^;/);
-                }
-
-                return extendList;
-            },
-
-            //
-            // extendRule - used in a rule to extend all the parent selectors
-            //
-            extendRule: function() {
-                return this.extend(true);
-            },
-            
-            //
-            // Mixins
-            //
-            mixin: {
-                //
-                // A Mixin call, with an optional argument list
-                //
-                //     #mixins > .square(#fff);
-                //     .rounded(4px, black);
-                //     .button;
-                //
-                // The `while` loop is there because mixins can be
-                // namespaced, but we only support the child and descendant
-                // selector for now.
-                //
-                call: function () {
-                    var elements = [], e, c, args, index = i, s = input.charAt(i), important = false;
-
-                    if (s !== '.' && s !== '#') { return; }
-
-                    save(); // stop us absorbing part of an invalid selector
-
-                    while (e = $(/^[#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/)) {
-                        elements.push(new(tree.Element)(c, e, i, env.currentFileInfo));
-                        c = $('>');
-                    }
-                    if ($('(')) {
-                        args = this.mixin.args.call(this, true).args;
-                        expect(')');
-                    }
-
-                    args = args || [];
-
-                    if ($(this.important)) {
-                        important = true;
-                    }
-
-                    if (elements.length > 0 && ($(';') || peek('}'))) {
-                        return new(tree.mixin.Call)(elements, args, index, env.currentFileInfo, important);
-                    }
-
-                    restore();
-                },
-                args: function (isCall) {
-                    var expressions = [], argsSemiColon = [], isSemiColonSeperated, argsComma = [], expressionContainsNamed, name, nameLoop, value, arg,
-                        returner = {args:null, variadic: false};
-                    while (true) {
-                        if (isCall) {
-                            arg = $(this.expression);
-                        } else {
-                            $(this.comments);
-                            if (input.charAt(i) === '.' && $(/^\.{3}/)) {
-                                returner.variadic = true;
-                                if ($(";") && !isSemiColonSeperated) {
-                                    isSemiColonSeperated = true;
-                                }
-                                (isSemiColonSeperated ? argsSemiColon : argsComma)
-                                    .push({ variadic: true });
-                                break;
-                            }
-                            arg = $(this.entities.variable) || $(this.entities.literal)
-                                || $(this.entities.keyword);
-                        }
-
-                        if (!arg) {
-                            break;
-                        }
-
-                        nameLoop = null;
-                        if (arg.throwAwayComments) {
-                            arg.throwAwayComments();
-                        }
-                        value = arg;
-                        var val = null;
-
-                        if (isCall) {
-                            // Variable
-                            if (arg.value.length == 1) {
-                                val = arg.value[0];
-                            }
-                        } else {
-                            val = arg;
-                        }
-
-                        if (val && val instanceof tree.Variable) {
-                            if ($(':')) {
-                                if (expressions.length > 0) {
-                                    if (isSemiColonSeperated) {
-                                        error("Cannot mix ; and , as delimiter types");
-                                    }
-                                    expressionContainsNamed = true;
-                                }
-                                value = expect(this.expression);
-                                nameLoop = (name = val.name);
-                            } else if (!isCall && $(/^\.{3}/)) {
-                                returner.variadic = true;
-                                if ($(";") && !isSemiColonSeperated) {
-                                    isSemiColonSeperated = true;
-                                }
-                                (isSemiColonSeperated ? argsSemiColon : argsComma)
-                                    .push({ name: arg.name, variadic: true });
-                                break;
-                            } else if (!isCall) {
-                                name = nameLoop = val.name;
-                                value = null;
-                            }
-                        }
-
-                        if (value) {
-                            expressions.push(value);
-                        }
-
-                        argsComma.push({ name:nameLoop, value:value });
-
-                        if ($(',')) {
-                            continue;
-                        }
-
-                        if ($(';') || isSemiColonSeperated) {
-
-                            if (expressionContainsNamed) {
-                                error("Cannot mix ; and , as delimiter types");
-                            }
-
-                            isSemiColonSeperated = true;
-
-                            if (expressions.length > 1) {
-                                value = new(tree.Value)(expressions);
-                            }
-                            argsSemiColon.push({ name:name, value:value });
-
-                            name = null;
-                            expressions = [];
-                            expressionContainsNamed = false;
-                        }
-                    }
-
-                    returner.args = isSemiColonSeperated ? argsSemiColon : argsComma;
-                    return returner;
-                },
-                //
-                // A Mixin definition, with a list of parameters
-                //
-                //     .rounded (@radius: 2px, @color) {
-                //        ...
-                //     }
-                //
-                // Until we have a finer grained state-machine, we have to
-                // do a look-ahead, to make sure we don't have a mixin call.
-                // See the `rule` function for more information.
-                //
-                // We start by matching `.rounded (`, and then proceed on to
-                // the argument list, which has optional default values.
-                // We store the parameters in `params`, with a `value` key,
-                // if there is a value, such as in the case of `@radius`.
-                //
-                // Once we've got our params list, and a closing `)`, we parse
-                // the `{...}` block.
-                //
-                definition: function () {
-                    var name, params = [], match, ruleset, cond, variadic = false;
-                    if ((input.charAt(i) !== '.' && input.charAt(i) !== '#') ||
-                        peek(/^[^{]*\}/)) {
-                        return;
-                    }
-
-                    save();
-
-                    if (match = $(/^([#.](?:[\w-]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+)\s*\(/)) {
-                        name = match[1];
-
-                        var argInfo = this.mixin.args.call(this, false);
-                        params = argInfo.args;
-                        variadic = argInfo.variadic;
-
-                        // .mixincall("@{a}");
-                        // looks a bit like a mixin definition.. so we have to be nice and restore
-                        if (!$(')')) {
-                            furthest = i;
-                            restore();
-                        }
-                        
-                        $(this.comments);
-
-                        if ($(/^when/)) { // Guard
-                            cond = expect(this.conditions, 'expected condition');
-                        }
-
-                        ruleset = $(this.block);
-
-                        if (ruleset) {
-                            return new(tree.mixin.Definition)(name, params, ruleset, cond, variadic);
-                        } else {
-                            restore();
-                        }
-                    }
-                }
-            },
-
-            //
-            // Entities are the smallest recognized token,
-            // and can be found inside a rule's value.
-            //
-            entity: function () {
-                return $(this.entities.literal) || $(this.entities.variable) || $(this.entities.url) ||
-                       $(this.entities.call)    || $(this.entities.keyword)  ||$(this.entities.javascript) ||
-                       $(this.comment);
-            },
-
-            //
-            // A Rule terminator. Note that we use `peek()` to check for '}',
-            // because the `block` rule will be expecting it, but we still need to make sure
-            // it's there, if ';' was ommitted.
-            //
-            end: function () {
-                return $(';') || peek('}');
-            },
-
-            //
-            // IE's alpha function
-            //
-            //     alpha(opacity=88)
-            //
-            alpha: function () {
-                var value;
-
-                if (! $(/^\(opacity=/i)) { return; }
-                if (value = $(/^\d+/) || $(this.entities.variable)) {
-                    expect(')');
-                    return new(tree.Alpha)(value);
-                }
-            },
-
-            //
-            // A Selector Element
-            //
-            //     div
-            //     + h1
-            //     #socks
-            //     input[type="text"]
-            //
-            // Elements are the building blocks for Selectors,
-            // they are made out of a `Combinator` (see combinator rule),
-            // and an element name, such as a tag a class, or `*`.
-            //
-            element: function () {
-                var e, c, v;
-
-                c = $(this.combinator);
-
-                e = $(/^(?:\d+\.\d+|\d+)%/) || $(/^(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/) ||
-                    $('*') || $('&') || $(this.attribute) || $(/^\([^()@]+\)/) || $(/^[\.#](?=@)/) || $(this.entities.variableCurly);
-
-                if (! e) {
-                    if ($('(')) {
-                        if ((v = ($(this.selector))) &&
-                                $(')')) {
-                            e = new(tree.Paren)(v);
-                        }
-                    }
-                }
-
-                if (e) { return new(tree.Element)(c, e, i, env.currentFileInfo); }
-            },
-
-            //
-            // Combinators combine elements together, in a Selector.
-            //
-            // Because our parser isn't white-space sensitive, special care
-            // has to be taken, when parsing the descendant combinator, ` `,
-            // as it's an empty space. We have to check the previous character
-            // in the input, to see if it's a ` ` character. More info on how
-            // we deal with this in *combinator.js*.
-            //
-            combinator: function () {
-                var c = input.charAt(i);
-
-                if (c === '>' || c === '+' || c === '~' || c === '|') {
-                    i++;
-                    while (input.charAt(i).match(/\s/)) { i++; }
-                    return new(tree.Combinator)(c);
-                } else if (input.charAt(i - 1).match(/\s/)) {
-                    return new(tree.Combinator)(" ");
-                } else {
-                    return new(tree.Combinator)(null);
-                }
-            },
-            //
-            // A CSS selector (see selector below)
-            // with less extensions e.g. the ability to extend and guard
-            //
-            lessSelector: function () {
-                return this.selector(true);
-            },
-            //
-            // A CSS Selector
-            //
-            //     .class > div + h1
-            //     li a:hover
-            //
-            // Selectors are made out of one or more Elements, see above.
-            //
-            selector: function (isLess) {
-                var e, elements = [], c, extend, extendList = [], when, condition;
-
-                while ((isLess && (extend = $(this.extend))) || (isLess && (when = $(/^when/))) || (e = $(this.element))) {
-                    if (when) {
-                        condition = expect(this.conditions, 'expected condition');
-                    } else if (condition) {
-                        error("CSS guard can only be used at the end of selector");
-                    } else if (extend) {
-                        extendList.push.apply(extendList, extend);
-                    } else {
-                        if (extendList.length) {
-                            error("Extend can only be used at the end of selector");
-                        }
-                        c = input.charAt(i);
-                        elements.push(e);
-                        e = null;
-                    }
-                    if (c === '{' || c === '}' || c === ';' || c === ',' || c === ')') {
-                        break;
-                    }
-                }
-
-                if (elements.length > 0) { return new(tree.Selector)(elements, extendList, condition, i, env.currentFileInfo); }
-                if (extendList.length) { error("Extend must be used to extend a selector, it cannot be used on its own"); }
-            },
-            attribute: function () {
-                var key, val, op;
-
-                if (! $('[')) { return; }
-
-                if (!(key = $(this.entities.variableCurly))) {
-                    key = expect(/^(?:[_A-Za-z0-9-\*]*\|)?(?:[_A-Za-z0-9-]|\\.)+/);
-                }
-
-                if ((op = $(/^[|~*$^]?=/))) {
-                    val = $(this.entities.quoted) || $(/^[0-9]+%/) || $(/^[\w-]+/) || $(this.entities.variableCurly);
-                }
-
-                expect(']');
-
-                return new(tree.Attribute)(key, op, val);
-            },
-
-            //
-            // The `block` rule is used by `ruleset` and `mixin.definition`.
-            // It's a wrapper around the `primary` rule, with added `{}`.
-            //
-            block: function () {
-                var content;
-                if ($('{') && (content = $(this.primary)) && $('}')) {
-                    return content;
-                }
-            },
-
-            //
-            // div, .class, body > p {...}
-            //
-            ruleset: function () {
-                var selectors = [], s, rules, debugInfo;
-                
-                save();
-
-                if (env.dumpLineNumbers) {
-                    debugInfo = getDebugInfo(i, input, env);
-                }
-
-                while (s = $(this.lessSelector)) {
-                    selectors.push(s);
-                    $(this.comments);
-                    if (! $(',')) { break; }
-                    if (s.condition) {
-                        error("Guards are only currently allowed on a single selector.");
-                    }
-                    $(this.comments);
-                }
-
-                if (selectors.length > 0 && (rules = $(this.block))) {
-                    var ruleset = new(tree.Ruleset)(selectors, rules, env.strictImports);
-                    if (env.dumpLineNumbers) {
-                        ruleset.debugInfo = debugInfo;
-                    }
-                    return ruleset;
-                } else {
-                    // Backtrack
-                    furthest = i;
-                    restore();
-                }
-            },
-            rule: function (tryAnonymous) {
-                var name, value, c = input.charAt(i), important, merge = false;
-                save();
-
-                if (c === '.' || c === '#' || c === '&') { return; }
-
-                if (name = $(this.variable) || $(this.ruleProperty)) {
-                    // prefer to try to parse first if its a variable or we are compressing
-                    // but always fallback on the other one
-                    value = !tryAnonymous && (env.compress || (name.charAt(0) === '@')) ?
-                        ($(this.value) || $(this.anonymousValue)) :
-                        ($(this.anonymousValue) || $(this.value));
-
-
-                    important = $(this.important);
-                    if (name[name.length-1] === "+") {
-                        merge = true;
-                        name = name.substr(0, name.length - 1);
-                    }
-
-                    if (value && $(this.end)) {
-                        return new (tree.Rule)(name, value, important, merge, memo, env.currentFileInfo);
-                    } else {
-                        furthest = i;
-                        restore();
-                        if (value && !tryAnonymous) {
-                            return this.rule(true);
-                        }
-                    }
-                }
-            },
-            anonymousValue: function () {
-                var match;
-                if (match = /^([^@+\/'"*`(;{}-]*);/.exec(chunks[j])) {
-                    i += match[0].length - 1;
-                    return new(tree.Anonymous)(match[1]);
-                }
-            },
-
-            //
-            // An @import directive
-            //
-            //     @import "lib";
-            //
-            // Depending on our environemnt, importing is done differently:
-            // In the browser, it's an XHR request, in Node, it would be a
-            // file-system operation. The function used for importing is
-            // stored in `import`, which we pass to the Import constructor.
-            //
-            "import": function () {
-                var path, features, index = i;
-
-                save();
-
-                var dir = $(/^@import?\s+/);
-
-                var options = (dir ? $(this.importOptions) : null) || {};
-
-                if (dir && (path = $(this.entities.quoted) || $(this.entities.url))) {
-                    features = $(this.mediaFeatures);
-                    if ($(';')) {
-                        features = features && new(tree.Value)(features);
-                        return new(tree.Import)(path, features, options, index, env.currentFileInfo);
-                    }
-                }
-
-                restore();
-            },
-
-            importOptions: function() {
-                var o, options = {}, optionName, value;
-
-                // list of options, surrounded by parens
-                if (! $('(')) { return null; }
-                do {
-                    if (o = $(this.importOption)) {
-                        optionName = o;
-                        value = true;
-                        switch(optionName) {
-                            case "css":
-                                optionName = "less";
-                                value = false;
-                            break;
-                            case "once":
-                                optionName = "multiple";
-                                value = false;
-                            break;
-                        }
-                        options[optionName] = value;
-                        if (! $(',')) { break; }
-                    }
-                } while (o);
-                expect(')');
-                return options;
-            },
-
-            importOption: function() {
-                var opt = $(/^(less|css|multiple|once|inline|reference)/);
-                if (opt) {
-                    return opt[1];
-                }
-            },
-
-            mediaFeature: function () {
-                var e, p, nodes = [];
-
-                do {
-                    if (e = ($(this.entities.keyword) || $(this.entities.variable))) {
-                        nodes.push(e);
-                    } else if ($('(')) {
-                        p = $(this.property);
-                        e = $(this.value);
-                        if ($(')')) {
-                            if (p && e) {
-                                nodes.push(new(tree.Paren)(new(tree.Rule)(p, e, null, null, i, env.currentFileInfo, true)));
-                            } else if (e) {
-                                nodes.push(new(tree.Paren)(e));
-                            } else {
-                                return null;
-                            }
-                        } else { return null; }
-                    }
-                } while (e);
-
-                if (nodes.length > 0) {
-                    return new(tree.Expression)(nodes);
-                }
-            },
-
-            mediaFeatures: function () {
-                var e, features = [];
-
-                do {
-                  if (e = $(this.mediaFeature)) {
-                      features.push(e);
-                      if (! $(',')) { break; }
-                  } else if (e = $(this.entities.variable)) {
-                      features.push(e);
-                      if (! $(',')) { break; }
-                  }
-                } while (e);
-
-                return features.length > 0 ? features : null;
-            },
-
-            media: function () {
-                var features, rules, media, debugInfo;
-
-                if (env.dumpLineNumbers) {
-                    debugInfo = getDebugInfo(i, input, env);
-                }
-
-                if ($(/^@media/)) {
-                    features = $(this.mediaFeatures);
-
-                    if (rules = $(this.block)) {
-                        media = new(tree.Media)(rules, features, i, env.currentFileInfo);
-                        if (env.dumpLineNumbers) {
-                            media.debugInfo = debugInfo;
-                        }
-                        return media;
-                    }
-                }
-            },
-
-            //
-            // A CSS Directive
-            //
-            //     @charset "utf-8";
-            //
-            directive: function () {
-                var name, value, rules, nonVendorSpecificName,
-                    hasBlock, hasIdentifier, hasExpression, identifier;
-
-                if (input.charAt(i) !== '@') { return; }
-
-                if (value = $(this['import']) || $(this.media)) {
-                    return value;
-                }
-
-                save();
-
-                name = $(/^@[a-z-]+/);
-                
-                if (!name) { return; }
-
-                nonVendorSpecificName = name;
-                if (name.charAt(1) == '-' && name.indexOf('-', 2) > 0) {
-                    nonVendorSpecificName = "@" + name.slice(name.indexOf('-', 2) + 1);
-                }
-
-                switch(nonVendorSpecificName) {
-                    case "@font-face":
-                        hasBlock = true;
-                        break;
-                    case "@viewport":
-                    case "@top-left":
-                    case "@top-left-corner":
-                    case "@top-center":
-                    case "@top-right":
-                    case "@top-right-corner":
-                    case "@bottom-left":
-                    case "@bottom-left-corner":
-                    case "@bottom-center":
-                    case "@bottom-right":
-                    case "@bottom-right-corner":
-                    case "@left-top":
-                    case "@left-middle":
-                    case "@left-bottom":
-                    case "@right-top":
-                    case "@right-middle":
-                    case "@right-bottom":
-                        hasBlock = true;
-                        break;
-                    case "@host":
-                    case "@page":
-                    case "@document":
-                    case "@supports":
-                    case "@keyframes":
-                        hasBlock = true;
-                        hasIdentifier = true;
-                        break;
-                    case "@namespace":
-                        hasExpression = true;
-                        break;
-                }
-
-                if (hasIdentifier) {
-                    identifier = ($(/^[^{]+/) || '').trim();
-                    if (identifier) {
-                        name += " " + identifier;
-                    }
-                }
-
-                if (hasBlock)
-                {
-                    if (rules = $(this.block)) {
-                        return new(tree.Directive)(name, rules, i, env.currentFileInfo);
-                    }
-                } else {
-                    if ((value = hasExpression ? $(this.expression) : $(this.entity)) && $(';')) {
-                        var directive = new(tree.Directive)(name, value, i, env.currentFileInfo);
-                        if (env.dumpLineNumbers) {
-                            directive.debugInfo = getDebugInfo(i, input, env);
-                        }
-                        return directive;
-                    }
-                }
-
-                restore();
-            },
-
-            //
-            // A Value is a comma-delimited list of Expressions
-            //
-            //     font-family: Baskerville, Georgia, serif;
-            //
-            // In a Rule, a Value represents everything after the `:`,
-            // and before the `;`.
-            //
-            value: function () {
-                var e, expressions = [];
-
-                while (e = $(this.expression)) {
-                    expressions.push(e);
-                    if (! $(',')) { break; }
-                }
-
-                if (expressions.length > 0) {
-                    return new(tree.Value)(expressions);
-                }
-            },
-            important: function () {
-                if (input.charAt(i) === '!') {
-                    return $(/^! *important/);
-                }
-            },
-            sub: function () {
-                var a, e;
-
-                if ($('(')) {
-                    if (a = $(this.addition)) {
-                        e = new(tree.Expression)([a]);
-                        expect(')');
-                        e.parens = true;
-                        return e;
-                    }
-                }
-            },
-            multiplication: function () {
-                var m, a, op, operation, isSpaced;
-                if (m = $(this.operand)) {
-                    isSpaced = isWhitespace(input.charAt(i - 1));
-                    while (!peek(/^\/[*\/]/) && (op = ($('/') || $('*')))) {
-                        if (a = $(this.operand)) {
-                            m.parensInOp = true;
-                            a.parensInOp = true;
-                            operation = new(tree.Operation)(op, [operation || m, a], isSpaced);
-                            isSpaced = isWhitespace(input.charAt(i - 1));
-                        } else {
-                            break;
-                        }
-                    }
-                    return operation || m;
-                }
-            },
-            addition: function () {
-                var m, a, op, operation, isSpaced;
-                if (m = $(this.multiplication)) {
-                    isSpaced = isWhitespace(input.charAt(i - 1));
-                    while ((op = $(/^[-+]\s+/) || (!isSpaced && ($('+') || $('-')))) &&
-                           (a = $(this.multiplication))) {
-                        m.parensInOp = true;
-                        a.parensInOp = true;
-                        operation = new(tree.Operation)(op, [operation || m, a], isSpaced);
-                        isSpaced = isWhitespace(input.charAt(i - 1));
-                    }
-                    return operation || m;
-                }
-            },
-            conditions: function () {
-                var a, b, index = i, condition;
-
-                if (a = $(this.condition)) {
-                    while (peek(/^,\s*(not\s*)?\(/) && $(',') && (b = $(this.condition))) {
-                        condition = new(tree.Condition)('or', condition || a, b, index);
-                    }
-                    return condition || a;
-                }
-            },
-            condition: function () {
-                var a, b, c, op, index = i, negate = false;
-
-                if ($(/^not/)) { negate = true; }
-                expect('(');
-                if (a = $(this.addition) || $(this.entities.keyword) || $(this.entities.quoted)) {
-                    if (op = $(/^(?:>=|<=|=<|[<=>])/)) {
-                        if (b = $(this.addition) || $(this.entities.keyword) || $(this.entities.quoted)) {
-                            c = new(tree.Condition)(op, a, b, index, negate);
-                        } else {
-                            error('expected expression');
-                        }
-                    } else {
-                        c = new(tree.Condition)('=', a, new(tree.Keyword)('true'), index, negate);
-                    }
-                    expect(')');
-                    return $(/^and/) ? new(tree.Condition)('and', c, $(this.condition)) : c;
-                }
-            },
-
-            //
-            // An operand is anything that can be part of an operation,
-            // such as a Color, or a Variable
-            //
-            operand: function () {
-                var negate, p = input.charAt(i + 1);
-
-                if (input.charAt(i) === '-' && (p === '@' || p === '(')) { negate = $('-'); }
-                var o = $(this.sub) || $(this.entities.dimension) ||
-                        $(this.entities.color) || $(this.entities.variable) ||
-                        $(this.entities.call);
-
-                if (negate) {
-                    o.parensInOp = true;
-                    o = new(tree.Negative)(o);
-                }
-
-                return o;
-            },
-
-            //
-            // Expressions either represent mathematical operations,
-            // or white-space delimited Entities.
-            //
-            //     1px solid black
-            //     @var * 2
-            //
-            expression: function () {
-                var e, delim, entities = [];
-
-                while (e = $(this.addition) || $(this.entity)) {
-                    entities.push(e);
-                    // operations do not allow keyword "/" dimension (e.g. small/20px) so we support that here
-                    if (!peek(/^\/[\/*]/) && (delim = $('/'))) {
-                        entities.push(new(tree.Anonymous)(delim));
-                    }
-                }
-                if (entities.length > 0) {
-                    return new(tree.Expression)(entities);
-                }
-            },
-            property: function () {
-                var name;
-
-                if (name = $(/^(\*?-?[_a-zA-Z0-9-]+)\s*:/)) {
-                    return name[1];
-                }
-            },
-            ruleProperty: function () {
-                var name;
-
-                if (name = $(/^(\*?-?[_a-zA-Z0-9-]+)\s*(\+?)\s*:/)) {
-                    return name[1] + (name[2] || "");
-                }
-            }
-        }
-    };
-};
-
-
-(function (tree) {
-
-tree.functions = {
-    rgb: function (r, g, b) {
-        return this.rgba(r, g, b, 1.0);
-    },
-    rgba: function (r, g, b, a) {
-        var rgb = [r, g, b].map(function (c) { return scaled(c, 256); });
-        a = number(a);
-        return new(tree.Color)(rgb, a);
-    },
-    hsl: function (h, s, l) {
-        return this.hsla(h, s, l, 1.0);
-    },
-    hsla: function (h, s, l, a) {
-        function hue(h) {
-            h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
-            if      (h * 6 < 1) { return m1 + (m2 - m1) * h * 6; }
-            else if (h * 2 < 1) { return m2; }
-            else if (h * 3 < 2) { return m1 + (m2 - m1) * (2/3 - h) * 6; }
-            else                { return m1; }
-        }
-
-        h = (number(h) % 360) / 360;
-        s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
-
-        var m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
-        var m1 = l * 2 - m2;
-
-        return this.rgba(hue(h + 1/3) * 255,
-                         hue(h)       * 255,
-                         hue(h - 1/3) * 255,
-                         a);
-    },
-
-    hsv: function(h, s, v) {
-        return this.hsva(h, s, v, 1.0);
-    },
-
-    hsva: function(h, s, v, a) {
-        h = ((number(h) % 360) / 360) * 360;
-        s = number(s); v = number(v); a = number(a);
-
-        var i, f;
-        i = Math.floor((h / 60) % 6);
-        f = (h / 60) - i;
-
-        var vs = [v,
-                  v * (1 - s),
-                  v * (1 - f * s),
-                  v * (1 - (1 - f) * s)];
-        var perm = [[0, 3, 1],
-                    [2, 0, 1],
-                    [1, 0, 3],
-                    [1, 2, 0],
-                    [3, 1, 0],
-                    [0, 1, 2]];
-
-        return this.rgba(vs[perm[i][0]] * 255,
-                         vs[perm[i][1]] * 255,
-                         vs[perm[i][2]] * 255,
-                         a);
-    },
-
-    hue: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSL().h));
-    },
-    saturation: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSL().s * 100), '%');
-    },
-    lightness: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSL().l * 100), '%');
-    },
-    hsvhue: function(color) {
-        return new(tree.Dimension)(Math.round(color.toHSV().h));
-    },
-    hsvsaturation: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSV().s * 100), '%');
-    },
-    hsvvalue: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSV().v * 100), '%');
-    },
-    red: function (color) {
-        return new(tree.Dimension)(color.rgb[0]);
-    },
-    green: function (color) {
-        return new(tree.Dimension)(color.rgb[1]);
-    },
-    blue: function (color) {
-        return new(tree.Dimension)(color.rgb[2]);
-    },
-    alpha: function (color) {
-        return new(tree.Dimension)(color.toHSL().a);
-    },
-    luma: function (color) {
-        return new(tree.Dimension)(Math.round(color.luma() * color.alpha * 100), '%');
-    },
-    saturate: function (color, amount) {
-        // filter: saturate(3.2);
-        // should be kept as is, so check for color
-        if (!color.rgb) {
-            return null;
-        }
-        var hsl = color.toHSL();
-
-        hsl.s += amount.value / 100;
-        hsl.s = clamp(hsl.s);
-        return hsla(hsl);
-    },
-    desaturate: function (color, amount) {
-        var hsl = color.toHSL();
-
-        hsl.s -= amount.value / 100;
-        hsl.s = clamp(hsl.s);
-        return hsla(hsl);
-    },
-    lighten: function (color, amount) {
-        var hsl = color.toHSL();
-
-        hsl.l += amount.value / 100;
-        hsl.l = clamp(hsl.l);
-        return hsla(hsl);
-    },
-    darken: function (color, amount) {
-        var hsl = color.toHSL();
-
-        hsl.l -= amount.value / 100;
-        hsl.l = clamp(hsl.l);
-        return hsla(hsl);
-    },
-    fadein: function (color, amount) {
-        var hsl = color.toHSL();
-
-        hsl.a += amount.value / 100;
-        hsl.a = clamp(hsl.a);
-        return hsla(hsl);
-    },
-    fadeout: function (color, amount) {
-        var hsl = color.toHSL();
-
-        hsl.a -= amount.value / 100;
-        hsl.a = clamp(hsl.a);
-        return hsla(hsl);
-    },
-    fade: function (color, amount) {
-        var hsl = color.toHSL();
-
-        hsl.a = amount.value / 100;
-        hsl.a = clamp(hsl.a);
-        return hsla(hsl);
-    },
-    spin: function (color, amount) {
-        var hsl = color.toHSL();
-        var hue = (hsl.h + amount.value) % 360;
-
-        hsl.h = hue < 0 ? 360 + hue : hue;
-
-        return hsla(hsl);
-    },
-    //
-    // Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
-    // http://sass-lang.com
-    //
-    mix: function (color1, color2, weight) {
-        if (!weight) {
-            weight = new(tree.Dimension)(50);
-        }
-        var p = weight.value / 100.0;
-        var w = p * 2 - 1;
-        var a = color1.toHSL().a - color2.toHSL().a;
-
-        var w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
-        var w2 = 1 - w1;
-
-        var rgb = [color1.rgb[0] * w1 + color2.rgb[0] * w2,
-                   color1.rgb[1] * w1 + color2.rgb[1] * w2,
-                   color1.rgb[2] * w1 + color2.rgb[2] * w2];
-
-        var alpha = color1.alpha * p + color2.alpha * (1 - p);
-
-        return new(tree.Color)(rgb, alpha);
-    },
-    greyscale: function (color) {
-        return this.desaturate(color, new(tree.Dimension)(100));
-    },
-    contrast: function (color, dark, light, threshold) {
-        // filter: contrast(3.2);
-        // should be kept as is, so check for color
-        if (!color.rgb) {
-            return null;
-        }
-        if (typeof light === 'undefined') {
-            light = this.rgba(255, 255, 255, 1.0);
-        }
-        if (typeof dark === 'undefined') {
-            dark = this.rgba(0, 0, 0, 1.0);
-        }
-        //Figure out which is actually light and dark!
-        if (dark.luma() > light.luma()) {
-            var t = light;
-            light = dark;
-            dark = t;
-        }
-        if (typeof threshold === 'undefined') {
-            threshold = 0.43;
-        } else {
-            threshold = number(threshold);
-        }
-        if ((color.luma() * color.alpha) < threshold) {
-            return light;
-        } else {
-            return dark;
-        }
-    },
-    e: function (str) {
-        return new(tree.Anonymous)(str instanceof tree.JavaScript ? str.evaluated : str);
-    },
-    escape: function (str) {
-        return new(tree.Anonymous)(encodeURI(str.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B").replace(/\(/g, "%28").replace(/\)/g, "%29"));
-    },
-    '%': function (quoted /* arg, arg, ...*/) {
-        var args = Array.prototype.slice.call(arguments, 1),
-            str = quoted.value;
-
-        for (var i = 0; i < args.length; i++) {
-            /*jshint loopfunc:true */
-            str = str.replace(/%[sda]/i, function(token) {
-                var value = token.match(/s/i) ? args[i].value : args[i].toCSS();
-                return token.match(/[A-Z]$/) ? encodeURIComponent(value) : value;
-            });
-        }
-        str = str.replace(/%%/g, '%');
-        return new(tree.Quoted)('"' + str + '"', str);
-    },
-    unit: function (val, unit) {
-        if(!(val instanceof tree.Dimension)) {
-            throw { type: "Argument", message: "the first argument to unit must be a number" + (val instanceof tree.Operation ? ". Have you forgotten parenthesis?" : "") };
-        }
-        return new(tree.Dimension)(val.value, unit ? unit.toCSS() : "");
-    },
-    convert: function (val, unit) {
-        return val.convertTo(unit.value);
-    },
-    round: function (n, f) {
-        var fraction = typeof(f) === "undefined" ? 0 : f.value;
-        return this._math(function(num) { return num.toFixed(fraction); }, null, n);
-    },
-    pi: function () {
-        return new(tree.Dimension)(Math.PI);
-    },
-    mod: function(a, b) {
-        return new(tree.Dimension)(a.value % b.value, a.unit);
-    },
-    pow: function(x, y) {
-        if (typeof x === "number" && typeof y === "number") {
-            x = new(tree.Dimension)(x);
-            y = new(tree.Dimension)(y);
-        } else if (!(x instanceof tree.Dimension) || !(y instanceof tree.Dimension)) {
-            throw { type: "Argument", message: "arguments must be numbers" };
-        }
-
-        return new(tree.Dimension)(Math.pow(x.value, y.value), x.unit);
-    },
-    _math: function (fn, unit, n) {
-        if (n instanceof tree.Dimension) {
-            /*jshint eqnull:true */
-            return new(tree.Dimension)(fn(parseFloat(n.value)), unit == null ? n.unit : unit);
-        } else if (typeof(n) === 'number') {
-            return fn(n);
-        } else {
-            throw { type: "Argument", message: "argument must be a number" };
-        }
-    },
-    _minmax: function (isMin, args) {
-        args = Array.prototype.slice.call(args);
-        switch(args.length) {
-        case 0: throw { type: "Argument", message: "one or more arguments required" };
-        case 1: return args[0];
-        }
-        var i, j, current, currentUnified, referenceUnified, unit,
-            order  = [], // elems only contains original argument values.
-            values = {}; // key is the unit.toString() for unified tree.Dimension values,
-                         // value is the index into the order array.
-        for (i = 0; i < args.length; i++) {
-            current = args[i];
-            if (!(current instanceof tree.Dimension)) {
-                order.push(current);
-                continue;
-            }
-            currentUnified = current.unify();
-            unit = currentUnified.unit.toString();
-            j = values[unit];
-            if (j === undefined) {
-                values[unit] = order.length;
-                order.push(current);
-                continue;
-            }
-            referenceUnified = order[j].unify();
-            if ( isMin && currentUnified.value < referenceUnified.value ||
-                !isMin && currentUnified.value > referenceUnified.value) {
-                order[j] = current;
-            }
-        }
-        if (order.length == 1) {
-            return order[0];
-        }
-        args = order.map(function (a) { return a.toCSS(this.env); })
-                    .join(this.env.compress ? "," : ", ");
-        return new(tree.Anonymous)((isMin ? "min" : "max") + "(" + args + ")");
-    },
-    min: function () {
-        return this._minmax(true, arguments);
-    },
-    max: function () {
-        return this._minmax(false, arguments);
-    },
-    argb: function (color) {
-        return new(tree.Anonymous)(color.toARGB());
-
-    },
-    percentage: function (n) {
-        return new(tree.Dimension)(n.value * 100, '%');
-    },
-    color: function (n) {
-        if (n instanceof tree.Quoted) {
-            var colorCandidate = n.value,
-                returnColor;
-            returnColor = tree.Color.fromKeyword(colorCandidate);
-            if (returnColor) {
-                return returnColor;
-            }
-            if (/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/.test(colorCandidate)) {
-                return new(tree.Color)(colorCandidate.slice(1));
-            }
-            throw { type: "Argument", message: "argument must be a color keyword or 3/6 digit hex e.g. #FFF" };
-        } else {
-            throw { type: "Argument", message: "argument must be a string" };
-        }
-    },
-    iscolor: function (n) {
-        return this._isa(n, tree.Color);
-    },
-    isnumber: function (n) {
-        return this._isa(n, tree.Dimension);
-    },
-    isstring: function (n) {
-        return this._isa(n, tree.Quoted);
-    },
-    iskeyword: function (n) {
-        return this._isa(n, tree.Keyword);
-    },
-    isurl: function (n) {
-        return this._isa(n, tree.URL);
-    },
-    ispixel: function (n) {
-        return this.isunit(n, 'px');
-    },
-    ispercentage: function (n) {
-        return this.isunit(n, '%');
-    },
-    isem: function (n) {
-        return this.isunit(n, 'em');
-    },
-    isunit: function (n, unit) {
-        return (n instanceof tree.Dimension) && n.unit.is(unit.value || unit) ? tree.True : tree.False;
-    },
-    _isa: function (n, Type) {
-        return (n instanceof Type) ? tree.True : tree.False;
-    },
-    
-    /* Blending modes */
-    
-    multiply: function(color1, color2) {
-        var r = color1.rgb[0] * color2.rgb[0] / 255;
-        var g = color1.rgb[1] * color2.rgb[1] / 255;
-        var b = color1.rgb[2] * color2.rgb[2] / 255;
-        return this.rgb(r, g, b);
-    },
-    screen: function(color1, color2) {
-        var r = 255 - (255 - color1.rgb[0]) * (255 - color2.rgb[0]) / 255;
-        var g = 255 - (255 - color1.rgb[1]) * (255 - color2.rgb[1]) / 255;
-        var b = 255 - (255 - color1.rgb[2]) * (255 - color2.rgb[2]) / 255;
-        return this.rgb(r, g, b);
-    },
-    overlay: function(color1, color2) {
-        var r = color1.rgb[0] < 128 ? 2 * color1.rgb[0] * color2.rgb[0] / 255 : 255 - 2 * (255 - color1.rgb[0]) * (255 - color2.rgb[0]) / 255;
-        var g = color1.rgb[1] < 128 ? 2 * color1.rgb[1] * color2.rgb[1] / 255 : 255 - 2 * (255 - color1.rgb[1]) * (255 - color2.rgb[1]) / 255;
-        var b = color1.rgb[2] < 128 ? 2 * color1.rgb[2]&