Contrast-Finder v0.7.0

---------------------- set version to 0.7.0 fixed Asqatasun#24 added color picker CSS - Adding bootstrap source files webapp: typo Fixed Asqatasun#62 differences between documentation in English and French webapp: typo Fixed Asqatasun#82 - Added .deb in tar.gz Fixed travis build Revert "Starting a Debian package" fixed Asqatasun#82 - create a debian package at the maven build test jdeb maven plugin Starting a Debian package set version to 0.6.1-dev
dzc34 · Jul 28, 2017 · 61d7d14 · 61d7d14
2 parents 7e00a17 + 19bbbb7
commit 61d7d14
Show file tree

Hide file tree

Showing 39 changed files with 7,899 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # CHANGELOG
 
+Contrast-Finder 0.7.0, 2017-07-28
+---------------------------------
+
+Upgrade-o-meter: just replace the .war file and restart Tomcat
+
+### New Feature
+- [#24 - Added color picker](https://github.com/Asqatasun/Contrast-Finder/issues/24)
+
+### Documentation
+- [#62 - Fixed of differences between documentation in English and French](https://github.com/Asqatasun/Contrast-Finder/issues/62)
+
+### Task
+- [#82 - Create a Debian package (.deb) at the maven build](https://github.com/Asqatasun/Contrast-Finder/issues/82)
+
+
 Contrast-Finder 0.6.0, 2017-07-21
 ---------------------------------
 
@@ -18,8 +33,6 @@ Upgrade-o-meter: just replace the .war file and restart Tomcat
 - [#79 - Pom.xml: added maven-checkstyle-plugin](https://github.com/Asqatasun/Contrast-Finder/issues/79) 
 
 
-
-
 Contrast-Finder 0.5.2, 2017-07-04
 ---------------------------------
 

diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile
@@ -1,7 +1,7 @@
 FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 LABEL org.label-schema.schema-version = "1.0.0-rc.1"                                            \
       org.label-schema.name           = "Contrast-Finder - WebApp"                              \
-      org.label-schema.version        = "0.6.0"                                             \
+      org.label-schema.version        = "0.7.0"                                             \
       org.label-schema.url            = "https://contrast-finder.org"                           \
       org.label-schema.vcs-url        = "https://github.com/Asqatasun/Contrast-Finder"          \
       org.label-schema.docker.cmd     = "docker run -p 8087:8080 -d asqatasun/contrast-finder"  \
@@ -13,9 +13,9 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
 #
 #   --- Building this docker image
 #   docker build -t asqatasun/contrast-finder  .
-#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.6.0  .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.6.0/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.6.0/contrast-finder_0.6.0.i386.tar.gz   .
+#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.7.0  .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.7.0/   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.7.0/contrast-finder_0.7.0.i386.tar.gz   .
 #
 #   --- Launch a container
 #   docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder
@@ -36,7 +36,7 @@ LABEL org.label-schema.schema-version = "1.0.0-rc.1"
 ###################################################################
 
 # build variables
-ARG CONTRAST_FINDER_RELEASE="0.6.0"
+ARG CONTRAST_FINDER_RELEASE="0.7.0"
 ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/download/v${CONTRAST_FINDER_RELEASE}"
 ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz"
 

diff --git a/docker/RELEASE/README.md b/docker/RELEASE/README.md
@@ -7,7 +7,8 @@ Tool to provide color combination for a good (accessible, WCAG-compliant) contra
 Supported tags and respective `Dockerfile` links :
 
 * [pre-requisites_from-Ubuntu](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile)
-* [v0.6.0, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.7.0, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.6.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.6.0/docker/RELEASE/Dockerfile)
 * [v0.5.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.2/docker/RELEASE/Dockerfile)
 * [v0.5.1](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.1/docker/RELEASE/Dockerfile)
 * [v0.5.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.0/docker/RELEASE/Dockerfile)

diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile
@@ -25,7 +25,7 @@ FROM tomcat:7.0-jre7
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.6.0"
+ENV CONTRAST_FINDER_RELEASE="0.7.0"
 ENV TOMCAT_WEBAPP_DIR="/usr/local/tomcat/webapps"
 
 # Prepare Contrast-Finder

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.6.0"
+ENV CONTRAST_FINDER_RELEASE="0.7.0"
 
 # Add contrast-finder .war
 ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz  /root

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-default-algo/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.6.0"
+ENV CONTRAST_FINDER_RELEASE="0.7.0"
 ENV CONF_DEFAULT_ALGO="Rgb"
     # ENV CONF_DEFAULT_ALGO="Rgb"
     # ENV CONF_DEFAULT_ALGO="HSV"

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-env_debug/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.6.0"
+ENV CONTRAST_FINDER_RELEASE="0.7.0"
 ENV CONF_ENV="debug"
 
 # Add contrast-finder .war

diff --git a/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/test_conf-piwik/Dockerfile
@@ -19,7 +19,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu
 ###################################################################
 
 # environment variables
-ENV CONTRAST_FINDER_RELEASE="0.6.0"
+ENV CONTRAST_FINDER_RELEASE="0.7.0"
 ENV PIWIK_KEY="9"
 ENV PIWIK_URL="http://localhost/piwik/"
 

diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:14.04
 LABEL org.label-schema.schema-version = "1.0.0-rc.1"                                            \
       org.label-schema.name           = "Contrast-Finder - WebApp pre-requisites"               \
-      org.label-schema.version        = "0.6.0"                                             \
+      org.label-schema.version        = "0.7.0"                                             \
       org.label-schema.url            = "https://contrast-finder.org"                           \
       org.label-schema.vcs-url        = "https://github.com/Asqatasun/Contrast-Finder"
           # ----> documentation  http://label-schema.org/

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>documentation</artifactId>
     <packaging>pom</packaging>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <name>contrast-finder-documentation</name>
     <licenses>
         <license>

diff --git a/engine/api/pom.xml b/engine/api/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>jar</packaging>
     <name>api</name>
     <licenses>

diff --git a/engine/hsv/pom.xml b/engine/hsv/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>jar</packaging>
     <name>hsv</name>
     <licenses>

diff --git a/engine/impl/pom.xml b/engine/impl/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>jar</packaging>
     <name>impl</name>
     <licenses>

diff --git a/engine/pom.xml b/engine/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>engine</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>pom</packaging>
     <name>contrast-finder-engine</name>
     <licenses>

diff --git a/engine/utils/pom.xml b/engine/utils/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>engine</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>jar</packaging>
     <name>utils</name>
     <licenses>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
     <packaging>pom</packaging>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <name>Contrast-Finder</name>
     <licenses>
         <license>
@@ -17,9 +17,9 @@
     <organization>
         <name>Asqatasun.org</name>
         <url>http://asqatasun.org</url>
-    </organization>    
+    </organization>
     <description>
-        Find valid background / foreground color contrast for accessibility (a11y, WCAG)
+        Finds correct color contrasts for web accessibility (a11y, WCAG)
     </description>
 
     <modules>
@@ -49,7 +49,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.20</version>
-                <configuration> 
+                <configuration>
                     <skipTests>false</skipTests>
                 </configuration>
             </plugin>

diff --git a/webapp/pom.xml b/webapp/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <artifactId>webapp</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
     <packaging>war</packaging>
     <name>contrast-finder-webapp</name>
     <licenses>
@@ -21,7 +21,7 @@
     <organization>
         <name>Asqatasun.org</name>
         <url>http://asqatasun.org</url>
-    </organization>    
+    </organization>
 
     <properties>
         <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
@@ -200,11 +200,12 @@
                         <goal>compress</goal>
                     </goals>
                 </execution>
-                </executions>        
+                </executions>
                 <configuration>
                     <excludes>
                         <exclude>**/*min.js</exclude>
                         <exclude>**/*min.css</exclude>
+                        <exclude>*_src/*.css</exclude>
                     </excludes>
                     <failOnWarning>false</failOnWarning>
                     <aggregations>
@@ -221,6 +222,9 @@
                             <includes>
                                 <include>**/*min.css</include>
                             </includes>
+                            <excludes>
+                                 <exclude>*_src/*.css</exclude>
+                            </excludes>
                         </aggregation>
                     </aggregations>
                 </configuration>
@@ -247,6 +251,74 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <artifactId>jdeb</artifactId>
+                <groupId>org.vafer</groupId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jdeb</goal>
+                        </goals>
+                        <configuration>
+                            <deb>${project.build.directory}/contrast-finder_${project.version}.deb</deb>
+                            <verbose>true</verbose>
+                            <controlDir>${project.basedir}/src/deb/control</controlDir>
+                            <dataSet>
+                                <data>
+                                    <type>template</type>
+                                    <paths>
+                                        <path>/etc/contrast-finder</path>
+                                        <path>/var/log/contrast-finder</path>
+                                    </paths>
+                                </data>
+                                <data> <!-- symlink-should-be-relative -->
+                                    <type>link</type>
+                                    <symlink>true</symlink>
+                                    <linkName>/usr/share/tomcat7/lib/spring3-instrument-tomcat.jar</linkName>
+                                    <linkTarget>../../java/spring3-instrument-tomcat.jar</linkTarget>
+                                </data>
+                                <data>
+                                    <conffile>true</conffile>
+                                    <type>file</type>
+                                    <src>${project.basedir}/src/main/resources/conf/contrast-finder.conf.dist</src>
+                                    <dst>/etc/contrast-finder/contrast-finder.conf.dist</dst>
+                                    <mapper>
+                                      <type>perm</type>
+                                      <user>tomcat7</user>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <type>file</type>
+                                    <src>${project.basedir}/src/main/resources/conf/contrast-finder.log</src>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/var/log/contrast-finder</prefix>
+                                        <user>tomcat7</user>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <type>file</type>
+                                    <src>${project.build.directory}/contrast-finder-webapp-${project.version}.war</src>
+                                    <dst>contrast-finder.war</dst>
+                                    <mapper>
+                                        <type>perm</type>
+                                        <prefix>/var/lib/tomcat7/webapps</prefix>
+                                        <user>tomcat7</user>
+                                    </mapper>
+                                </data>
+                                <data>
+                                    <type>file</type>
+                                    <src>${project.basedir}/src/deb/copyright</src>
+                                    <dst>/usr/share/doc/contrast-finder-webapp/copyright</dst>
+                                </data>
+                            </dataSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <finalName>contrast-finder-webapp-${project.version}</finalName>
     </build>

diff --git a/webapp/src/deb/README.txt b/webapp/src/deb/README.txt
@@ -0,0 +1,29 @@
+
+    # install contrast-finder-webapp + dependencies
+    dpkg    -i *.deb
+    apt-get -f install
+
+              # in your browser
+              # http://localhost:8080/contrast-finder/
+
+
+    # uninstall  contrast-finder
+    dpkg  --purge  contrast-finder-webapp
+
+            # or
+            # uninstall contrast-finder + dependencies
+            dpkg  --purge   contrast-finder-webapp
+            apt-get remove tomcat7 libspring-instrument-java 
+            apt-get autoremove
+
+
+    # See package information
+    dpkg -l contrast-finder-webapp tomcat7 libspring-instrument-java 
+
+    # Check directories and files
+    ls -l /var/lib/tomcat7/webapps
+    ls -l /etc/contrast-finder
+    ls -l /var/log/contrast-finder/
+    ls -l /usr/share/tomcat7/lib/spring3-instrument-tomcat* 
+
+