Packaging resources in jar, link to jekyll docs

52North · May 31, 2017 · 05ac325 · 05ac325
1 parent cd0faa2
commit 05ac325
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/web-resources/docs/_config.yml b/web-resources/docs/_config.yml
@@ -16,7 +16,7 @@ url:
 # (http://yourusername.github.io/repository-name)
 # and NOT your User repository (http://yourusername.github.io)
 # then add in the baseurl here, like this: "/repository-name"
-baseurl: ""
+baseurl: "/docs"
 
 permalink: /:title/
 

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>war</packaging>
+    <packaging>jar</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}/generated-docs</execArgs>
+                                    <execArgs>build --trace --source ${project.basedir}/docs --destination ${project.build.outputDirectory}/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}/generated-docs</execArgs>
+                                    <execArgs>serve --trace --source ${project.basedir}/docs --destination ${project.build.outputDirectory}/docs</execArgs>
                                 </configuration>
                                 <phase>none</phase>
                             </execution>

diff --git a/...sources/src/main/webapp/landing/chart.png → ...rces/src/main/resources/landing/chart.png b/...sources/src/main/webapp/landing/chart.png → ...rces/src/main/resources/landing/chart.png
diff --git a/...rces/src/main/webapp/landing/landing.html → ...s/src/main/resources/landing/landing.html b/...rces/src/main/webapp/landing/landing.html → ...s/src/main/resources/landing/landing.html
@@ -14,9 +14,10 @@
 
     <div class="jumbotron">
         <div class="container">
-            <h1>Series REST-API<sup><sup><sub>${project.version}</sub></sup></sup></h1>
+            <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="http://52north.github.io/series-rest-api/" role="button">Learn more &raquo;</a></p>
+            <p><a class="btn btn-primary btn-lg" href="/docs/index.html" role="button">Learn more &raquo;</a></p>
         </div>
     </div>