From 41d4768810dbdd023043da40560c05c9f51436b2 Mon Sep 17 00:00:00 2001
From: Fabrice Gangler <fabrice@asqatasun.org>
Date: Sun, 18 Jun 2017 15:32:05 +0200
Subject: [PATCH] fixed #69 - tar.gz - Documentation files in html format

---
 CHANGELOG.md                             |  3 +-
 documentation/pom.xml                    | 65 ++++++++++++++++++++++++
 pom.xml                                  |  2 +-
 webapp/src/main/resources/descriptor.xml | 15 ++++--
 4 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 documentation/pom.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84968e4d..26721dee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,8 @@ none
 none
 
 ### Task
-none
+- [#68 - tar.gz - Changelog and readme files in html format](https://github.com/Asqatasun/Contrast-Finder/issues/68) 
+- [#69 - tar.gz - Documentation files in html format](https://github.com/Asqatasun/Contrast-Finder/issues/69) 
 
 
 Contrast-Finder 0.5.1, 2017-06-14
diff --git a/documentation/pom.xml b/documentation/pom.xml
new file mode 100644
index 00000000..5555b62b
--- /dev/null
+++ b/documentation/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.asqatasun</groupId>
+        <artifactId>contrast-finder</artifactId>
+        <version>0.5.2-dev</version>
+    </parent>
+    <artifactId>documentation</artifactId>
+    <version>0.5.2-dev</version>
+    <packaging>jar</packaging>
+
+    <name>contrast-finder-documentation</name>
+    <url>https://contrast-finder.org</url>
+    <organization>
+        <name>Asqatasun.org</name>
+        <url>http://asqatasun.org</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>GNU Affero General Public License v3.0</name>
+            <url>https://www.gnu.org/licenses/agpl-3.0.txt</url>
+            <distribution>manual</distribution>
+        </license>
+    </licenses>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.ruleoftech</groupId>
+            <artifactId>markdown-page-generator-plugin</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+               <plugin>
+                <groupId>com.ruleoftech</groupId>
+                <artifactId>markdown-page-generator-plugin</artifactId>
+                <version>1.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <inputDirectory>${project.basedir}/en/</inputDirectory>
+                    <outputDirectory>${project.build.directory}/doc_html/</outputDirectory>
+                    <inputEncoding>UTF-8</inputEncoding>
+                    <outputEncoding>UTF-8</outputEncoding>
+                    <copyDirectories>images/logo_contrast-finder/</copyDirectories>
+                    <copyDirectories>images/screenshot/</copyDirectories>
+                    <recursiveInput>true</recursiveInput>
+                    <transformRelativeMarkdownLinks>true</transformRelativeMarkdownLinks>
+                    <pegdownExtensions>TABLES,FENCED_CODE_BLOCKS,AUTOLINKS, ANCHORLINKS</pegdownExtensions>
+                    <!-- <pegdownExtensions>TABLES,FENCED_CODE_BLOCKS,AUTOLINKS, ANCHORLINKS, EXTANCHORLINKS</pegdownExtensions>  -->
+                    <headerHtmlFile>${project.basedir}/../engine/resources/src/main/resources/markdown/html/header.html</headerHtmlFile>
+                    <footerHtmlFile>${project.basedir}/../engine/resources/src/main/resources/markdown/html/footer.html</footerHtmlFile>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 7b1035a2..5e1a19f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
                                     the minimum version of Maven for maven plugins
                                     ............  mvn versions:display-plugin-updates     -->
     <modules>
-  <!--  <module>documentation</module>  -->
+        <module>documentation</module>
         <module>engine</module>
         <module>webapp</module>
     </modules>
diff --git a/webapp/src/main/resources/descriptor.xml b/webapp/src/main/resources/descriptor.xml
index 4f23d017..0a133318 100644
--- a/webapp/src/main/resources/descriptor.xml
+++ b/webapp/src/main/resources/descriptor.xml
@@ -55,8 +55,18 @@
             <fileMode>664</fileMode>
             <outputDirectory>/install/</outputDirectory>
         </fileSet>
-        <!-- Docs -->
+        <!-- Docs .html -->
         <fileSet>
+            <directory>${basedir}/../documentation/target/doc_html/</directory>
+            <includes>
+                <include>**/*</include>
+            </includes>
+            <fileMode>644</fileMode>
+            <outputDirectory>/documentation</outputDirectory>
+        </fileSet>
+
+        <!-- Docs .md-->
+ <!--   <fileSet>
             <directory>${basedir}/../documentation/en/</directory>
             <includes>
                 <include>**/*</include>
@@ -68,7 +78,6 @@
             </excludes>
             <fileMode>644</fileMode>
             <outputDirectory>/documentation</outputDirectory>
-        </fileSet>
-
+        </fileSet>    -->
     </fileSets>
 </assembly>