From d217d58a2479112a04a33fef1d118415a972401f Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Fri, 1 Dec 2023 05:26:20 +0100 Subject: [PATCH] Refactored services directory tree. --- .project | 1 - .../org.eclipse.ltk.core.refactoring.prefs | 2 ++ .settings/org.eclipse.wst.common.component | 30 ++++++++---------- src/website/accueil.xhtml | 16 +++++----- src/website/charter/webCharterView.xhtml | 2 +- .../IndexXhtml.java} | 8 ++--- .../{AudioPage.java => audio/IndexXhtml.java} | 8 ++--- src/website/services/{ => audio}/audio.xhtml | 4 +-- src/website/services/{ => audio}/mumble1.png | Bin src/website/services/{ => audio}/mumble2.png | Bin src/website/services/{ => audio}/mumble2b.png | Bin .../IndexXhtml.java} | 8 ++--- .../img-lapin-800x.jpg} | Bin .../img-pyramide-800x.jpg} | Bin .../img-soleil-800x.jpg} | Bin .../img-vache-800x.jpg} | Bin .../services/{ => minetest}/minetest.xhtml | 8 ++--- .../{PadPage.java => pad/IndexXhtml.java} | 8 ++--- .../services/{ => pad}/etherpad_demo.gif | Bin src/website/services/{ => pad}/pad.xhtml | 2 +- .../IndexXhtml.java} | 8 ++--- src/website/services/{ => paste}/paste.xhtml | 4 +-- src/website/services/{ => paste}/paste00.png | Bin src/website/services/{ => paste}/paste1.png | Bin src/website/services/{ => paste}/paste2.png | Bin .../IndexXhtml.java} | 8 ++--- .../services/{ => qrcode}/qrcode.xhtml | 4 +-- .../services/{ => qrcode}/qrcode00.png | Bin src/website/services/{ => qrcode}/qrcode1.png | Bin src/website/services/{ => qrcode}/qrcode2.png | Bin src/website/{ => services}/services.xhtml | 24 ++++++++------ .../{PastePage.java => visio/IndexXhtml.java} | 8 ++--- .../services/{ => visio}/visio-chat.png | Bin .../services/{ => visio}/visio-chat2.png | Bin .../services/{ => visio}/visio-moderation.png | Bin .../{ => visio}/visio-moderation2.png | Bin .../services/{ => visio}/visio-options.png | Bin .../services/{ => visio}/visio-options2.png | Bin .../services/{ => visio}/visio-sondage.png | Bin .../services/{ => visio}/visio-sondage2.png | Bin src/website/services/{ => visio}/visio.xhtml | 10 +++--- src/website/services/{ => visio}/visio0.png | Bin src/website/services/{ => visio}/visio00.png | Bin src/website/services/{ => visio}/visio1.png | Bin src/website/services/{ => visio}/visio2.png | Bin src/website/services/{ => visio}/visio4.png | Bin .../WEB-INF/lib/kiss4web-0.17.1-sources.zip | Bin 0 -> 69377 bytes webapp/WEB-INF/lib/kiss4web-0.17.1.jar | Bin 0 -> 77905 bytes ...2-sources.zip => xidyn-1.17.0-sources.zip} | Bin 81575 -> 81708 bytes .../{xidyn-1.11.2.jar => xidyn-1.17.0.jar} | Bin 88709 -> 88920 bytes 50 files changed, 82 insertions(+), 81 deletions(-) create mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs rename src/website/{ServicesPage.java => services/IndexXhtml.java} (93%) rename src/website/services/{AudioPage.java => audio/IndexXhtml.java} (92%) rename src/website/services/{ => audio}/audio.xhtml (92%) rename src/website/services/{ => audio}/mumble1.png (100%) rename src/website/services/{ => audio}/mumble2.png (100%) rename src/website/services/{ => audio}/mumble2b.png (100%) rename src/website/services/{MinetestPage.java => minetest/IndexXhtml.java} (92%) rename src/website/services/{minetest-lapin-800x.jpg => minetest/img-lapin-800x.jpg} (100%) rename src/website/services/{minetest-pyramide-800x.jpg => minetest/img-pyramide-800x.jpg} (100%) rename src/website/services/{minetest-soleil-800x.jpg => minetest/img-soleil-800x.jpg} (100%) rename src/website/services/{minetest-vache-800x.jpg => minetest/img-vache-800x.jpg} (100%) rename src/website/services/{ => minetest}/minetest.xhtml (83%) rename src/website/services/{PadPage.java => pad/IndexXhtml.java} (93%) rename src/website/services/{ => pad}/etherpad_demo.gif (100%) rename src/website/services/{ => pad}/pad.xhtml (95%) rename src/website/services/{QrcodePage.java => paste/IndexXhtml.java} (92%) rename src/website/services/{ => paste}/paste.xhtml (91%) rename src/website/services/{ => paste}/paste00.png (100%) rename src/website/services/{ => paste}/paste1.png (100%) rename src/website/services/{ => paste}/paste2.png (100%) rename src/website/services/{VisioPage.java => qrcode/IndexXhtml.java} (92%) rename src/website/services/{ => qrcode}/qrcode.xhtml (91%) rename src/website/services/{ => qrcode}/qrcode00.png (100%) rename src/website/services/{ => qrcode}/qrcode1.png (100%) rename src/website/services/{ => qrcode}/qrcode2.png (100%) rename src/website/{ => services}/services.xhtml (51%) rename src/website/services/{PastePage.java => visio/IndexXhtml.java} (92%) rename src/website/services/{ => visio}/visio-chat.png (100%) rename src/website/services/{ => visio}/visio-chat2.png (100%) rename src/website/services/{ => visio}/visio-moderation.png (100%) rename src/website/services/{ => visio}/visio-moderation2.png (100%) rename src/website/services/{ => visio}/visio-options.png (100%) rename src/website/services/{ => visio}/visio-options2.png (100%) rename src/website/services/{ => visio}/visio-sondage.png (100%) rename src/website/services/{ => visio}/visio-sondage2.png (100%) rename src/website/services/{ => visio}/visio.xhtml (82%) rename src/website/services/{ => visio}/visio0.png (100%) rename src/website/services/{ => visio}/visio00.png (100%) rename src/website/services/{ => visio}/visio1.png (100%) rename src/website/services/{ => visio}/visio2.png (100%) rename src/website/services/{ => visio}/visio4.png (100%) create mode 100644 webapp/WEB-INF/lib/kiss4web-0.17.1-sources.zip create mode 100644 webapp/WEB-INF/lib/kiss4web-0.17.1.jar rename webapp/WEB-INF/lib/{xidyn-1.11.2-sources.zip => xidyn-1.17.0-sources.zip} (85%) rename webapp/WEB-INF/lib/{xidyn-1.11.2.jar => xidyn-1.17.0.jar} (77%) diff --git a/.project b/.project index c048311..2842eea 100644 --- a/.project +++ b/.project @@ -3,7 +3,6 @@ LSEUWeb - kiss4web diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000..b196c64 --- /dev/null +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 7db0984..e3f47e4 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,39 +1,35 @@ - + + - + + - + + - + + - - - - - - - uses - - - - + - + + - + + diff --git a/src/website/accueil.xhtml b/src/website/accueil.xhtml index 8bc0e2b..ec4f094 100644 --- a/src/website/accueil.xhtml +++ b/src/website/accueil.xhtml @@ -31,27 +31,27 @@

Les services

Audio : Utiliser - Découvrir + Découvrir

Minetest : Utiliser - Découvrir + Découvrir

Pad : Utiliser - Découvrir + Découvrir

Paste : Utiliser - Découvrir + Découvrir

QRcode : Utiliser - Découvrir + Découvrir

Visio : Utiliser - Découvrir + Découvrir

@@ -96,7 +96,7 @@

02 avril 2022 : visio mensuelle avec l'équipe de Libre-service.eu à 11h00 sur notre salon dédié  

-

26 mars 2022 : Libre-service.eu ouvre un nouveau service de traitement de texte collaboratif basé sur Etherpad +

26 mars 2022 : Libre-service.eu ouvre un nouveau service de traitement de texte collaboratif basé sur Etherpad

05 mars 2022 : visio mensuelle avec l'équipe de Libre-service.eu à 11h00 sur notre salon dédié  

@@ -106,7 +106,7 @@

24 décembre 2021 : Libre-service.eu vous souhaite de bonnes fêtes de fin d'année dans un monde libre, éthique et loyal ☃ 🎉

-

23 décembre 2021 : Libre-service.eu ouvre un nouveau service Minetest basé sur Mineclone2. +

23 décembre 2021 : Libre-service.eu ouvre un nouveau service Minetest basé sur Mineclone2.

21 décembre 2021 : Libre-service.eu rejoint officiellement le collectif CHATONS Logo CHATONS

diff --git a/src/website/charter/webCharterView.xhtml b/src/website/charter/webCharterView.xhtml index 075e84f..b370a40 100644 --- a/src/website/charter/webCharterView.xhtml +++ b/src/website/charter/webCharterView.xhtml @@ -28,7 +28,7 @@ diff --git a/src/website/ServicesPage.java b/src/website/services/IndexXhtml.java similarity index 93% rename from src/website/ServicesPage.java rename to src/website/services/IndexXhtml.java index 4d6a444..280224b 100644 --- a/src/website/ServicesPage.java +++ b/src/website/services/IndexXhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreServiceEUWeb. If not, see . */ -package website; +package website.services; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class AccueilPage. */ -public class ServicesPage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(ServicesPage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -59,7 +59,7 @@ public class ServicesPage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/services.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/AudioPage.java b/src/website/services/audio/IndexXhtml.java similarity index 92% rename from src/website/services/AudioPage.java rename to src/website/services/audio/IndexXhtml.java index 75df442..3028c73 100644 --- a/src/website/services/AudioPage.java +++ b/src/website/services/audio/IndexXhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreServiceEUWeb. If not, see . */ -package website.services; +package website.services.audio; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class AccueilPage. */ -public class AudioPage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(AudioPage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -58,7 +58,7 @@ public class AudioPage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services/audio.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/audio/audio.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/audio.xhtml b/src/website/services/audio/audio.xhtml similarity index 92% rename from src/website/services/audio.xhtml rename to src/website/services/audio/audio.xhtml index 5369920..158c63a 100644 --- a/src/website/services/audio.xhtml +++ b/src/website/services/audio/audio.xhtml @@ -16,8 +16,8 @@

Description

- L'interface graphique Mumble -

Informations de connexion

+ L'interface graphique Mumble +

Informations de connexion

Audio.libre-service.eu est un service d'audio-conférence basé sur le logiciel libre Mumble.

Quelques caractéristiques :

diff --git a/src/website/services/mumble1.png b/src/website/services/audio/mumble1.png similarity index 100% rename from src/website/services/mumble1.png rename to src/website/services/audio/mumble1.png diff --git a/src/website/services/mumble2.png b/src/website/services/audio/mumble2.png similarity index 100% rename from src/website/services/mumble2.png rename to src/website/services/audio/mumble2.png diff --git a/src/website/services/mumble2b.png b/src/website/services/audio/mumble2b.png similarity index 100% rename from src/website/services/mumble2b.png rename to src/website/services/audio/mumble2b.png diff --git a/src/website/services/MinetestPage.java b/src/website/services/minetest/IndexXhtml.java similarity index 92% rename from src/website/services/MinetestPage.java rename to src/website/services/minetest/IndexXhtml.java index 751dfb9..6d561c0 100644 --- a/src/website/services/MinetestPage.java +++ b/src/website/services/minetest/IndexXhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreServiceEUWeb. If not, see . */ -package website.services; +package website.services.minetest; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class MinetestPage. */ -public class MinetestPage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(MinetestPage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -58,7 +58,7 @@ public class MinetestPage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services/minetest.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/minetest/minetest.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/minetest-lapin-800x.jpg b/src/website/services/minetest/img-lapin-800x.jpg similarity index 100% rename from src/website/services/minetest-lapin-800x.jpg rename to src/website/services/minetest/img-lapin-800x.jpg diff --git a/src/website/services/minetest-pyramide-800x.jpg b/src/website/services/minetest/img-pyramide-800x.jpg similarity index 100% rename from src/website/services/minetest-pyramide-800x.jpg rename to src/website/services/minetest/img-pyramide-800x.jpg diff --git a/src/website/services/minetest-soleil-800x.jpg b/src/website/services/minetest/img-soleil-800x.jpg similarity index 100% rename from src/website/services/minetest-soleil-800x.jpg rename to src/website/services/minetest/img-soleil-800x.jpg diff --git a/src/website/services/minetest-vache-800x.jpg b/src/website/services/minetest/img-vache-800x.jpg similarity index 100% rename from src/website/services/minetest-vache-800x.jpg rename to src/website/services/minetest/img-vache-800x.jpg diff --git a/src/website/services/minetest.xhtml b/src/website/services/minetest/minetest.xhtml similarity index 83% rename from src/website/services/minetest.xhtml rename to src/website/services/minetest/minetest.xhtml index 95110ff..6aa1356 100644 --- a/src/website/services/minetest.xhtml +++ b/src/website/services/minetest/minetest.xhtml @@ -14,10 +14,10 @@

Le service Minetest.libre-service.eu

- Coucher de soleil dans le monde de Libremine
- Rencontre avec un lapin dans le monde de Libremine
- Rencontre avec une vache dans le monde de Libremine
- En quête d'une pyramide dans le monde de Libremine + Coucher de soleil dans le monde de Libremine
+ Rencontre avec un lapin dans le monde de Libremine
+ Rencontre avec une vache dans le monde de Libremine
+ En quête d'une pyramide dans le monde de Libremine

Description

diff --git a/src/website/services/PadPage.java b/src/website/services/pad/IndexXhtml.java similarity index 93% rename from src/website/services/PadPage.java rename to src/website/services/pad/IndexXhtml.java index c5e0f53..c506f37 100644 --- a/src/website/services/PadPage.java +++ b/src/website/services/pad/IndexXhtml.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with LibreServiceEUWeb. If not, see . */ -package website.services; +package website.services.pad; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class PadPage. */ -public class PadPage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(PadPage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -59,7 +59,7 @@ public class PadPage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services/pad.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/pad/pad.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/etherpad_demo.gif b/src/website/services/pad/etherpad_demo.gif similarity index 100% rename from src/website/services/etherpad_demo.gif rename to src/website/services/pad/etherpad_demo.gif diff --git a/src/website/services/pad.xhtml b/src/website/services/pad/pad.xhtml similarity index 95% rename from src/website/services/pad.xhtml rename to src/website/services/pad/pad.xhtml index d7f8a5c..ac8ad39 100644 --- a/src/website/services/pad.xhtml +++ b/src/website/services/pad/pad.xhtml @@ -17,7 +17,7 @@

Pad.libre-service.eu est un service de rédaction collaborative de texte basé sur le logiciel libre Etherpad.

- Démonstration du service + Démonstration du service

Quelques caractéristiques :