Contrast-Finder v0.4.5

---------------------- set version to 0.4.5 fixed CHANGELOG webapp LOG: fixed daily rollover update CHANGELOG fixed #34 HTML errors typo delete unused file webapp - Updated *.xml: Delete *.xsd if not used (2/2) Updated CHANGELOG webapp - Updated *.xml: Delete *.xsd if not used Fixed #31 - Revert "webapp: added HTTP security headers (fixed #23)" webapp - Updated *.xml (spring-*-4.3.xsd instead of spring-*-2.5.xsd) contrast-finder-webapp : fixed Logback configuration updated .gitignore Updated CHANGELOG contrast-finder-webapp: updated pom.xml contrast-finder-webapp: upgraded springframework.security (4.2.2 instead of 4.2.1) contrast-finder-webapp: upgraded springframework (4.3.7 instead of 4.3.6) contrast-finder-webapp : updated Logback configuration fix DockerFile contrast-finder-webapp : added Logback configuration contrast-finder-hsv/src/test/ : added Logback configuration Changed LOG dependency (logback + slf4j instead of log4j) DOC - Updated "Other contrast tools" (typo) DOC - Updated "Other contrast tools" Updated contrast-finder_fr.properties (small fix) typo fixed #30 - i18n - punctuation errors in english fixed #29 webApp - lang-switcher: error on the lang attribute .jsp - added appVersion .jsp - added comments set version to 0.4.5-dev
Asqatasun · Mar 29, 2017 · d77959e · d77959e
2 parents e79eda0 + d1b3a10
commit d77959e
Show file tree

Hide file tree

Showing 47 changed files with 494 additions and 397 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -24,4 +24,4 @@
 ## Screenshots (if appropriate)
 
 
-(by the way, thank you **very** much for contributing to Asqatasun!)
+(by the way, thank you **very** much for contributing to Contrast-Finder!)
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 *.war
 *.ear
 *.tar.gz
+*.tar.gz.*
 
 # maven
 target

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,32 @@
 
+Contrast-Finder 0.4.5, 2017-03-30
+---------------------------------
+
+Features:
+none
+
+Security:
+- [#33 - Upgraded SpringFramework to v4.3.7](https://github.com/Asqatasun/Contrast-Finder/issues/33)
+- revert [#23 - Added HTTP security headers](https://github.com/Asqatasun/Contrast-Finder/issues/23)
+
+Bugs:
+- [#34 - Fixed HTML errors](https://github.com/Asqatasun/Contrast-Finder/issues/34)
+- [#29 - Fixed lang-switcher: error on the lang attribute](https://github.com/Asqatasun/Contrast-Finder/issues/29)
+- [#30 - Fixed punctuation errors in english](https://github.com/Asqatasun/Contrast-Finder/issues/30)
+- [#31 - Fixed front-end webperf regression (repeat view)](https://github.com/Asqatasun/Contrast-Finder/issues/31)
+  - revert [#23 - Added HTTP security headers](https://github.com/Asqatasun/Contrast-Finder/issues/23)
+
+Configuration:
+- [#32 - Changed LOG dependency: logback + slf4j instead of log4j](https://github.com/Asqatasun/Contrast-Finder/issues/32)
+- .jsp - Added appVersion
+
+Documentation:
+none
+
+Upgrade-o-meter:
+just replace the .war file and restart Tomcat
+
+
 Contrast-Finder 0.4.4, 2017-02-12
 ---------------------------------
 
@@ -20,7 +48,7 @@ Configuration:
 none
 
 Documentation:
-none
+- explained ratio
 
 Upgrade-o-meter:
 just replace the .war file and restart Tomcat

diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.4</version>
+        <version>0.4.5</version>
     </parent>
 
     <artifactId>contrast-finder-api</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
     <packaging>jar</packaging>
     <name>contrast-finder-api</name>
 
@@ -22,9 +22,9 @@
             <artifactId>junit</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.1</version>
             <type>jar</type>
         </dependency>
     </dependencies>

diff --git a/contrast-finder-api/src/main/java/org/asqatasun/contrastFinder/AbstractColorFinder.java b/contrast-finder-api/src/main/java/org/asqatasun/contrastFinder/AbstractColorFinder.java
@@ -20,7 +20,8 @@
 package org.asqatasun.contrastFinder;
 
 import java.awt.Color;
-import org.apache.log4j.Logger;
+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;
@@ -33,7 +34,7 @@
  */
 public abstract class AbstractColorFinder implements ColorFinder {
 
-    private static final Logger LOGGER = Logger.getLogger(AbstractColorFinder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractColorFinder.class);
     private static final float MAX_HUE = 360.0f;
     private static final float MIN_HUE = 1.0f;
     private static final float MAX_COEFFICIENT_LEVEL = 2.5f;

diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.4</version>
+        <version>0.4.5</version>
     </parent>
     <artifactId>contrast-finder-hsv</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
     <packaging>jar</packaging>
     <name>contrast-finder-hsv</name>
     <build>
@@ -55,8 +55,8 @@
             <artifactId>contrast-finder-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
     </dependencies>
 </project>

diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsv.java b/contrast-finder-hsv/src/main/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsv.java
@@ -22,7 +22,8 @@
 import java.awt.Color;
 import java.util.Collection;
 import java.util.HashSet;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastFinder.AbstractColorFinder;
 import org.asqatasun.contrastFinder.result.factory.ColorCombinaisonFactoryImpl;
 import org.asqatasun.contrastFinder.result.factory.ColorResultFactoryImpl;
@@ -35,7 +36,7 @@
  */
 public class ColorFinderHsv extends AbstractColorFinder {
 
-    private static final Logger LOGGER = Logger.getLogger(ColorFinderHsv.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorFinderHsv.class);
     private static final float STEP_BRIGHTNESS = 0.1f;
     private static final float STEP_SATURATION = 0.1f;
     private static final float STEP_HUE = 0.1f;

diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsycho.java b/contrast-finder-hsv/src/main/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsycho.java
@@ -20,7 +20,8 @@
 package org.asqatasun.contrastFinder.hsv;
 
 import java.awt.Color;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastFinder.AbstractColorFinder;
 import org.asqatasun.contrastFinder.result.ColorCombinaison;
 import org.asqatasun.contrastFinder.result.factory.ColorCombinaisonFactoryImpl;
@@ -33,7 +34,7 @@
  */
 public class ColorFinderHsvPsycho extends AbstractColorFinder {
 
-    private static final Logger LOGGER = Logger.getLogger(ColorFinderHsvPsycho.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorFinderHsvPsycho.class);
     private static final float STEP_BRIGHTNESS = 0.01f;
     private static final float STEP_SATURATION = 0.01f;
     private static final float NO_CHANGE_COMPONENT = 0.0f;

diff --git a/contrast-finder-hsv/src/main/java/org/asqatasun/contrastFinder/hsv/ColorFinderRgb.java b/contrast-finder-hsv/src/main/java/org/asqatasun/contrastFinder/hsv/ColorFinderRgb.java
@@ -21,7 +21,8 @@
 
 import java.awt.Color;
 import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastFinder.AbstractColorFinder;
 import org.asqatasun.contrastFinder.result.ColorCombinaison;
 import org.asqatasun.contrastFinder.result.factory.ColorCombinaisonFactoryImpl;
@@ -34,7 +35,7 @@
  */
 public class ColorFinderRgb extends AbstractColorFinder {
 
-    private static final Logger LOGGER = Logger.getLogger(ColorFinderRgb.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorFinderRgb.class);
     private static final int STEP = 1;
     private static final int NO_CHANGE_COMPONENT = 0;
     private static final int MAX_POSSIBLE_VALUE = 255;

diff --git a/...t-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsychoTest.java b/...t-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsychoTest.java
@@ -9,7 +9,8 @@
 import java.util.List;
 import static junit.framework.Assert.assertEquals;
 import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastFinder.result.ColorCombinaison;
 import org.asqatasun.utils.colorconvertor.ColorConverter;
 
@@ -19,7 +20,7 @@
  */
 public class ColorFinderHsvPsychoTest extends TestCase {
     private static final float STEP_HUE = (1.0f/360.0f);
-    private static final Logger LOGGER = Logger.getLogger(ColorFinderHsvPsychoTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorFinderHsvPsychoTest.class);
 
     public ColorFinderHsvPsychoTest(String testName) {
         super(testName);
@@ -49,7 +50,7 @@ public void testFindColorsNearColorOrange() {
         instance.setMaxGreen(60.0f);
         instance.setMaxRed(60.0f);
         instance.findColors(foregroundColor, backgroundColor, false, coefficientLevel);
-        LOGGER.info(instance.getColorResult().getSuggestedColors().size());
+        LOGGER.info("Nb SuggestedColors:" + instance.getColorResult().getSuggestedColors().size());
         Float initialHue = ColorConverter.getHue(foregroundColor);
         int counter = 0;
         for (ColorCombinaison combinaisons : instance.getColorResult().getSuggestedColors()) {

diff --git a/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvTest.java b/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvTest.java
@@ -24,7 +24,8 @@
 import java.util.List;
 import static junit.framework.Assert.assertEquals;
 import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastFinder.result.ColorCombinaison;
 
 /**
@@ -33,7 +34,7 @@
  */
 public class ColorFinderHsvTest extends TestCase {
 
-    private static final Logger LOGGER = Logger.getLogger(ColorFinderHsvTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorFinderHsvTest.class);
 
     public ColorFinderHsvTest(String testName) {
         super(testName);

diff --git a/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderRgbTest.java b/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderRgbTest.java
@@ -8,7 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.asqatasun.contrastFinder.result.ColorCombinaison;
 
 /**
@@ -17,7 +18,7 @@
  */
 public class ColorFinderRgbTest extends TestCase {
 
-    private static final Logger LOGGER = Logger.getLogger(ColorFinderRgbTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ColorFinderRgbTest.class);
 
     public ColorFinderRgbTest(String testName) {
         super(testName);
@@ -41,7 +42,7 @@ public void testFindColorsNearColorOrange() {
         ColorFinderRgb instance = new ColorFinderRgb();
         List<ColorCombinaison> colorCombinaison = new ArrayList<ColorCombinaison>();
         instance.findColors(foregroundColor, backgroundColor, true, coefficientLevel);
-        LOGGER.info(instance.getColorResult().getSuggestedColors().size());
+        LOGGER.info("nb SuggestedColors: " + instance.getColorResult().getSuggestedColors().size());
         for (ColorCombinaison combinaisons : instance.getColorResult().getSuggestedColors()) {
             LOGGER.info("Color found " + combinaisons.getHexaColor());
         }

diff --git a/contrast-finder-hsv/src/test/resources/log4j.properties b/contrast-finder-hsv/src/test/resources/log4j.properties
diff --git a/contrast-finder-hsv/src/test/resources/logback.xml b/contrast-finder-hsv/src/test/resources/logback.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <root level="info"><appender-ref ref="STDOUT" /></root>
+<!--
+    <root level="info"><appender-ref ref="STDOUT" /></root>
+    <root level="debug"><appender-ref ref="STDOUT" /></root>
+-->
+</configuration>
+
diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.4</version>
+        <version>0.4.5</version>
     </parent>
     <artifactId>contrast-finder-impl</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
     <packaging>jar</packaging>
     <name>contrast-finder-impl</name>
     <dependencies>

diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml
@@ -5,10 +5,10 @@
   <parent>
     <groupId>org.asqatasun</groupId>
     <artifactId>contrast-finder</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
   </parent>
   <artifactId>contrast-finder-resources</artifactId>
-  <version>0.4.4</version>
+  <version>0.4.5</version>
   <name>contrast-finder-resources</name>
   <url>http://maven.apache.org</url>
   <properties>

diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml
@@ -4,10 +4,10 @@
     <parent>
         <groupId>org.asqatasun</groupId>
         <artifactId>contrast-finder</artifactId>
-        <version>0.4.4</version>
+        <version>0.4.5</version>
     </parent>
     <artifactId>contrast-finder-utils</artifactId>
-    <version>0.4.4</version>
+    <version>0.4.5</version>
     <packaging>jar</packaging>
     <name>contrast-finder-utils</name>
     <dependencies>
@@ -31,8 +31,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
         </dependency>
     </dependencies>
 </project>