From 7edfcf6a5a9705b57027384eb2f755bc48595557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Clermont=C3=A9?= Date: Wed, 14 Mar 2018 21:55:21 +0100 Subject: [PATCH] renamed in cadal --- .classpath | 2 +- .../LibreEnCadeau.java => cadal/Cadal.java} | 12 ++++++------ .../{libreencadeau => cadal}/website/FatalView.java | 2 +- .../website/Index_xhtml.java | 2 +- .../website/Raw_hello_xhtml.java | 2 +- .../{libreencadeau => cadal}/website/camenbert.jpg | Bin .../website/charter/cadal.css} | 0 .../website/charter/charter.html | 0 .../website/charter/kiss4web.css | 0 .../website/charter/logo-cadal-48x.png | Bin .../{libreencadeau => cadal}/website/favicon.ico | Bin .../{libreencadeau => cadal}/website/index.html | 0 .../website/pages/Cadal_xhtml.java | 4 ++-- .../website/pages/Contact_xhtml.java | 4 ++-- .../website/pages/Faq_xhtml.java | 4 ++-- .../website/pages/Legal_xhtml.java | 4 ++-- .../website/pages/accueil.html | 0 .../website/pages/cadal.html | 0 .../website/pages/contact.html | 0 .../{libreencadeau => cadal}/website/pages/faq.html | 0 .../website/pages/legal.html | 0 .../website/pages/menu.html | 0 .../april/{libreencadeau => cadal}/FooSandbox.java | 2 +- 23 files changed, 19 insertions(+), 19 deletions(-) rename src/org/april/{libreencadeau/LibreEnCadeau.java => cadal/Cadal.java} (81%) rename src/org/april/{libreencadeau => cadal}/website/FatalView.java (98%) rename src/org/april/{libreencadeau => cadal}/website/Index_xhtml.java (98%) rename src/org/april/{libreencadeau => cadal}/website/Raw_hello_xhtml.java (98%) rename src/org/april/{libreencadeau => cadal}/website/camenbert.jpg (100%) rename src/org/april/{libreencadeau/website/charter/libreencadeau.css => cadal/website/charter/cadal.css} (100%) rename src/org/april/{libreencadeau => cadal}/website/charter/charter.html (100%) rename src/org/april/{libreencadeau => cadal}/website/charter/kiss4web.css (100%) rename src/org/april/{libreencadeau => cadal}/website/charter/logo-cadal-48x.png (100%) rename src/org/april/{libreencadeau => cadal}/website/favicon.ico (100%) rename src/org/april/{libreencadeau => cadal}/website/index.html (100%) rename src/org/april/{libreencadeau => cadal}/website/pages/Cadal_xhtml.java (96%) rename src/org/april/{libreencadeau => cadal}/website/pages/Contact_xhtml.java (96%) rename src/org/april/{libreencadeau => cadal}/website/pages/Faq_xhtml.java (96%) rename src/org/april/{libreencadeau => cadal}/website/pages/Legal_xhtml.java (96%) rename src/org/april/{libreencadeau => cadal}/website/pages/accueil.html (100%) rename src/org/april/{libreencadeau => cadal}/website/pages/cadal.html (100%) rename src/org/april/{libreencadeau => cadal}/website/pages/contact.html (100%) rename src/org/april/{libreencadeau => cadal}/website/pages/faq.html (100%) rename src/org/april/{libreencadeau => cadal}/website/pages/legal.html (100%) rename src/org/april/{libreencadeau => cadal}/website/pages/menu.html (100%) rename test/org/april/{libreencadeau => cadal}/FooSandbox.java (98%) diff --git a/.classpath b/.classpath index ac62b53..17857f3 100644 --- a/.classpath +++ b/.classpath @@ -32,6 +32,6 @@ - + diff --git a/src/org/april/libreencadeau/LibreEnCadeau.java b/src/org/april/cadal/Cadal.java similarity index 81% rename from src/org/april/libreencadeau/LibreEnCadeau.java rename to src/org/april/cadal/Cadal.java index 7c2d878..0ca5737 100644 --- a/src/org/april/libreencadeau/LibreEnCadeau.java +++ b/src/org/april/cadal/Cadal.java @@ -16,27 +16,27 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau; +package org.april.cadal; /** * * * @author Christian P. Momon */ -public class LibreEnCadeau +public class Cadal { private static class SingletonHolder { - private static final LibreEnCadeau instance = new LibreEnCadeau(); + private static final Cadal instance = new Cadal(); } - private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(LibreEnCadeau.class); + private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(Cadal.class); /** * @throws Exception * */ - private LibreEnCadeau() + private Cadal() { } @@ -44,7 +44,7 @@ public class LibreEnCadeau * * @return */ - public static LibreEnCadeau instance() + public static Cadal instance() { return SingletonHolder.instance; } diff --git a/src/org/april/libreencadeau/website/FatalView.java b/src/org/april/cadal/website/FatalView.java similarity index 98% rename from src/org/april/libreencadeau/website/FatalView.java rename to src/org/april/cadal/website/FatalView.java index 0f1bb7e..e802344 100644 --- a/src/org/april/libreencadeau/website/FatalView.java +++ b/src/org/april/cadal/website/FatalView.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website; +package org.april.cadal.website; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/org/april/libreencadeau/website/Index_xhtml.java b/src/org/april/cadal/website/Index_xhtml.java similarity index 98% rename from src/org/april/libreencadeau/website/Index_xhtml.java rename to src/org/april/cadal/website/Index_xhtml.java index 575704d..026a585 100644 --- a/src/org/april/libreencadeau/website/Index_xhtml.java +++ b/src/org/april/cadal/website/Index_xhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website; +package org.april.cadal.website; import java.io.IOException; diff --git a/src/org/april/libreencadeau/website/Raw_hello_xhtml.java b/src/org/april/cadal/website/Raw_hello_xhtml.java similarity index 98% rename from src/org/april/libreencadeau/website/Raw_hello_xhtml.java rename to src/org/april/cadal/website/Raw_hello_xhtml.java index 2f8e291..c36886c 100644 --- a/src/org/april/libreencadeau/website/Raw_hello_xhtml.java +++ b/src/org/april/cadal/website/Raw_hello_xhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website; +package org.april.cadal.website; import java.io.IOException; import java.io.PrintWriter; diff --git a/src/org/april/libreencadeau/website/camenbert.jpg b/src/org/april/cadal/website/camenbert.jpg similarity index 100% rename from src/org/april/libreencadeau/website/camenbert.jpg rename to src/org/april/cadal/website/camenbert.jpg diff --git a/src/org/april/libreencadeau/website/charter/libreencadeau.css b/src/org/april/cadal/website/charter/cadal.css similarity index 100% rename from src/org/april/libreencadeau/website/charter/libreencadeau.css rename to src/org/april/cadal/website/charter/cadal.css diff --git a/src/org/april/libreencadeau/website/charter/charter.html b/src/org/april/cadal/website/charter/charter.html similarity index 100% rename from src/org/april/libreencadeau/website/charter/charter.html rename to src/org/april/cadal/website/charter/charter.html diff --git a/src/org/april/libreencadeau/website/charter/kiss4web.css b/src/org/april/cadal/website/charter/kiss4web.css similarity index 100% rename from src/org/april/libreencadeau/website/charter/kiss4web.css rename to src/org/april/cadal/website/charter/kiss4web.css diff --git a/src/org/april/libreencadeau/website/charter/logo-cadal-48x.png b/src/org/april/cadal/website/charter/logo-cadal-48x.png similarity index 100% rename from src/org/april/libreencadeau/website/charter/logo-cadal-48x.png rename to src/org/april/cadal/website/charter/logo-cadal-48x.png diff --git a/src/org/april/libreencadeau/website/favicon.ico b/src/org/april/cadal/website/favicon.ico similarity index 100% rename from src/org/april/libreencadeau/website/favicon.ico rename to src/org/april/cadal/website/favicon.ico diff --git a/src/org/april/libreencadeau/website/index.html b/src/org/april/cadal/website/index.html similarity index 100% rename from src/org/april/libreencadeau/website/index.html rename to src/org/april/cadal/website/index.html diff --git a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java b/src/org/april/cadal/website/pages/Cadal_xhtml.java similarity index 96% rename from src/org/april/libreencadeau/website/pages/Cadal_xhtml.java rename to src/org/april/cadal/website/pages/Cadal_xhtml.java index 0075304..9ecf70c 100644 --- a/src/org/april/libreencadeau/website/pages/Cadal_xhtml.java +++ b/src/org/april/cadal/website/pages/Cadal_xhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website.pages; +package org.april.cadal.website.pages; import java.io.IOException; @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.april.libreencadeau.website.FatalView; +import org.april.cadal.website.FatalView; import fr.devinsy.xidyn.pages.Page; import fr.devinsy.xidyn.pages.PageFactory; diff --git a/src/org/april/libreencadeau/website/pages/Contact_xhtml.java b/src/org/april/cadal/website/pages/Contact_xhtml.java similarity index 96% rename from src/org/april/libreencadeau/website/pages/Contact_xhtml.java rename to src/org/april/cadal/website/pages/Contact_xhtml.java index 022c00c..2351795 100644 --- a/src/org/april/libreencadeau/website/pages/Contact_xhtml.java +++ b/src/org/april/cadal/website/pages/Contact_xhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website.pages; +package org.april.cadal.website.pages; import java.io.IOException; @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.april.libreencadeau.website.FatalView; +import org.april.cadal.website.FatalView; import fr.devinsy.xidyn.pages.Page; import fr.devinsy.xidyn.pages.PageFactory; diff --git a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java b/src/org/april/cadal/website/pages/Faq_xhtml.java similarity index 96% rename from src/org/april/libreencadeau/website/pages/Faq_xhtml.java rename to src/org/april/cadal/website/pages/Faq_xhtml.java index fc7f072..ecf6e08 100644 --- a/src/org/april/libreencadeau/website/pages/Faq_xhtml.java +++ b/src/org/april/cadal/website/pages/Faq_xhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website.pages; +package org.april.cadal.website.pages; import java.io.IOException; @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.april.libreencadeau.website.FatalView; +import org.april.cadal.website.FatalView; import fr.devinsy.xidyn.pages.Page; import fr.devinsy.xidyn.pages.PageFactory; diff --git a/src/org/april/libreencadeau/website/pages/Legal_xhtml.java b/src/org/april/cadal/website/pages/Legal_xhtml.java similarity index 96% rename from src/org/april/libreencadeau/website/pages/Legal_xhtml.java rename to src/org/april/cadal/website/pages/Legal_xhtml.java index e11a17e..e630e2c 100644 --- a/src/org/april/libreencadeau/website/pages/Legal_xhtml.java +++ b/src/org/april/cadal/website/pages/Legal_xhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau.website.pages; +package org.april.cadal.website.pages; import java.io.IOException; @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.april.libreencadeau.website.FatalView; +import org.april.cadal.website.FatalView; import fr.devinsy.xidyn.pages.Page; import fr.devinsy.xidyn.pages.PageFactory; diff --git a/src/org/april/libreencadeau/website/pages/accueil.html b/src/org/april/cadal/website/pages/accueil.html similarity index 100% rename from src/org/april/libreencadeau/website/pages/accueil.html rename to src/org/april/cadal/website/pages/accueil.html diff --git a/src/org/april/libreencadeau/website/pages/cadal.html b/src/org/april/cadal/website/pages/cadal.html similarity index 100% rename from src/org/april/libreencadeau/website/pages/cadal.html rename to src/org/april/cadal/website/pages/cadal.html diff --git a/src/org/april/libreencadeau/website/pages/contact.html b/src/org/april/cadal/website/pages/contact.html similarity index 100% rename from src/org/april/libreencadeau/website/pages/contact.html rename to src/org/april/cadal/website/pages/contact.html diff --git a/src/org/april/libreencadeau/website/pages/faq.html b/src/org/april/cadal/website/pages/faq.html similarity index 100% rename from src/org/april/libreencadeau/website/pages/faq.html rename to src/org/april/cadal/website/pages/faq.html diff --git a/src/org/april/libreencadeau/website/pages/legal.html b/src/org/april/cadal/website/pages/legal.html similarity index 100% rename from src/org/april/libreencadeau/website/pages/legal.html rename to src/org/april/cadal/website/pages/legal.html diff --git a/src/org/april/libreencadeau/website/pages/menu.html b/src/org/april/cadal/website/pages/menu.html similarity index 100% rename from src/org/april/libreencadeau/website/pages/menu.html rename to src/org/april/cadal/website/pages/menu.html diff --git a/test/org/april/libreencadeau/FooSandbox.java b/test/org/april/cadal/FooSandbox.java similarity index 98% rename from test/org/april/libreencadeau/FooSandbox.java rename to test/org/april/cadal/FooSandbox.java index 182c466..23849ce 100644 --- a/test/org/april/libreencadeau/FooSandbox.java +++ b/test/org/april/cadal/FooSandbox.java @@ -17,7 +17,7 @@ * along with LibreEnCadeau. If not, see */ -package org.april.libreencadeau; +package org.april.cadal; import org.junit.Assert; import org.junit.Test;