From 012a9b0bc69cb02d7ee66305f70bf9d513ca452e Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 12 Feb 2017 05:50:50 +0100 Subject: [PATCH 01/32] set version to 0.4.5-dev --- CHANGELOG.md | 24 ++++++++++++++++++- contrast-finder-api/pom.xml | 4 ++-- contrast-finder-hsv/pom.xml | 4 ++-- contrast-finder-impl/pom.xml | 4 ++-- contrast-finder-resources/pom.xml | 4 ++-- contrast-finder-utils/pom.xml | 4 ++-- contrast-finder-webapp/pom.xml | 4 ++-- .../main/webapp/WEB-INF/template/footer.jspf | 2 +- docker/RELEASE/Dockerfile | 8 +++---- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- pom.xml | 2 +- 12 files changed, 43 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d5184e5..7743a49c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,26 @@ +Contrast-Finder 0.4.5, 2017-xx-xx +--------------------------------- + +Features: +none + +Security: +none + +Bugs: +none + +Configuration: +none + +Documentation: +none + +Upgrade-o-meter: +none + + Contrast-Finder 0.4.4, 2017-02-12 --------------------------------- @@ -20,7 +42,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 index 43b4d23b..8240e608 100644 --- a/contrast-finder-api/pom.xml +++ b/contrast-finder-api/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.4.4 + 0.4.5-dev contrast-finder-api - 0.4.4 + 0.4.5-dev jar contrast-finder-api diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml index ce887fab..54c84f3c 100644 --- a/contrast-finder-hsv/pom.xml +++ b/contrast-finder-hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.4 + 0.4.5-dev contrast-finder-hsv - 0.4.4 + 0.4.5-dev jar contrast-finder-hsv diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml index 99caa39f..5ae16d45 100644 --- a/contrast-finder-impl/pom.xml +++ b/contrast-finder-impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.4 + 0.4.5-dev contrast-finder-impl - 0.4.4 + 0.4.5-dev jar contrast-finder-impl diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml index 9d797aa0..3f8fd7ca 100644 --- a/contrast-finder-resources/pom.xml +++ b/contrast-finder-resources/pom.xml @@ -5,10 +5,10 @@ org.asqatasun contrast-finder - 0.4.4 + 0.4.5-dev contrast-finder-resources - 0.4.4 + 0.4.5-dev contrast-finder-resources http://maven.apache.org diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml index 864d62dc..251b5034 100644 --- a/contrast-finder-utils/pom.xml +++ b/contrast-finder-utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.4 + 0.4.5-dev contrast-finder-utils - 0.4.4 + 0.4.5-dev jar contrast-finder-utils diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index 526a352d..29df356e 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.4 + 0.4.5-dev contrast-finder-webapp - 0.4.4 + 0.4.5-dev war contrast-finder-webapp 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 index 867a6ccd..6edc34f7 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf @@ -8,7 +8,7 @@
- <%-- ===== HEADER ========================================================================================= --%> - <%@include file='/WEB-INF/template/header.jspf' %> + <%-- ===== HEADER ========================================================================================= --%> + <%@include file='/WEB-INF/template/header.jspf' %> <%--<%@include file='/WEB-INF/template/cf-message.jspf' %>--%> <%-- ===== FORM ========================================================================================= --%> @@ -153,7 +153,8 @@ - + + <%-- ===== Contrast OK ========================================================================================= --%> <%-- Good contrast: nothing to do --%>
@@ -177,6 +178,8 @@
+ + <%-- ===== Contrast not OK ========================================================================================= --%> <%-- Invalid contrast: present solutions --%>
@@ -372,52 +375,55 @@ -
- - - -
-
- <%@include file='/WEB-INF/template/footer.jspf' %> + <%-- ===== USER HELP ========================================================================================= --%> +
<%-- only on HomePage --%> + + + +
+ - - - + <%-- ===== FOOTER ========================================================================================= --%> + <%@include file='/WEB-INF/template/footer.jspf' %> - - - - - - - - + + + + + + + + + + + + + From f2cb531ae21ce5e2fd59833641214af40eb0ce69 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 18 Feb 2017 23:55:38 +0100 Subject: [PATCH 03/32] .jsp - added appVersion --- .../resources/i18n/color-finder.properties | 10 +- .../resources/i18n/color-finder_en.properties | 10 +- .../resources/i18n/color-finder_fr.properties | 4 + .../src/main/webapp/WEB-INF/pages/form.jsp | 42 ++++----- .../main/webapp/WEB-INF/template/footer.jspf | 2 +- .../main/webapp/WEB-INF/template/head.jspf | 38 ++++---- .../WEB-INF/template/template_variables.jspf | 92 ++++++++++++++++++- 7 files changed, 147 insertions(+), 51 deletions(-) diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties index 1a8e3615..1c45539d 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties @@ -2,13 +2,17 @@ NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. +result.title.colors=colors +result.title.foregroundColor=text +result.title.backgroundColor=background +result.title.minRation=min ratio form.fillInFields=Please fill in the following fields : form.description=Contrast-Finder finds correct color contrasts for web accessibility form.help=The color should be between #000000 and #FFFFFF -form.foregroundColor=Text Color -form.backgroundColor=Background Color +form.foregroundColor=Text color +form.backgroundColor=Background color form.component=Component to edit -form.componentForeground=Edit the foreground color +form.componentForeground=Edit the text color form.componentBackground=Edit the background color form.ratio=Minimum ratio form.contrastOld=Old contrast diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties index 1a8e3615..1c45539d 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties @@ -2,13 +2,17 @@ NOT_A_VALID_COLOR=The color should be between #000000 and #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Wrong ratio home.titleTag=Contrast Finder, find correct color contrasts for web accessibility (WCAG) home.metaDescription=Contrast-Finder finds correct color contrasts for web accessibility (WCAG). This helps you in satisfying web accessibility (a11y) tests on contrasts. +result.title.colors=colors +result.title.foregroundColor=text +result.title.backgroundColor=background +result.title.minRation=min ratio form.fillInFields=Please fill in the following fields : form.description=Contrast-Finder finds correct color contrasts for web accessibility form.help=The color should be between #000000 and #FFFFFF -form.foregroundColor=Text Color -form.backgroundColor=Background Color +form.foregroundColor=Text color +form.backgroundColor=Background color form.component=Component to edit -form.componentForeground=Edit the foreground color +form.componentForeground=Edit the text color form.componentBackground=Edit the background color form.ratio=Minimum ratio form.contrastOld=Old contrast diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties index 46814468..6a28928e 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties @@ -2,6 +2,10 @@ NOT_A_VALID_COLOR=La couleur doit \u00eatre entre #000000 \u00e0 #FFFFFF NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide home.titleTag=Contrast Finder, trouvez le bon contraste pour vos couleurs, accessibilit\u00e9 web (WCAG / RGAA) home.metaDescription=Outil en ligne pour v\u00e9rifier si le contrate de vos couleurs est accessible. Contrat-Finder propose des jeux de couleurs accessibles proches de celles que vous venez de tester. Accessibilit\u00e9 web (WCAG / RGAA) +result.title.colors=couleurs +result.title.foregroundColor=texte +result.title.backgroundColor=fond +result.title.minRation=ratio min form.fillInFields=Renseignez les champs suivants : form.description=Contrast-Finder trouve les bons contrastes de couleurs pour l'accessibilit\u00e9 web form.help=La couleur doit \u00eatre comprise entre #000000 \u00e0 #FFFFFF diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp index 7dff0c30..c448156b 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -70,17 +70,6 @@ - <%-- Component to modify --%> -
- -
- - - - -
-
- <%-- Ratio --%> @@ -105,6 +94,17 @@ + <%-- Component to modify --%> +
+ +
+ + + + +
+
+ <%-- Choose alorithm --%> @@ -324,11 +324,11 @@ background-color:rgb(${result.comparisonColor.red}, ${result.comparisonColor.green}, ${result.comparisonColor.blue})">

- +

- +

@@ -388,16 +388,16 @@ <%@include file='/WEB-INF/template/footer.jspf' %> - - 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 index 6edc34f7..2f699834 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/footer.jspf @@ -8,7 +8,7 @@
- english + english - english + english   - français + français français From b902ae6fe4b76f5d0c1d1ef02a5ae1879e188f54 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Feb 2017 00:58:44 +0100 Subject: [PATCH 05/32] fixed #30 - i18n - punctuation errors in english --- .../src/main/resources/i18n/color-finder.properties | 10 +++++----- .../src/main/resources/i18n/color-finder_en.properties | 10 +++++----- .../src/main/webapp/WEB-INF/pages/form.jsp | 4 +++- .../src/main/webapp/WEB-INF/template/cf-message.jspf | 9 ++++++++- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties index 1c45539d..bb864fe0 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties @@ -35,7 +35,7 @@ form.sampleText2=\ to illustrate the contrast. form.wcagLink=http://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast form.sc=Success criteria form.sc-info=requires text to have a minimum contrast ratio of 4.5:1 (and 3:1 for large text). -footer.LikedCf=Liked Contrast-Finder ?
Try Asqatasun, the opensource website analyser for accessibility +footer.LikedCf=Liked Contrast-Finder?
Try Asqatasun, the opensource website analyser for accessibility form.contrastSolutionDistance=Distance form.contrastSolutionDistanceEx=Distance from initial color form.objectifs=Gimme @@ -47,11 +47,11 @@ form.invalidAlgo=The algorithm value is not valid. form.tryHsv=Gimme a range of colors form.tryRgb=Gimme valid colors and very close to initial color form.testedColors=colors tested -form.notSatisfied=Not satisfied ? +form.notSatisfied=Not satisfied? form.anyResult=Let's form.oppositeComponentForeground=background color form.oppositeComponentBackground=foreground color -message.addon=Hey! Have you tried the new Asqatasun Contrast-Finder Firefox addon ? +message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? footer.poweredBy=Powered by footer.availableUnder=available under footer.link-twitter=Follow Contrast-Finder on Twitter @@ -72,7 +72,7 @@ home.noResultTxt=

Help

\

The component you choose will be modified until we find a valid color. The other color won't change.

\

Minimum ratio

\

Three possible values 3, 4.5 and 7.

\ -

How to choose a ratio ? It depends on the following elements:

\ +

How to choose a ratio? It depends on the following elements:

\
    \
  • Level of accessibility wanted: AA or AAA.
    • \
  • Size of the text.
    • \ @@ -95,7 +95,7 @@ home.noResultTxt=

    Help

    \ \ form.results=Results -form.usage=Usage : +form.usage=Usage: form.ratioMedium=Small text (size < 18px, Level AA) form.ratioShort=Big text (size ≥ 18px, Level AA) form.ratioHigh=Strenghten contrast (Level AAA) diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties b/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties index 1c45539d..bb864fe0 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties @@ -35,7 +35,7 @@ form.sampleText2=\ to illustrate the contrast. form.wcagLink=http://www.w3.org/TR/WCAG20/#visual-audio-contrast-contrast form.sc=Success criteria form.sc-info=requires text to have a minimum contrast ratio of 4.5:1 (and 3:1 for large text). -footer.LikedCf=Liked Contrast-Finder ?
    Try Asqatasun, the opensource website analyser for accessibility +footer.LikedCf=Liked Contrast-Finder?
    Try Asqatasun, the opensource website analyser for accessibility form.contrastSolutionDistance=Distance form.contrastSolutionDistanceEx=Distance from initial color form.objectifs=Gimme @@ -47,11 +47,11 @@ form.invalidAlgo=The algorithm value is not valid. form.tryHsv=Gimme a range of colors form.tryRgb=Gimme valid colors and very close to initial color form.testedColors=colors tested -form.notSatisfied=Not satisfied ? +form.notSatisfied=Not satisfied? form.anyResult=Let's form.oppositeComponentForeground=background color form.oppositeComponentBackground=foreground color -message.addon=Hey! Have you tried the new Asqatasun Contrast-Finder Firefox addon ? +message.addon=Hey! Have you tried the new Contrast-Finder Firefox addon? footer.poweredBy=Powered by footer.availableUnder=available under footer.link-twitter=Follow Contrast-Finder on Twitter @@ -72,7 +72,7 @@ home.noResultTxt=

    Help

    \

    The component you choose will be modified until we find a valid color. The other color won't change.

    \

    Minimum ratio

    \

    Three possible values 3, 4.5 and 7.

    \ -

    How to choose a ratio ? It depends on the following elements:

    \ +

    How to choose a ratio? It depends on the following elements:

    \
      \
    • Level of accessibility wanted: AA or AAA.
      • \
    • Size of the text.
      • \ @@ -95,7 +95,7 @@ home.noResultTxt=

      Help

      \ \ form.results=Results -form.usage=Usage : +form.usage=Usage: form.ratioMedium=Small text (size < 18px, Level AA) form.ratioShort=Big text (size ≥ 18px, Level AA) form.ratioHigh=Strenghten contrast (Level AAA) diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp index c448156b..3c8547cb 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -15,7 +15,9 @@ <%-- ===== HEADER ========================================================================================= --%> <%@include file='/WEB-INF/template/header.jspf' %> - <%--<%@include file='/WEB-INF/template/cf-message.jspf' %>--%> + + <%-- Firefox addon --%> + <%-- <%@include file='/WEB-INF/template/cf-message.jspf' %>--%> <%-- ===== FORM ========================================================================================= --%>
      diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/cf-message.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/cf-message.jspf index a5b4067d..49237e87 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/cf-message.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/cf-message.jspf @@ -4,7 +4,14 @@

      - + + + + + + + +

      From 29f0e07b5e9ee0edbf9439492f9f5a0dd4489e70 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Feb 2017 01:16:54 +0100 Subject: [PATCH 06/32] typo --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CHANGELOG.md | 5 +++-- .../{color-finder.properties => contrast-finder.properties} | 0 ...or-finder_en.properties => contrast-finder_en.properties} | 0 ...or-finder_fr.properties => contrast-finder_fr.properties} | 0 .../Css/{30-color-finder.css => 30-contrast-finder.css} | 0 .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml | 2 +- .../src/main/webapp/WEB-INF/template/head.jspf | 2 +- documentation/en/Howto-use.md | 4 ++-- 9 files changed, 8 insertions(+), 7 deletions(-) rename contrast-finder-webapp/src/main/resources/i18n/{color-finder.properties => contrast-finder.properties} (100%) rename contrast-finder-webapp/src/main/resources/i18n/{color-finder_en.properties => contrast-finder_en.properties} (100%) rename contrast-finder-webapp/src/main/resources/i18n/{color-finder_fr.properties => contrast-finder_fr.properties} (100%) rename contrast-finder-webapp/src/main/webapp/Css/{30-color-finder.css => 30-contrast-finder.css} (100%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d8768d72..8c6abb96 100644 --- 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!) \ No newline at end of file +(by the way, thank you **very** much for contributing to Contrast-Finder!) \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7743a49c..52f2d443 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ Security: none Bugs: -none +- [#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) Configuration: none @@ -18,7 +19,7 @@ Documentation: none Upgrade-o-meter: -none +just replace the .war file and restart Tomcat Contrast-Finder 0.4.4, 2017-02-12 diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties similarity index 100% rename from contrast-finder-webapp/src/main/resources/i18n/color-finder.properties rename to contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties similarity index 100% rename from contrast-finder-webapp/src/main/resources/i18n/color-finder_en.properties rename to contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties diff --git a/contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties similarity index 100% rename from contrast-finder-webapp/src/main/resources/i18n/color-finder_fr.properties rename to contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties diff --git a/contrast-finder-webapp/src/main/webapp/Css/30-color-finder.css b/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css similarity index 100% rename from contrast-finder-webapp/src/main/webapp/Css/30-color-finder.css rename to contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml index e6a16d96..5c4acc0f 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml @@ -11,7 +11,7 @@ - i18n/color-finder + i18n/contrast-finder diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/head.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/head.jspf index 9cf050a1..816f0d31 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/head.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/head.jspf @@ -5,7 +5,7 @@ "> diff --git a/documentation/en/Howto-use.md b/documentation/en/Howto-use.md index 6efc9969..9c3f971f 100644 --- a/documentation/en/Howto-use.md +++ b/documentation/en/Howto-use.md @@ -1,11 +1,11 @@ # Howto use -## What is Asqatasun Contrast Finder ? +## What is Contrast Finder ? There are lot of tools to find a good contrast on the web, but no one to suggest valid contrasts. -Asqatasun Contrast Finder is a tool which computes the contrast between two colors (background, foreground) and checks if the contrast is valid. +Contrast Finder is a tool which computes the contrast between two colors (background, foreground) and checks if the contrast is valid. Contrast finder is designed to be used by webdesigner, webdeveloppers or e-accessibility professionals. From cf5ff967a29b47be4d20bfac1d366f822e5889e0 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 15 Mar 2017 18:16:12 +0100 Subject: [PATCH 07/32] Updated contrast-finder_fr.properties (small fix) --- .../src/main/resources/i18n/contrast-finder_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties index 6a28928e..9b3de38a 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties @@ -17,7 +17,7 @@ form.componentBackground=Modifier la couleur du fond form.ratio=Ratio minimum form.contrastOld=Ancien contraste form.contrastNew=Nouveau contraste -form.validate=Verifier et trouver le contraste +form.validate=V\u00e9rifier et trouver le contraste form.validContrast=Contraste Valide : form.validContrastDesc=Les couleurs que vous avez choisi sont valides form.resultNumber={0} {0,choice,1#r\u00e9sultat|1 Date: Wed, 15 Mar 2017 19:18:10 +0100 Subject: [PATCH 08/32] DOC - Updated "Other contrast tools" --- documentation/en/Other-contrast-tools.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/documentation/en/Other-contrast-tools.md b/documentation/en/Other-contrast-tools.md index 2d4ca968..afd244b3 100644 --- a/documentation/en/Other-contrast-tools.md +++ b/documentation/en/Other-contrast-tools.md @@ -35,3 +35,7 @@ Other contrast tools * http://jxnblk.com/colorable/demos/matrix/ * http://www.aremycoloursaccessible.com/ +vision simulation +* http://paletton.com/ + + From 5e53cf06c61d5c7c6221ac7e0004917c2aa5d938 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 15 Mar 2017 19:25:50 +0100 Subject: [PATCH 09/32] DOC - Updated "Other contrast tools" (typo) --- documentation/en/Other-contrast-tools.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/documentation/en/Other-contrast-tools.md b/documentation/en/Other-contrast-tools.md index afd244b3..b820c7a1 100644 --- a/documentation/en/Other-contrast-tools.md +++ b/documentation/en/Other-contrast-tools.md @@ -1,12 +1,12 @@ # Other contrast tools -Contrast tools we love: +## Contrast tools we love: * [Contrast-A](http://www.dasplankton.de/ContrastA/) * [WCAG Contrast Checker (firefox addon) v1.2](https://addons.mozilla.org/fr/firefox/addon/wcag-contrast-checker/versions/?page=1#version-1.2) Especially v1.2 because you can select a given text (functionnality has disappeared in further versions) * [Color Contrast Tool (snook.ca)](http://snook.ca/technical/colour_contrast/colour.html) -Other contrast tools (which are actually good, but it appears we don't them) +## Other contrast tools (which are actually good, but it appears we don't them) * http://webaim.org/resources/contrastchecker/ * http://contrastchecker.com/ * http://leaverou.github.io/contrast-ratio/ @@ -16,7 +16,7 @@ Other contrast tools (which are actually good, but it appears we don't them) * http://www.brandwood.com/a11y/ * src: https://github.com/andrewbrandwood/a11y-image-text -Other contrast tools +### Other contrast tools * http://www.visionaustralia.org/digital-access-determinator * http://a11yrocks.com/colorPalette/ * http://colorsafe.co/ @@ -35,7 +35,7 @@ Other contrast tools * http://jxnblk.com/colorable/demos/matrix/ * http://www.aremycoloursaccessible.com/ -vision simulation +### Vision simulation * http://paletton.com/ From a6e6461113057fba6b3abb620a57be389af1ca06 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Thu, 16 Mar 2017 02:29:36 +0100 Subject: [PATCH 10/32] Changed LOG dependency (logback + slf4j instead of log4j) --- contrast-finder-api/pom.xml | 6 +++--- .../org/asqatasun/contrastFinder/AbstractColorFinder.java | 5 +++-- contrast-finder-hsv/pom.xml | 4 ++-- .../org/asqatasun/contrastFinder/hsv/ColorFinderHsv.java | 5 +++-- .../asqatasun/contrastFinder/hsv/ColorFinderHsvPsycho.java | 5 +++-- .../org/asqatasun/contrastFinder/hsv/ColorFinderRgb.java | 5 +++-- .../contrastFinder/hsv/ColorFinderHsvPsychoTest.java | 7 ++++--- .../asqatasun/contrastFinder/hsv/ColorFinderHsvTest.java | 5 +++-- .../asqatasun/contrastFinder/hsv/ColorFinderRgbTest.java | 7 ++++--- contrast-finder-utils/pom.xml | 4 ++-- pom.xml | 6 +++--- 11 files changed, 33 insertions(+), 26 deletions(-) diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml index 8240e608..8a3e6b70 100644 --- a/contrast-finder-api/pom.xml +++ b/contrast-finder-api/pom.xml @@ -22,9 +22,9 @@ junit - log4j - log4j - 1.2.17 + ch.qos.logback + logback-classic + 1.2.1 jar 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 index 99615acf..a988302f 100644 --- 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 index 54c84f3c..b13641f6 100644 --- a/contrast-finder-hsv/pom.xml +++ b/contrast-finder-hsv/pom.xml @@ -55,8 +55,8 @@ contrast-finder-impl - log4j - log4j + ch.qos.logback + logback-classic 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 index 675abc58..381f0a99 100644 --- 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 index fbb940f7..041acdc8 100644 --- 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 index 46e93e57..5fe5e963 100644 --- 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/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsychoTest.java b/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsychoTest.java index 736f2cad..b57f7939 100644 --- a/contrast-finder-hsv/src/test/java/org/asqatasun/contrastFinder/hsv/ColorFinderHsvPsychoTest.java +++ b/contrast-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 index e9f47c1d..666413ba 100644 --- 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 index 1adefd44..e5f6dc35 100644 --- 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 = new ArrayList(); 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-utils/pom.xml b/contrast-finder-utils/pom.xml index 251b5034..31175a0c 100644 --- a/contrast-finder-utils/pom.xml +++ b/contrast-finder-utils/pom.xml @@ -31,8 +31,8 @@ test - log4j - log4j + ch.qos.logback + logback-classic diff --git a/pom.xml b/pom.xml index 338060b8..7db3af97 100644 --- a/pom.xml +++ b/pom.xml @@ -97,9 +97,9 @@ test - log4j - log4j - 1.2.17 + ch.qos.logback + logback-classic + 1.2.1 From 096373589bd8b77c5881a71d54325d9c6e2b4433 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sat, 18 Mar 2017 08:45:19 +0100 Subject: [PATCH 11/32] contrast-finder-hsv/src/test/ : added Logback configuration --- .../src/test/resources/log4j.properties | 17 ----------------- .../src/test/resources/logback.xml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 contrast-finder-hsv/src/test/resources/log4j.properties create mode 100644 contrast-finder-hsv/src/test/resources/logback.xml diff --git a/contrast-finder-hsv/src/test/resources/log4j.properties b/contrast-finder-hsv/src/test/resources/log4j.properties deleted file mode 100644 index 3af05b5c..00000000 --- a/contrast-finder-hsv/src/test/resources/log4j.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Set root logger level to DEBUG and its only appender to CONSOLE. -# console output -log4j.rootLogger=INFO,CONSOLE_APP - -# console output -# appender CONSOL_APP is bound to console -log4j.appender.CONSOLE_APP=org.apache.log4j.ConsoleAppender -# CONSOLE_APP uses a PatternLayout printing: thread name, priority, logger name, and message -log4j.appender.CONSOLE_APP.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE_APP.layout.ConversionPattern=%d{dd-MM-yyyy HH:mmsSS} %-4r %-5p %c %x - %m%n - -# file output -#log4j.appender.FILE_APP=org.apache.log4j.DailyRollingFileAppender -#log4j.appender.FILE_APP.File=/var/log/contrast-finder/contrast-finder.log -#log4j.appender.FILE_APP.DatePattern='.'yyyy-MM-dd -#log4j.appender.FILE_APP.layout=org.apache.log4j.PatternLayout -#log4j.appender.FILE_APP.layout.ConversionPattern=%d{dd-MM-yyyy HH:mmsSS} %-4r %-5p %c %x - %m%n \ No newline at end of file diff --git a/contrast-finder-hsv/src/test/resources/logback.xml b/contrast-finder-hsv/src/test/resources/logback.xml new file mode 100644 index 00000000..3b2d5667 --- /dev/null +++ b/contrast-finder-hsv/src/test/resources/logback.xml @@ -0,0 +1,17 @@ + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + From 08c5739250231a7dd92df4cdce6272d6bc2a28fe Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 13:56:03 +0100 Subject: [PATCH 12/32] contrast-finder-webapp : added Logback configuration --- .../src/main/resources/log4j.properties | 24 ------------ .../src/main/resources/logback.xml | 39 +++++++++++++++++++ 2 files changed, 39 insertions(+), 24 deletions(-) delete mode 100644 contrast-finder-webapp/src/main/resources/log4j.properties create mode 100644 contrast-finder-webapp/src/main/resources/logback.xml diff --git a/contrast-finder-webapp/src/main/resources/log4j.properties b/contrast-finder-webapp/src/main/resources/log4j.properties deleted file mode 100644 index 05e9c7f4..00000000 --- a/contrast-finder-webapp/src/main/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Set root logger level to DEBUG and its only appender to CONSOLE. -# console output -#log4j.rootLogger=INFO,CONSOLE_APP -# file output -log4j.rootLogger=ERROR,FILE_APP - -# console output -# appender CONSOL_APP is bound to console -#log4j.appender.CONSOLE_APP=org.apache.log4j.ConsoleAppender -# CONSOLE_APP uses a PatternLayout printing: thread name, priority, logger name, and message -#log4j.appender.CONSOLE_APP.layout=org.apache.log4j.PatternLayout -#log4j.appender.CONSOLE_APP.layout.ConversionPattern=%d{dd-MM-yyyy HH:mmsSS} %-4r %-5p %c %x - %m%n - -# file output -log4j.appender.FILE_APP=org.apache.log4j.DailyRollingFileAppender -log4j.appender.FILE_APP.File=/var/log/contrast-finder/contrast-finder.log -log4j.appender.FILE_APP.DatePattern='.'yyyy-MM-dd -log4j.appender.FILE_APP.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE_APP.layout.ConversionPattern=%d{dd-MM-yyyy HH:mmsSS} %-4r %-5p %c %x - %m%n - -# Change the level of messages for various packages. -#log4j.logger.com.mchange=INFO -log4j.logger.org.springframework=INFO -log4j.logger.org.asqatasun.contrastFinder.hsv=INFO \ No newline at end of file diff --git a/contrast-finder-webapp/src/main/resources/logback.xml b/contrast-finder-webapp/src/main/resources/logback.xml new file mode 100644 index 00000000..b0410d22 --- /dev/null +++ b/contrast-finder-webapp/src/main/resources/logback.xml @@ -0,0 +1,39 @@ + + + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + %d %-4relative [%thread] %-5level %logger{35} - %msg%n + + /var/log/contrast-finder/contrast-finder.log + + /var/log/contrast-finder/contrast-finder.%d{yyyy-MM-dd}.%i.log.zip + + 50MB + + 10 + + + + + + + + + + + + + + + + + From d85b40b20cffba2c90a99211400b3f34fca8f468 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 13:59:42 +0100 Subject: [PATCH 13/32] fix DockerFile --- docker/RELEASE/Dockerfile | 13 +++++++------ docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 9 +++++---- .../pre-requisites_from-Ubuntu/Dockerfile | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index 83b3c744..dc688c5c 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -32,12 +32,13 @@ ARG SRC_URL_PREFIX="https://github.com/Asqatasun/Contrast-Finder/releases/downlo ARG SRC_URL="${SRC_URL_PREFIX}/contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz" # Install contrast-finder -RUN cd /root/ && \ - wget ${SRC_URL} && \ - tar -xzvf contrast-*.tar.gz && \ - cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ +RUN cd /root/ && \ + wget ${SRC_URL} && \ + tar -xzvf contrast-*.tar.gz && \ + cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war /var/lib/tomcat7/webapps && \ + touch /var/log/contrast-finder/contrast-finder.log && \ rm -rf /root/contrast-* && echo "-- Install: Ok" # environment variables diff --git a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile index b7db5591..ca14fc73 100644 --- a/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile +++ b/docker/SNAPSHOT-local_from-Ubuntu/Dockerfile @@ -25,10 +25,11 @@ ENV CONTRAST_FINDER_RELEASE="0.4.5-dev" ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root # Install contrast-finder -RUN cd /root/contrast-*/install/ && \ - mv -v contrast-*.war contrast-finder.war && \ - mv -v contrast-*.war /var/lib/tomcat7/webapps && \ - rm -rf /root/contrast-* +RUN cd /root/contrast-*/install/ && \ + mv -v contrast-*.war contrast-finder.war && \ + mv -v contrast-*.war /var/lib/tomcat7/webapps && \ + touch /var/log/contrast-finder/contrast-finder.log && \ + rm -rf /root/contrast-* && echo "-- Install: Ok" CMD service tomcat7 start ; \ tail -f /var/log/tomcat7/catalina.out \ diff --git a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile index 013df490..83c610d7 100644 --- a/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile +++ b/docker/pre-requisites/pre-requisites_from-Ubuntu/Dockerfile @@ -29,8 +29,8 @@ RUN apt-get update && \ mkdir -p /etc/contrast-finder/ && \ touch /var/log/contrast-finder/contrast-finder.log && \ touch ${CONF_FILE} && \ - chown -R tomcat7 /var/log/contrast-finder/ && \ - chown -R tomcat7 /etc/contrast-finder/ && \ + chown -R tomcat7:tomcat7 /var/log/contrast-finder/ && \ + chown -R tomcat7:tomcat7 /etc/contrast-finder/ && \ echo "piwik_analytics_key=" >> ${CONF_FILE} && \ echo "google_analytics_key=" >> ${CONF_FILE} && \ ln -s /usr/share/java/spring3-instrument-tomcat.jar \ From 13edda4bc8eb2fbb52357bacafac21693c0a8c67 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 15:11:29 +0100 Subject: [PATCH 14/32] contrast-finder-webapp : updated Logback configuration --- .../src/main/resources/logback.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/contrast-finder-webapp/src/main/resources/logback.xml b/contrast-finder-webapp/src/main/resources/logback.xml index b0410d22..9a7f8f83 100644 --- a/contrast-finder-webapp/src/main/resources/logback.xml +++ b/contrast-finder-webapp/src/main/resources/logback.xml @@ -1,6 +1,10 @@ + + @@ -14,12 +18,17 @@ %d %-4relative [%thread] %-5level %logger{35} - %msg%n /var/log/contrast-finder/contrast-finder.log + + - /var/log/contrast-finder/contrast-finder.%d{yyyy-MM-dd}.%i.log.zip + /var/log/contrast-finder/contrast-finder.%d{yyyy-MM-dd}_%i.log.zip - 50MB + 50MB + + 10 + 450MB @@ -30,7 +39,7 @@ - + From 5ab04ff37baf0d8ff8ed6773cf48af5dabae3dca Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 15:33:59 +0100 Subject: [PATCH 15/32] contrast-finder-webapp: upgraded springframework (4.3.7 instead of 4.3.6) * https://spring.io/blog/2017/03/01/spring-framework-4-3-7-released * https://jira.spring.io/secure/ReleaseNote.jspa?version=15827&styleName=Text&projectId=10000 --- contrast-finder-webapp/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index 29df356e..c632ca94 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -37,33 +37,33 @@ org.springframework spring-beans - 4.3.6.RELEASE + 4.3.7.RELEASE org.springframework spring-context - 4.3.6.RELEASE + 4.3.7.RELEASE org.springframework spring-core - 4.3.6.RELEASE + 4.3.7.RELEASE org.springframework spring-expression - 4.3.6.RELEASE + 4.3.7.RELEASE org.springframework spring-web - 4.3.6.RELEASE + 4.3.7.RELEASE jar org.springframework spring-webmvc - 4.3.6.RELEASE + 4.3.7.RELEASE org.springframework.security From 75bb156803141c8622a8b0281524a0e3a12391cf Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 15:41:09 +0100 Subject: [PATCH 16/32] contrast-finder-webapp: upgraded springframework.security (4.2.2 instead of 4.2.1) * https://spring.io/blog/2017/03/02/spring-security-4-2-2-released * https://github.com/spring-projects/spring-security/milestone/95?closed=1 --- contrast-finder-webapp/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index c632ca94..b51339bc 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -68,12 +68,12 @@ org.springframework.security spring-security-web - 4.2.1.RELEASE + 4.2.2.RELEASE org.springframework.security spring-security-config - 4.2.1.RELEASE + 4.2.2.RELEASE org.apache.taglibs From f0d4c0ee51fa12e9315347f3725e357a2c1e09f6 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 15:49:12 +0100 Subject: [PATCH 17/32] contrast-finder-webapp: updated pom.xml --- contrast-finder-webapp/pom.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index b51339bc..d65c49de 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -15,8 +15,11 @@ ${project.build.directory}/endorsed UTF-8 + 4.3.7.RELEASE + 4.2.2.RELEASE + javax @@ -37,43 +40,43 @@ org.springframework spring-beans - 4.3.7.RELEASE + ${springVersion} org.springframework spring-context - 4.3.7.RELEASE + ${springVersion} org.springframework spring-core - 4.3.7.RELEASE + ${springVersion} org.springframework spring-expression - 4.3.7.RELEASE + ${springVersion} org.springframework spring-web - 4.3.7.RELEASE + ${springVersion} jar org.springframework spring-webmvc - 4.3.7.RELEASE + ${springVersion} org.springframework.security spring-security-web - 4.2.2.RELEASE + ${springSecurityVersion} org.springframework.security spring-security-config - 4.2.2.RELEASE + ${springSecurityVersion} org.apache.taglibs From 04905d865f0c862567431fa593d11fd45f70878a Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 16:49:59 +0100 Subject: [PATCH 18/32] Updated CHANGELOG --- CHANGELOG.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52f2d443..1ef70fbf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,22 @@ -Contrast-Finder 0.4.5, 2017-xx-xx +Contrast-Finder 0.4.5, 2017-03-xx --------------------------------- Features: none Security: -none - +- [#33 - Upgraded SpringFramework to v4.3.7](https://github.com/Asqatasun/Contrast-Finder/issues/33) +- [#33 - Upgraded SpringFramework-Security to v4.2.2](https://github.com/Asqatasun/Contrast-Finder/issues/33) + Bugs: - [#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) Configuration: -none - +- [#32 - Changed LOG dependency: logback + slf4j instead of log4j](https://github.com/Asqatasun/Contrast-Finder/issues/32) +- .jsp - Added appVersion + Documentation: none From 2958ac80e6da885bc3e63cca74958a2d9674dbf4 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 17:26:38 +0100 Subject: [PATCH 19/32] updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ebb18705..62934272 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ *.war *.ear *.tar.gz +*.tar.gz.* # maven target From 2d24336631cef931c13e459b9f9703fedcf82061 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 19:17:00 +0100 Subject: [PATCH 20/32] contrast-finder-webapp : fixed Logback configuration --- .../src/main/resources/logback.xml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/contrast-finder-webapp/src/main/resources/logback.xml b/contrast-finder-webapp/src/main/resources/logback.xml index 9a7f8f83..98509986 100644 --- a/contrast-finder-webapp/src/main/resources/logback.xml +++ b/contrast-finder-webapp/src/main/resources/logback.xml @@ -18,17 +18,12 @@ %d %-4relative [%thread] %-5level %logger{35} - %msg%n /var/log/contrast-finder/contrast-finder.log - - + /var/log/contrast-finder/contrast-finder.%d{yyyy-MM-dd}_%i.log.zip - - 50MB - - - - 10 - 450MB + 50MB + 10 + 450MB From 3eefce42c43be1945881416417de5479c3876d72 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 19:29:11 +0100 Subject: [PATCH 21/32] webapp - Updated *.xml (spring-*-4.3.xsd instead of spring-*-2.5.xsd) --- .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml | 4 ++-- .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml | 4 ++-- .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml | 4 ++-- .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml | 4 ++-- .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml | 4 ++-- .../src/main/webapp/WEB-INF/contrast-finder-servlet.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml index 335f5607..7e559fcc 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-4.3.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml index 5c4acc0f..cf9428fc 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-4.3.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml index 203550e5..d83b7af2 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> + http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml index 4a738671..f7bad3e7 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-4.3.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml index b1880a3e..a99c1e1a 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-4.3.xsd"> From 025032b8c78a40e149a78dc869eff7adfb2118b7 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 20:57:22 +0100 Subject: [PATCH 22/32] Fixed #31 - Revert "webapp: added HTTP security headers (fixed #23)" This reverts commit 24aad401bce40d5afd51c3a40da16ed516758b75 --- contrast-finder-webapp/pom.xml | 2 + .../main/webapp/WEB-INF/spring/security.xml | 61 ------------------- .../src/main/webapp/WEB-INF/web.xml | 32 ---------- 3 files changed, 2 insertions(+), 93 deletions(-) delete mode 100644 contrast-finder-webapp/src/main/webapp/WEB-INF/spring/security.xml diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index d65c49de..0549f565 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -68,6 +68,7 @@ spring-webmvc ${springVersion} + org.apache.taglibs taglibs-standard-jstlel diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/spring/security.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/spring/security.xml deleted file mode 100644 index 6a1a9a38..00000000 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/spring/security.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/web.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/web.xml index c64a4ad3..9bcb5ebe 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/web.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/web.xml @@ -4,38 +4,6 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"> - - - - contextConfigLocation - - /WEB-INF/spring/*.xml - - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - springSecurityFilterChain - /* - - - - - org.springframework.web.context.ContextLoaderListener - - - COOKIE From c3e349aba6011880fa58b6dcf295e139928d0a31 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 21:07:48 +0100 Subject: [PATCH 23/32] webapp - Updated *.xml: Delete *.xsd if not used --- .../WEB-INF/conf/mvc/cf-beans-controller.xml | 9 ++------- .../webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml | 7 ++----- .../WEB-INF/conf/mvc/cf-beans-locale.xml | 6 +++--- .../WEB-INF/conf/mvc/cf-beans-model.xml | 7 ++----- .../WEB-INF/conf/mvc/cf-beans-resolver.xml | 19 ++++--------------- .../WEB-INF/contrast-finder-servlet.xml | 8 ++++---- 6 files changed, 17 insertions(+), 39 deletions(-) diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml index 7e559fcc..014644af 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-controller.xml @@ -1,14 +1,9 @@ + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> - diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml index cf9428fc..bf198506 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-i18n.xml @@ -1,11 +1,8 @@ + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml index d83b7af2..b516edf1 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml @@ -3,9 +3,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-4.3.xsd - http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd"> + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/mvc + http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml index f7bad3e7..33260247 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-model.xml @@ -1,11 +1,8 @@ + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml index a99c1e1a..042b1f12 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-resolver.xml @@ -1,21 +1,10 @@ - - + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> + @@ -25,5 +14,5 @@ .jsp - + \ No newline at end of file diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml index 487c1444..f9140c59 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/contrast-finder-servlet.xml @@ -1,12 +1,12 @@ + http://www.springframework.org/schema/beans/spring-beans-4.3.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-4.3.xsd"> From 5eb1de42db346c53b88b01b2e6241097ada9bf79 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 21:16:27 +0100 Subject: [PATCH 24/32] Updated CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ef70fbf..aaca6025 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,13 @@ none Security: - [#33 - Upgraded SpringFramework to v4.3.7](https://github.com/Asqatasun/Contrast-Finder/issues/33) -- [#33 - Upgraded SpringFramework-Security to v4.2.2](https://github.com/Asqatasun/Contrast-Finder/issues/33) - +- revert [#23 - Added HTTP security headers](https://github.com/Asqatasun/Contrast-Finder/issues/23) + Bugs: - [#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) From e6f91194d2fee3c05bf59aeda4ca691313abe61e Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Sun, 19 Mar 2017 22:00:52 +0100 Subject: [PATCH 25/32] webapp - Updated *.xml: Delete *.xsd if not used (2/2) --- .../src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml index b516edf1..34baaf29 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/conf/mvc/cf-beans-locale.xml @@ -5,9 +5,9 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"> + http://www.springframework.org/schema/mvc/spring-mvc-4.3.xsd"> - + From b3eb5f8ff51e1ea27de1f72f538f085bce736c7b Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 21:12:34 +0200 Subject: [PATCH 26/32] delete unused file --- .../src/main/resources/form-errors.properties | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 contrast-finder-webapp/src/main/resources/form-errors.properties diff --git a/contrast-finder-webapp/src/main/resources/form-errors.properties b/contrast-finder-webapp/src/main/resources/form-errors.properties deleted file mode 100644 index 37d63c26..00000000 --- a/contrast-finder-webapp/src/main/resources/form-errors.properties +++ /dev/null @@ -1,2 +0,0 @@ -NOT_A_VALID_RATIO.colorModel.ratio=Le ratio n'est pas valide -NOT_A_VALID_COLOR=La couleur doit \u00eatre entre #000000 \u00e0 #FFFFFF \ No newline at end of file From 8ce04c2edae44083cf138c1d2b1695c9c207e89e Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 22:32:18 +0200 Subject: [PATCH 27/32] typo --- .../resources/i18n/contrast-finder.properties | 17 +++++++---- .../i18n/contrast-finder_en.properties | 17 +++++++---- .../i18n/contrast-finder_fr.properties | 23 ++++++++++---- .../main/webapp/Css/30-contrast-finder.css | 10 +++++-- .../src/main/webapp/WEB-INF/pages/form.jsp | 6 +++- .../main/webapp/WEB-INF/template/header.jspf | 30 +++++++++---------- 6 files changed, 68 insertions(+), 35 deletions(-) diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties index bb864fe0..56b3c665 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder.properties @@ -8,10 +8,10 @@ result.title.backgroundColor=background result.title.minRation=min ratio form.fillInFields=Please fill in the following fields : form.description=Contrast-Finder finds correct color contrasts for web accessibility -form.help=The color should be between #000000 and #FFFFFF +form.help=The color should be between #000000 and #FFFFFF form.foregroundColor=Text color form.backgroundColor=Background color -form.component=Component to edit +form.component=Color to edit form.componentForeground=Edit the text color form.componentBackground=Edit the background color form.ratio=Minimum ratio @@ -67,9 +67,6 @@ home.noResultTxt=

      Help

      \

      \

      Background

      \

      It is the background color. This field works as the text color fields.\ -

      Component to edit

      \ -

      It is either the foreground or the background. Default is foreground.

      \ -

      The component you choose will be modified until we find a valid color. The other color won't change.

      \

      Minimum ratio

      \

      Three possible values 3, 4.5 and 7.

      \

      How to choose a ratio? It depends on the following elements:

      \ @@ -85,6 +82,16 @@ home.noResultTxt=

      Help

      \
    • WCAG 2.0 Glossary - Contrast Ratio
      • \
    • WCAG 2.0 - MathML version of the relative luminance definition
      • \
    \ +

    Color to edit

    \ +

    It is either the foreground or the background. Default is foreground.

    \ +

    The color you choose will be modified until we find a valid color. The other color won't change.

    \ +

    The algorithms

    \ +

    A range of valid colors

    \ +

    The result is a wide range of colors.
    \ + This algorithm is very helpful if you are not sure about the hue of your initial color.

    \ +

    Valid colors and very close to initial color

    \ +

    The result is a list of colors close to the original color.
    \ + The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

    \

    User Feedback

    \

    If you have any problems with or questions about Contrast-Finder, please contact us:

    \
      \ diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties index bb864fe0..56b3c665 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_en.properties @@ -8,10 +8,10 @@ result.title.backgroundColor=background result.title.minRation=min ratio form.fillInFields=Please fill in the following fields : form.description=Contrast-Finder finds correct color contrasts for web accessibility -form.help=The color should be between #000000 and #FFFFFF +form.help=The color should be between #000000 and #FFFFFF form.foregroundColor=Text color form.backgroundColor=Background color -form.component=Component to edit +form.component=Color to edit form.componentForeground=Edit the text color form.componentBackground=Edit the background color form.ratio=Minimum ratio @@ -67,9 +67,6 @@ home.noResultTxt=

      Help

      \

      \

      Background

      \

      It is the background color. This field works as the text color fields.\ -

      Component to edit

      \ -

      It is either the foreground or the background. Default is foreground.

      \ -

      The component you choose will be modified until we find a valid color. The other color won't change.

      \

      Minimum ratio

      \

      Three possible values 3, 4.5 and 7.

      \

      How to choose a ratio? It depends on the following elements:

      \ @@ -85,6 +82,16 @@ home.noResultTxt=

      Help

      \
    • WCAG 2.0 Glossary - Contrast Ratio
      • \
    • WCAG 2.0 - MathML version of the relative luminance definition
      • \
    \ +

    Color to edit

    \ +

    It is either the foreground or the background. Default is foreground.

    \ +

    The color you choose will be modified until we find a valid color. The other color won't change.

    \ +

    The algorithms

    \ +

    A range of valid colors

    \ +

    The result is a wide range of colors.
    \ + This algorithm is very helpful if you are not sure about the hue of your initial color.

    \ +

    Valid colors and very close to initial color

    \ +

    The result is a list of colors close to the original color.
    \ + The aim is to have a valid color with a contrast as close to the selected ratio as possible (At the 0.001 range).

    \

    User Feedback

    \

    If you have any problems with or questions about Contrast-Finder, please contact us:

    \
      \ diff --git a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties index 9b3de38a..010cde48 100644 --- a/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties +++ b/contrast-finder-webapp/src/main/resources/i18n/contrast-finder_fr.properties @@ -8,10 +8,10 @@ result.title.backgroundColor=fond result.title.minRation=ratio min form.fillInFields=Renseignez les champs suivants : form.description=Contrast-Finder trouve les bons contrastes de couleurs pour l'accessibilit\u00e9 web -form.help=La couleur doit \u00eatre comprise entre #000000 \u00e0 #FFFFFF +form.help=La couleur doit \u00eatre comprise entre #000000 et #FFFFFF form.foregroundColor=Couleur du texte form.backgroundColor=Couleur du fond -form.component=Composante \u00e0 modifier +form.component=Couleur \u00e0 modifier form.componentForeground=Modifier la couleur du texte form.componentBackground=Modifier la couleur du fond form.ratio=Ratio minimum @@ -57,16 +57,24 @@ footer.availableUnder=disponible sous licence footer.link-twitter = Suivez Contrast-Finder sur Twitter footer.link-git = Contribuer au logiciel Contrast-Finder sur GitHub home.noResultTxt=

      Aide

      \ -

      Composante \u00e0 modifier

      \ -

      Il s'agit de la couleur du texte ou de la couleur du fond. Par d\u00e9faut, c'est la couleur du texte.

      \ -

      La composante que vous choisissez sera modifi\u00e9e jusqu'\u00e0 ce que l'outil trouve une couleur valide. L'autre couleur ne changera pas.

      \ +

      Couleur du texte / Premier plan

      \ +

      \ + C'est la couleur du texte. Vous pouvez remplir ce champ avec une valeur hexad\u00e9cimale. \ + Exemple : #AABBCC. Notez que #ABC fonctionne \u00e9galement, \ + nous compl\u00e9tons automatiquement le champ avec #AABBCC. \ + Vous pouvez \u00e9galement utiliser ce champ sans le caract\u00e8re #, \ + donc FFF ou FFFFFF fonctionne parfaitement. \ + La valeur saisie est alors pr\u00e9visualis\u00e9e \u00e0 droite du champ.\ +

      \ +

      Couleur du fond / Arri\u00e8re-plan

      \ +

      C'est la couleur d'arri\u00e8re-plan. Ce champ fonctionne comme le champs couleur du texte.\

      Ratio minimum

      \

      Trois valeurs possibles : 3, 4.5 et 7.

      \

      Comment choisir un ratio ? Cela d\u00e9pend des \u00e9l\u00e9ments suivants :

      \
        \
      • Niveau d'accessibilit\u00e9 souhait\u00e9 : AA ou AAA.
        • \ -
      • Taille du texte.
        • \
      • Le texte est-il en gras ?
        • \ +
      • Taille du texte.
        • \
      \

      Informations d\u00e9taill\u00e9es sur le rapport de contraste entre le texte et son arri\u00e8re-plan :

      \
        \ @@ -86,6 +94,9 @@ home.noResultTxt=

        Aide

        \
      \ \
    \ +

    Couleur \u00e0 modifier

    \ +

    Il s'agit de la couleur du texte ou de la couleur du fond. Par d\u00e9faut, c'est la couleur du texte.

    \ +

    La couleur que vous choisissez sera modifi\u00e9e jusqu'\u00e0 ce que l'outil trouve une couleur valide. L'autre couleur ne changera pas.

    \

    Une question ?

    \

    Si vous avez des questions ou des remarques sur Contrast-Finder, contactez-nous :

    \
      \ diff --git a/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css b/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css index b82bd83e..55d63c8a 100644 --- a/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css +++ b/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css @@ -217,6 +217,10 @@ footer { } /* header template */ -#header h1 { - margin-top: 0; -} \ No newline at end of file + #header_title h1 { + margin-top: 0; + letter-spacing: 0.15em; + } + #header_title { + margin-left: 13.5em; + } \ No newline at end of file diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp index 3c8547cb..33a9f78c 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -96,6 +96,7 @@
+ <%-- Component to modify --%>
@@ -144,9 +145,12 @@
+ + +
- +
diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/header.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/header.jspf index d2f3e6c0..df6f0a95 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/header.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/header.jspf @@ -2,7 +2,7 @@ <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@page pageEncoding="UTF-8"%> -
+
@@ -28,7 +28,7 @@ -
+
+ - -

${appName}

-

-

- "> - WCAG 1.4.3 - - -

- -
\ No newline at end of file + +
+

${appName_v2}

+

+

+ "> + WCAG 1.4.3 + + +

+
+ \ No newline at end of file From fb011419730e10db71773df003fd199d3b3635c5 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 23:14:51 +0200 Subject: [PATCH 28/32] fixed #34 HTML errors Error: Duplicate attribute name Error: Element legend not allowed as child of element div in this context Warning: The form role is unnecessary for element form. --- .../src/main/webapp/Css/30-contrast-finder.css | 9 +++++++-- .../src/main/webapp/WEB-INF/pages/form.jsp | 10 ++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css b/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css index 55d63c8a..7529841b 100644 --- a/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css +++ b/contrast-finder-webapp/src/main/webapp/Css/30-contrast-finder.css @@ -12,6 +12,10 @@ a:hover, a:focus { color : #23537D; /* AAA */ } +code { + color: #C7254E; + color: #A6083B; /* AAA */ +} /* Bootstrap override */ .help-block { @@ -94,13 +98,14 @@ a:hover, a:focus { margin-right: 5px; } -.control-fieldset legend { +legend.control-fieldset { border: none; font-size: 14px; font-weight: bold; text-align: right; } + .cf-group-fields { border: 1px solid #CCC; border-radius: 4px; @@ -137,7 +142,7 @@ a:hover, a:focus { } } @media (max-width: 1199px) { - .control-fieldset legend { + legend.control-fieldset { text-align: left; margin-bottom: 0; } diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp index 33a9f78c..4cc2c9e4 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/pages/form.jsp @@ -26,7 +26,7 @@ - + <%-- Foregound --%> @@ -121,20 +121,18 @@
-
- -
+
From b7a8361b02facfb75b54f357f44adeeff0d99f76 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 23:30:19 +0200 Subject: [PATCH 29/32] update CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaca6025..782a69d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ -Contrast-Finder 0.4.5, 2017-03-xx +Contrast-Finder 0.4.5, 2017-03-30 --------------------------------- Features: @@ -10,6 +10,7 @@ Security: - revert [#23 - Added HTTP security headers](https://github.com/Asqatasun/Contrast-Finder/issues/23) Bugs: +- [#33 - Fixed HTML errors](https://github.com/Asqatasun/Contrast-Finder/issues/33) - [#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) From a71317e1c621b6de478e569f3e6bf6cc7abe85e4 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 23:34:54 +0200 Subject: [PATCH 30/32] webapp LOG: fixed daily rollover --- contrast-finder-webapp/src/main/resources/logback.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrast-finder-webapp/src/main/resources/logback.xml b/contrast-finder-webapp/src/main/resources/logback.xml index 98509986..9002c0ab 100644 --- a/contrast-finder-webapp/src/main/resources/logback.xml +++ b/contrast-finder-webapp/src/main/resources/logback.xml @@ -22,8 +22,8 @@ /var/log/contrast-finder/contrast-finder.%d{yyyy-MM-dd}_%i.log.zip 50MB - 10 - 450MB + 4 + 300MB From f261f8fd7a1407efff3986ad4faa1438fbc70379 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 23:41:05 +0200 Subject: [PATCH 31/32] fixed CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 782a69d4..7eaeda3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ Security: - revert [#23 - Added HTTP security headers](https://github.com/Asqatasun/Contrast-Finder/issues/23) Bugs: -- [#33 - Fixed HTML errors](https://github.com/Asqatasun/Contrast-Finder/issues/33) +- [#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) From d1b3a1044306af463b090860370dd7ada3a56004 Mon Sep 17 00:00:00 2001 From: Fabrice Gangler Date: Wed, 29 Mar 2017 23:45:35 +0200 Subject: [PATCH 32/32] set version to 0.4.5 --- contrast-finder-api/pom.xml | 4 ++-- contrast-finder-hsv/pom.xml | 4 ++-- contrast-finder-impl/pom.xml | 4 ++-- contrast-finder-resources/pom.xml | 4 ++-- contrast-finder-utils/pom.xml | 4 ++-- contrast-finder-webapp/pom.xml | 4 ++-- .../main/webapp/WEB-INF/template/template_variables.jspf | 2 +- docker/RELEASE/Dockerfile | 8 ++++---- docker/RELEASE/README.md | 3 ++- docker/SNAPSHOT-local_from-Tomcat/Dockerfile | 2 +- docker/SNAPSHOT-local_from-Ubuntu/Dockerfile | 2 +- pom.xml | 2 +- 12 files changed, 22 insertions(+), 21 deletions(-) diff --git a/contrast-finder-api/pom.xml b/contrast-finder-api/pom.xml index 8a3e6b70..d3cf2c09 100644 --- a/contrast-finder-api/pom.xml +++ b/contrast-finder-api/pom.xml @@ -4,11 +4,11 @@ org.asqatasun contrast-finder - 0.4.5-dev + 0.4.5 contrast-finder-api - 0.4.5-dev + 0.4.5 jar contrast-finder-api diff --git a/contrast-finder-hsv/pom.xml b/contrast-finder-hsv/pom.xml index b13641f6..0223164e 100644 --- a/contrast-finder-hsv/pom.xml +++ b/contrast-finder-hsv/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.5-dev + 0.4.5 contrast-finder-hsv - 0.4.5-dev + 0.4.5 jar contrast-finder-hsv diff --git a/contrast-finder-impl/pom.xml b/contrast-finder-impl/pom.xml index 5ae16d45..5430e7e9 100644 --- a/contrast-finder-impl/pom.xml +++ b/contrast-finder-impl/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.5-dev + 0.4.5 contrast-finder-impl - 0.4.5-dev + 0.4.5 jar contrast-finder-impl diff --git a/contrast-finder-resources/pom.xml b/contrast-finder-resources/pom.xml index 3f8fd7ca..96144731 100644 --- a/contrast-finder-resources/pom.xml +++ b/contrast-finder-resources/pom.xml @@ -5,10 +5,10 @@ org.asqatasun contrast-finder - 0.4.5-dev + 0.4.5 contrast-finder-resources - 0.4.5-dev + 0.4.5 contrast-finder-resources http://maven.apache.org diff --git a/contrast-finder-utils/pom.xml b/contrast-finder-utils/pom.xml index 31175a0c..32dccb6c 100644 --- a/contrast-finder-utils/pom.xml +++ b/contrast-finder-utils/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.5-dev + 0.4.5 contrast-finder-utils - 0.4.5-dev + 0.4.5 jar contrast-finder-utils diff --git a/contrast-finder-webapp/pom.xml b/contrast-finder-webapp/pom.xml index 0549f565..1d010431 100644 --- a/contrast-finder-webapp/pom.xml +++ b/contrast-finder-webapp/pom.xml @@ -4,10 +4,10 @@ org.asqatasun contrast-finder - 0.4.5-dev + 0.4.5 contrast-finder-webapp - 0.4.5-dev + 0.4.5 war contrast-finder-webapp diff --git a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/template_variables.jspf b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/template_variables.jspf index 5c47d45a..37aa347f 100644 --- a/contrast-finder-webapp/src/main/webapp/WEB-INF/template/template_variables.jspf +++ b/contrast-finder-webapp/src/main/webapp/WEB-INF/template/template_variables.jspf @@ -2,7 +2,7 @@ <%@ page pageEncoding="UTF-8" %> <%-- APP version --%> - + <%-- APP Name --%> diff --git a/docker/RELEASE/Dockerfile b/docker/RELEASE/Dockerfile index dc688c5c..c9650750 100644 --- a/docker/RELEASE/Dockerfile +++ b/docker/RELEASE/Dockerfile @@ -4,9 +4,9 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu # # --- Building this docker image # docker build -t asqatasun/contrast-finder . -# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.4.5-dev . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.5-dev/ . -# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.5-dev/contrast-finder_0.4.5-dev.i386.tar.gz . +# docker build -t asqatasun/contrast-finder --build-arg CONTRAST_FINDER_RELEASE=0.4.5 . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL_PREFIX=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.5/ . +# docker build -t asqatasun/contrast-finder --build-arg SRC_URL=https://github.com/Asqatasun/Contrast-Finder/releases/download/v0.4.5/contrast-finder_0.4.5.i386.tar.gz . # # --- Launch a container # docker run -p 127.0.0.1:8087:8080 --name contrast.finder -d asqatasun/contrast-finder @@ -27,7 +27,7 @@ FROM asqatasun/contrast-finder:pre-requisites_from-Ubuntu ################################################################### # build variables -ARG CONTRAST_FINDER_RELEASE="0.4.5-dev" +ARG CONTRAST_FINDER_RELEASE="0.4.5" 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 index 82f492ff..11980440 100644 --- 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.4.4, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/docker/RELEASE/Dockerfile) +* [v0.4.5, latest](https://github.com/Asqatasun/Contrast-Finder/blob/master/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) diff --git a/docker/SNAPSHOT-local_from-Tomcat/Dockerfile b/docker/SNAPSHOT-local_from-Tomcat/Dockerfile index 44304c31..6d5f8231 100644 --- 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.4.5-dev" +ENV CONTRAST_FINDER_RELEASE="0.4.5" 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 index ca14fc73..f499462a 100644 --- 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.4.5-dev" +ENV CONTRAST_FINDER_RELEASE="0.4.5" # Add contrast-finder .war ADD contrast-finder_${CONTRAST_FINDER_RELEASE}.i386.tar.gz /root diff --git a/pom.xml b/pom.xml index 7db3af97..d0ba30a7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.asqatasun contrast-finder pom - 0.4.5-dev + 0.4.5 contrast-finder contrast-finder-api