Contrast-Finder v0.5.1

---------------------- set version to 0.5.1 typo (js) Fixed Asqatasun#65 - Upgraded spring-security to v4.2.3 fix refactor refactor typo fixed js Fixed Asqatasun#64 - Moved contrast-finder.log|.conf files into webapp directory Class AbstractColorFinderImplImpl: minor fix Fixed Asqatasun#63 - Allowed "rgb(255,255,255" for "rgb(255,255,255)" in the form Javascript - Fixed some codacy "code style" Fixed some codacy "error prone" Javascript - Fixed some codacy "code style" Updated package names (in lower case) Fixed some codacy "error prone" + "code style" README - Added codacy.com badge JS typo: "DarkOrange" instead of "Darkorange" Fixed Asqatasun#61 - Added missing color names (*Grey + RebeccaPurple) Used str.equals("") instead of str == "" set version to 0.5.1-dev
dzc34 · Jun 13, 2017 · 6c1d544 · 6c1d544
2 parents 528eb7d + 5e8b0f0
commit 6c1d544
Show file tree

Hide file tree

Showing 139 changed files with 357 additions and 374 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,31 @@
 
+Contrast-Finder 0.5.1, 2017-06-14
+---------------------------------
+
+Features:
+none
+
+Security:
+- [#65 - Upgraded spring-security to v4.2.3](https://github.com/Asqatasun/Contrast-Finder/issues/65) 
+
+Bugs:
+- [#61 - Added missing color names (*Grey + RebeccaPurple)](https://github.com/Asqatasun/Contrast-Finder/issues/61)
+- [#63 - Allowed "rgb(255,255,255" value for "rgb(255,255,255)" in the form](https://github.com/Asqatasun/Contrast-Finder/issues/63)
+- Fixed some codacy "error prone" + "code style" 
+
+Refactoring:
+- [#66 - Modified project directories](https://github.com/Asqatasun/Contrast-Finder/issues/66)  
+- [#64 - Moved contrast-finder.log|.conf files into webapp directory](https://github.com/Asqatasun/Contrast-Finder/issues/64) 
+
+Configuration: 
+none
+
+Documentation:
+none
+
+Upgrade-o-meter: just replace the .war file and restart Tomcat
+
+
 Contrast-Finder 0.5.0, 2017-06-09
 ---------------------------------
 

diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 [![Build Status](https://travis-ci.org/Asqatasun/Contrast-Finder.svg)](https://travis-ci.org/Asqatasun/Contrast-Finder)
 [![Release](https://img.shields.io/github/release/asqatasun/Contrast-Finder.svg)](https://github.com/Asqatasun/Contrast-Finder/releases/latest)
 [![Dependency Status](https://www.versioneye.com/user/projects/58fb3e17c2ef423822580804/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/58fb3e17c2ef423822580804?child=summary#tab-dependencies)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/c3374c9913d24a9c91e91552f1796672)](https://www.codacy.com/app/Asqatasun/Contrast-Finder)
 
 # Contrast-Finder
 

diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml
diff --git a/contrast-finder-resources/src/main/resources/contrast-finder.log b/contrast-finder-resources/src/main/resources/contrast-finder.log
diff --git a/contrast-finder-webapp/nb-configuration.xml b/contrast-finder-webapp/nb-configuration.xml
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf~ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf~
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.5.0"                                             \
+      org.label-schema.version        = "0.5.1"                                             \
       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.5.0  .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.0/   .
-#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.0/contrast-finder_0.5.0.i386.tar.gz   .
+#   docker build -t asqatasun/contrast-finder  --build-arg CONTRAST_FINDER_RELEASE=0.5.1  .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.1/   .
+#   docker build -t asqatasun/contrast-finder  --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.5.1/contrast-finder_0.5.1.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.5.0"
+ARG CONTRAST_FINDER_RELEASE="0.5.1"
 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,13 +7,10 @@ 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.5.0, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.5.1, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile)
+* [v0.5.0](https://github.com/Asqatasun/Contrast-Finder/blob/v0.5.0/docker/RELEASE/Dockerfile)
 * [v0.4.7](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.7/docker/RELEASE/Dockerfile)
 * [v0.4.6](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.6/docker/RELEASE/Dockerfile)
-* [v0.4.5](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.5/docker/RELEASE/Dockerfile)
-* [v0.4.4](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.4/docker/RELEASE/Dockerfile)
-* [v0.4.3](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.3/docker/RELEASE/Dockerfile)
-* [v0.4.2](https://github.com/Asqatasun/Contrast-Finder/blob/v0.4.2/docker/RELEASE/Dockerfile)
 
 ## How to use this image
 `docker pull asqatasun/contrast-finder` 

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.5.0"
+ENV CONTRAST_FINDER_RELEASE="0.5.1"
 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.5.0"
+ENV CONTRAST_FINDER_RELEASE="0.5.1"
 
 # 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.5.0"
+ENV CONTRAST_FINDER_RELEASE="0.5.1"
 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.5.0"
+ENV CONTRAST_FINDER_RELEASE="0.5.1"
 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.5.0"
+ENV CONTRAST_FINDER_RELEASE="0.5.1"
 ENV PIWIK_KEY="9"
 ENV PIWIK_URL="http://localhost/piwik/"
 

diff --git a/docker/compile_and_build_docker_image.sh b/docker/compile_and_build_docker_image.sh
@@ -124,7 +124,7 @@ fail() {
 #############################################
 
 
-TGZ_BASENAME="contrast-finder-webapp/target/contrast-finder"
+TGZ_BASENAME="webapp/target/contrast-finder"
 TGZ_EXT=".tar.gz"
 ADD_IP=''
 URL="http://localhost:${CONTAINER_EXPOSED_PORT}/contrast-finder/"

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.5.0"                                             \
+      org.label-schema.version        = "0.5.1"                                             \
       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/contrast-finder-api/pom.xml → engine/api/pom.xml b/contrast-finder-api/pom.xml → engine/api/pom.xml
@@ -3,14 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.asqatasun</groupId>
-        <artifactId>contrast-finder</artifactId>
-        <version>0.5.0</version>
+        <artifactId>engine</artifactId>
+        <version>0.5.1</version>
     </parent>
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.5.0</version>
+    <version>0.5.1</version>
+    <name>api</name>
     <packaging>jar</packaging>
 
-    <name>contrast-finder-api</name>
     <url>https://contrast-finder.org</url>
     <organization>
         <name>Asqatasun.org</name>

diff --git a/...n/contrastFinder/AbstractColorFinder.java → ...n/contrastfinder/AbstractColorFinder.java b/...n/contrastFinder/AbstractColorFinder.java → ...n/contrastfinder/AbstractColorFinder.java
@@ -17,15 +17,15 @@
  *
  * Contact us by mail: asqatasun AT asqatasun DOT org
  */
-package org.asqatasun.contrastFinder;
+package org.asqatasun.contrastfinder;
 
 import java.awt.Color;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.asqatasun.contrastFinder.result.ColorCombinaison;
-import org.asqatasun.contrastFinder.result.ColorResult;
-import org.asqatasun.contrastFinder.result.factory.ColorCombinaisonFactory;
-import org.asqatasun.contrastFinder.result.factory.ColorResultFactory;
+import org.asqatasun.contrastfinder.result.ColorCombinaison;
+import org.asqatasun.contrastfinder.result.ColorResult;
+import org.asqatasun.contrastfinder.result.factory.ColorCombinaisonFactory;
+import org.asqatasun.contrastfinder.result.factory.ColorResultFactory;
 import org.asqatasun.utils.contrastchecker.ContrastChecker;
 
 /**
@@ -40,31 +40,26 @@ public abstract class AbstractColorFinder implements ColorFinder {
     private static final float MAX_COEFFICIENT_LEVEL = 2.5f;
     protected static final float UNITARY_STEP_HUE = (MIN_HUE / MAX_HUE);
     private ColorResultFactory colorResultFactory;
+    private ColorCombinaisonFactory colorCombinaisonFactory;
+    private Color colorToKeep;       /* the color to keep, will not be modified during test */
+    private Float coefficientLevel;  /* the coefficient level to apply*/
+    private ColorResult colorResult; /* the colorResult that handles the results of the test*/
 
     public ColorResultFactory getColorResultFactory() {
             return colorResultFactory;
-        }
-
-
-    private ColorCombinaisonFactory colorCombinaisonFactory;
+    }
 
     public ColorCombinaisonFactory getColorCombinaisonFactory() {
         return colorCombinaisonFactory;
     }
-    /* the color to keep, will not be modified during test */
-    private Color colorToKeep;
 
     public Color getColorToKeep() {
         return colorToKeep;
     }
-    /* the coefficient level to apply*/
-    private Float coefficientLevel;
 
     public Float getCoefficientLevel() {
         return coefficientLevel;
     }
-    /* the colorResult that handles the results of the test*/
-    private ColorResult colorResult;
 
     @Override
     public ColorResult getColorResult() {

diff --git a/...asqatasun/contrastFinder/ColorFinder.java → ...asqatasun/contrastfinder/ColorFinder.java b/...asqatasun/contrastFinder/ColorFinder.java → ...asqatasun/contrastfinder/ColorFinder.java
@@ -17,10 +17,10 @@
  *
  * Contact us by mail: asqatasun AT asqatasun DOT org
  */ 
-package org.asqatasun.contrastFinder;
+package org.asqatasun.contrastfinder;
 
 import java.awt.Color;
-import org.asqatasun.contrastFinder.result.ColorResult;
+import org.asqatasun.contrastfinder.result.ColorResult;
 
 /**
  *

diff --git a/...astFinder/factory/ColorFinderFactory.java → ...astfinder/factory/ColorFinderFactory.java b/...astFinder/factory/ColorFinderFactory.java → ...astfinder/factory/ColorFinderFactory.java
@@ -18,8 +18,8 @@
  * Contact us by mail: asqatasun AT asqatasun DOT org
  */ 
 
-package org.asqatasun.contrastFinder.factory;
-import org.asqatasun.contrastFinder.ColorFinder;
+package org.asqatasun.contrastfinder.factory;
+import org.asqatasun.contrastfinder.ColorFinder;
 
 /**
  * 

diff --git a/...ntrastFinder/result/ColorCombinaison.java → ...ntrastfinder/result/ColorCombinaison.java b/...ntrastFinder/result/ColorCombinaison.java → ...ntrastfinder/result/ColorCombinaison.java
@@ -18,7 +18,7 @@
  * Contact us by mail: asqatasun AT asqatasun DOT org
  */ 
 
-package org.asqatasun.contrastFinder.result;
+package org.asqatasun.contrastfinder.result;
 
 import java.awt.Color;