diff --git a/web-resources/pom.xml b/web-resources/pom.xml
index 288f16452..e7db3fecd 100644
--- a/web-resources/pom.xml
+++ b/web-resources/pom.xml
@@ -8,7 +8,7 @@
org.n52.series-api2.0.0-SNAPSHOT
- jar
+ warSeries REST API - Web Resourcesweb-resources
@@ -228,7 +228,7 @@
generate-resources${project.build.directory}/rubygems/bin/jekyll
- build --trace --source ${project.basedir}/docs --destination ${project.build.outputDirectory}/docs
+ build --trace --source ${project.basedir}/docs --destination ${project.basedir}/src/main/webapp/docs
@@ -239,7 +239,7 @@
${project.build.directory}/rubygems/bin/jekyll
- serve --trace --source ${project.basedir}/docs --destination ${project.build.outputDirectory}/docs
+ serve --trace --source ${project.basedir}/docs --destination ${project.basedir}/src/main/webapp/docsnone
diff --git a/web-resources/src/main/java/org/n52/web/ctrl/LandingPageController.java b/web-resources/src/main/java/org/n52/web/ctrl/LandingPageController.java
deleted file mode 100644
index e6fef5fcf..000000000
--- a/web-resources/src/main/java/org/n52/web/ctrl/LandingPageController.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2013-2017 52°North Initiative for Geospatial Open Source
- * Software GmbH
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- *
- * If the program is linked with libraries which are licensed under one of
- * the following licenses, the combination of the program with the linked
- * library is not considered a "derivative work" of the program:
- *
- * - Apache License, version 2.0
- * - Apache Software License, version 1.0
- * - GNU Lesser General Public License, version 3
- * - Mozilla Public License, versions 1.0, 1.1 and 2.0
- * - Common Development and Distribution License (CDDL), version 1.0
- *
- * Therefore the distribution of the program linked with libraries licensed
- * under the aforementioned licenses, is permitted by the copyright holders
- * if the distribution is compliant with both the GNU General Public License
- * version 2 and the aforementioned licenses.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- */
-package org.n52.web.ctrl;
-
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.util.UrlPathHelper;
-
-import javax.servlet.http.HttpServletRequest;
-
-
-@Controller
-public class LandingPageController {
- private UrlPathHelper pathHelper = new UrlPathHelper();
-
- @RequestMapping(method = RequestMethod.GET)
- public String redirectToLandingPage(HttpServletRequest request) {
- String path = pathHelper.getPathWithinApplication(request);
- return "redirect:" + path + "/";
- }
-
- @RequestMapping("/")
- public String showLandingPage() {
- return "landing";
- }
-}
diff --git a/web-resources/src/main/webapp/.gitignore b/web-resources/src/main/webapp/.gitignore
new file mode 100644
index 000000000..5c457d797
--- /dev/null
+++ b/web-resources/src/main/webapp/.gitignore
@@ -0,0 +1 @@
+docs
\ No newline at end of file
diff --git a/web-resources/src/main/resources/landing/chart.png b/web-resources/src/main/webapp/landing/chart.png
similarity index 100%
rename from web-resources/src/main/resources/landing/chart.png
rename to web-resources/src/main/webapp/landing/chart.png
diff --git a/web-resources/src/main/resources/landing/landing.html b/web-resources/src/main/webapp/landing/landing.html
similarity index 89%
rename from web-resources/src/main/resources/landing/landing.html
rename to web-resources/src/main/webapp/landing/landing.html
index 086b251f6..6117b3169 100644
--- a/web-resources/src/main/resources/landing/landing.html
+++ b/web-resources/src/main/webapp/landing/landing.html
@@ -6,8 +6,8 @@
-
+
@@ -17,7 +17,7 @@
Series REST-API
${project.version}
The 52°North Series API provides a thin access layer to series datasets via RESTful Web binding. It provides different output formats like json, pdf or png.
Query the sensor status and get all the metadata you want with a simple REST interface. It is lightweight and can be utilized in many workflows. For example you can get a list of platforms.
+ 