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 :

    diff --git a/src/website/services/QrcodePage.java b/src/website/services/paste/IndexXhtml.java similarity index 92% rename from src/website/services/QrcodePage.java rename to src/website/services/paste/IndexXhtml.java index 8c929dd..812b5d6 100644 --- a/src/website/services/QrcodePage.java +++ b/src/website/services/paste/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.paste; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class AccueilPage. */ -public class QrcodePage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(QrcodePage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -59,7 +59,7 @@ public class QrcodePage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services/qrcode.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/paste/paste.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/paste.xhtml b/src/website/services/paste/paste.xhtml similarity index 91% rename from src/website/services/paste.xhtml rename to src/website/services/paste/paste.xhtml index f39e524..59909d1 100644 --- a/src/website/services/paste.xhtml +++ b/src/website/services/paste/paste.xhtml @@ -16,8 +16,8 @@

    Description

    - Copie d'écran -

    Copie d'écran

    + Copie d'écran +

    Copie d'écran

    Paste.libre-service.eu est un service de transfert de texte chiffré basé sur le logiciel libre PrivateBin.

    Quelques caractéristiques :

    diff --git a/src/website/services/paste00.png b/src/website/services/paste/paste00.png similarity index 100% rename from src/website/services/paste00.png rename to src/website/services/paste/paste00.png diff --git a/src/website/services/paste1.png b/src/website/services/paste/paste1.png similarity index 100% rename from src/website/services/paste1.png rename to src/website/services/paste/paste1.png diff --git a/src/website/services/paste2.png b/src/website/services/paste/paste2.png similarity index 100% rename from src/website/services/paste2.png rename to src/website/services/paste/paste2.png diff --git a/src/website/services/VisioPage.java b/src/website/services/qrcode/IndexXhtml.java similarity index 92% rename from src/website/services/VisioPage.java rename to src/website/services/qrcode/IndexXhtml.java index 1b07c9d..c3935d5 100644 --- a/src/website/services/VisioPage.java +++ b/src/website/services/qrcode/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.qrcode; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class AccueilPage. */ -public class VisioPage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(VisioPage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -59,7 +59,7 @@ public class VisioPage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services/visio.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/qrcode/qrcode.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/qrcode.xhtml b/src/website/services/qrcode/qrcode.xhtml similarity index 91% rename from src/website/services/qrcode.xhtml rename to src/website/services/qrcode/qrcode.xhtml index c0e0adc..d8a604e 100644 --- a/src/website/services/qrcode.xhtml +++ b/src/website/services/qrcode/qrcode.xhtml @@ -16,7 +16,7 @@

    Description

    - Copie d'écran + Copie d'écran

    QRcode.libre-service.eu est un service de génération de code QR basé sur le logiciel libre LibreQR.

    Quelques caractéristiques :

      @@ -32,7 +32,7 @@
      Un code QR, en anglais QR code, en forme longue quick response code, « code à réponse rapide », est un type de code-barres à deux dimensions (ou code matriciel) — format optique lisible par machine pouvant être visualisé sur l'écran d’un appareil mobile ou imprimé sur papier — constitué de modules-carrés noirs disposés dans un carré à fond blanc. Ces points définissent l'information que contient le code.

    Exemple de QRcode généré par le service :

    - Copie d'écran + Copie d'écran

    Les sources

    Les codes sources du service qrcode.libre-service.eu sont disponibles sur notre forge.

    diff --git a/src/website/services/qrcode00.png b/src/website/services/qrcode/qrcode00.png similarity index 100% rename from src/website/services/qrcode00.png rename to src/website/services/qrcode/qrcode00.png diff --git a/src/website/services/qrcode1.png b/src/website/services/qrcode/qrcode1.png similarity index 100% rename from src/website/services/qrcode1.png rename to src/website/services/qrcode/qrcode1.png diff --git a/src/website/services/qrcode2.png b/src/website/services/qrcode/qrcode2.png similarity index 100% rename from src/website/services/qrcode2.png rename to src/website/services/qrcode/qrcode2.png diff --git a/src/website/services.xhtml b/src/website/services/services.xhtml similarity index 51% rename from src/website/services.xhtml rename to src/website/services/services.xhtml index 009daee..b79dc1b 100644 --- a/src/website/services.xhtml +++ b/src/website/services/services.xhtml @@ -14,24 +14,28 @@

    Les services

    Liste de tous les services proposés par Libre-service.eu :

    + diff --git a/src/website/services/PastePage.java b/src/website/services/visio/IndexXhtml.java similarity index 92% rename from src/website/services/PastePage.java rename to src/website/services/visio/IndexXhtml.java index e9cfbe4..f0b8c05 100644 --- a/src/website/services/PastePage.java +++ b/src/website/services/visio/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.visio; import java.io.IOException; @@ -35,10 +35,10 @@ import website.charter.WebCharterView; /** * The Class AccueilPage. */ -public class PastePage extends HttpServlet +public class IndexXhtml extends HttpServlet { private static final long serialVersionUID = -8225743451426546008L; - private static Logger logger = LoggerFactory.getLogger(PastePage.class); + private static Logger logger = LoggerFactory.getLogger(IndexXhtml.class); /** * {@inheritDoc} @@ -59,7 +59,7 @@ public class PastePage extends HttpServlet // ============== TagDataManager data = new TagDataManager(); - String page = PresenterUtils.dynamize("/website/services/paste.xhtml", data).toString(); + String page = PresenterUtils.dynamize("/website/services/visio/visio.xhtml", data).toString(); String html = WebCharterView.build(page); diff --git a/src/website/services/visio-chat.png b/src/website/services/visio/visio-chat.png similarity index 100% rename from src/website/services/visio-chat.png rename to src/website/services/visio/visio-chat.png diff --git a/src/website/services/visio-chat2.png b/src/website/services/visio/visio-chat2.png similarity index 100% rename from src/website/services/visio-chat2.png rename to src/website/services/visio/visio-chat2.png diff --git a/src/website/services/visio-moderation.png b/src/website/services/visio/visio-moderation.png similarity index 100% rename from src/website/services/visio-moderation.png rename to src/website/services/visio/visio-moderation.png diff --git a/src/website/services/visio-moderation2.png b/src/website/services/visio/visio-moderation2.png similarity index 100% rename from src/website/services/visio-moderation2.png rename to src/website/services/visio/visio-moderation2.png diff --git a/src/website/services/visio-options.png b/src/website/services/visio/visio-options.png similarity index 100% rename from src/website/services/visio-options.png rename to src/website/services/visio/visio-options.png diff --git a/src/website/services/visio-options2.png b/src/website/services/visio/visio-options2.png similarity index 100% rename from src/website/services/visio-options2.png rename to src/website/services/visio/visio-options2.png diff --git a/src/website/services/visio-sondage.png b/src/website/services/visio/visio-sondage.png similarity index 100% rename from src/website/services/visio-sondage.png rename to src/website/services/visio/visio-sondage.png diff --git a/src/website/services/visio-sondage2.png b/src/website/services/visio/visio-sondage2.png similarity index 100% rename from src/website/services/visio-sondage2.png rename to src/website/services/visio/visio-sondage2.png diff --git a/src/website/services/visio.xhtml b/src/website/services/visio/visio.xhtml similarity index 82% rename from src/website/services/visio.xhtml rename to src/website/services/visio/visio.xhtml index 1ce83ba..8f1cd7a 100644 --- a/src/website/services/visio.xhtml +++ b/src/website/services/visio/visio.xhtml @@ -16,7 +16,7 @@

    Description

    - Copie d'écran + Copie d'écran

    Visio.libre-service.eu est un service de visio-conférence basé sur le logiciel libre Jitsi Meet.

    À la fois professionnel et très simple d'utilisation, c'est un logiciel reconnu et à utiliser sans réserve.

    @@ -39,10 +39,10 @@ Quelques copies d'écran pour découvrir la richesse de l'outil et vous donnez envie de l'utiliser !

    - Le chat - Les options - Un sondage - La modératoin + Le chat + Les options + Un sondage + La modératoin

    Les sources

    diff --git a/src/website/services/visio0.png b/src/website/services/visio/visio0.png similarity index 100% rename from src/website/services/visio0.png rename to src/website/services/visio/visio0.png diff --git a/src/website/services/visio00.png b/src/website/services/visio/visio00.png similarity index 100% rename from src/website/services/visio00.png rename to src/website/services/visio/visio00.png diff --git a/src/website/services/visio1.png b/src/website/services/visio/visio1.png similarity index 100% rename from src/website/services/visio1.png rename to src/website/services/visio/visio1.png diff --git a/src/website/services/visio2.png b/src/website/services/visio/visio2.png similarity index 100% rename from src/website/services/visio2.png rename to src/website/services/visio/visio2.png diff --git a/src/website/services/visio4.png b/src/website/services/visio/visio4.png similarity index 100% rename from src/website/services/visio4.png rename to src/website/services/visio/visio4.png diff --git a/webapp/WEB-INF/lib/kiss4web-0.17.1-sources.zip b/webapp/WEB-INF/lib/kiss4web-0.17.1-sources.zip new file mode 100644 index 0000000..02f3a57 Binary files /dev/null and b/webapp/WEB-INF/lib/kiss4web-0.17.1-sources.zip differ diff --git a/webapp/WEB-INF/lib/kiss4web-0.17.1.jar b/webapp/WEB-INF/lib/kiss4web-0.17.1.jar new file mode 100644 index 0000000..ea6773c Binary files /dev/null and b/webapp/WEB-INF/lib/kiss4web-0.17.1.jar differ diff --git a/webapp/WEB-INF/lib/xidyn-1.11.2-sources.zip b/webapp/WEB-INF/lib/xidyn-1.17.0-sources.zip similarity index 85% rename from webapp/WEB-INF/lib/xidyn-1.11.2-sources.zip rename to webapp/WEB-INF/lib/xidyn-1.17.0-sources.zip index 00d1097..0da63d8 100644 Binary files a/webapp/WEB-INF/lib/xidyn-1.11.2-sources.zip and b/webapp/WEB-INF/lib/xidyn-1.17.0-sources.zip differ diff --git a/webapp/WEB-INF/lib/xidyn-1.11.2.jar b/webapp/WEB-INF/lib/xidyn-1.17.0.jar similarity index 77% rename from webapp/WEB-INF/lib/xidyn-1.11.2.jar rename to webapp/WEB-INF/lib/xidyn-1.17.0.jar index bd7e91b..3d7ea98 100644 Binary files a/webapp/WEB-INF/lib/xidyn-1.11.2.jar and b/webapp/WEB-INF/lib/xidyn-1.17.0.jar differ