Change packaging of module to war, fix urls

52North · Jun 13, 2017 · d3e1483 · d3e1483
1 parent 05ac325
commit d3e1483
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 61 deletions.
diff --git a/web-resources/pom.xml b/web-resources/pom.xml
@@ -8,7 +8,7 @@
         <groupId>org.n52.series-api</groupId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <name>Series REST API - Web Resources</name>
     <artifactId>web-resources</artifactId>
 
@@ -228,7 +228,7 @@
                                 <phase>generate-resources</phase>
                                 <configuration>
                                     <file>${project.build.directory}/rubygems/bin/jekyll</file>
-                                    <execArgs>build --trace --source ${project.basedir}/docs --destination ${project.build.outputDirectory}/docs</execArgs>
+                                    <execArgs>build --trace --source ${project.basedir}/docs --destination ${project.basedir}/src/main/webapp/docs</execArgs>
                                 </configuration>
                             </execution>
                             <execution>
@@ -239,7 +239,7 @@
                                 </goals>
                                 <configuration>
                                     <file>${project.build.directory}/rubygems/bin/jekyll</file>
-                                    <execArgs>serve --trace --source ${project.basedir}/docs --destination ${project.build.outputDirectory}/docs</execArgs>
+                                    <execArgs>serve --trace --source ${project.basedir}/docs --destination ${project.basedir}/src/main/webapp/docs</execArgs>
                                 </configuration>
                                 <phase>none</phase>
                             </execution>

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
diff --git a/web-resources/src/main/webapp/.gitignore b/web-resources/src/main/webapp/.gitignore
@@ -0,0 +1 @@
+docs
diff --git a/...rces/src/main/resources/landing/chart.png → ...sources/src/main/webapp/landing/chart.png b/...rces/src/main/resources/landing/chart.png → ...sources/src/main/webapp/landing/chart.png
diff --git a/...s/src/main/resources/landing/landing.html → ...rces/src/main/webapp/landing/landing.html b/...s/src/main/resources/landing/landing.html → ...rces/src/main/webapp/landing/landing.html
@@ -6,8 +6,8 @@
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 </head>
 <body>
     <a href="https://github.com/52North/series-rest-api"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/365986a132ccd6a44c23a9169022c0b5c890c387/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f7265645f6161303030302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"></a>
@@ -17,7 +17,7 @@
             <h1>Series REST-API</h1>
             <h4>${project.version}</h4>
             <p>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.</p>
-            <p><a class="btn btn-primary btn-lg" href="/docs/index.html" role="button">Learn more &raquo;</a></p>
+            <p><a class="btn btn-primary btn-lg" href="http://52north.github.io/series-rest-api/" role="button">Learn more &raquo;</a></p>
         </div>
     </div>
 
@@ -26,12 +26,12 @@ <h4>${project.version}</h4>
             <div class="col-md-4">
                 <h2>JSON</h2>
                 <p>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. </p>
-                <p><a class="btn btn-default" href="/api/v1/platforms/" role="button">Run example query &raquo;</a></p>
+                <p><a class="btn btn-default" href="${external.url}/api/platforms/" role="button">Run example query &raquo;</a></p>
             </div>
             <div class="col-md-4">
                 <h2>Graphs</h2>
                 <p>Plot the highly customizable graphs and use it within your apps.</p>
-                <img style="max-width: 100%; max-height: 100%" src="/landing/chart.png">
+                <img style="max-width: 100%; max-height: 100%" src="${external.url}/landing/chart.png">
             </div>
             <div class="col-md-4">
                 <h2>And more</h2>